- update

[m6w6/ext-http] / http_api.c

diff --git a/http_api.c b/http_api.c
index b36a32d3a090abdaeacde9cacbe8be1740f37a80..f59a7d0a75cf2d7fd7561b624d2068ff9406d840 100644 (file)
--- a/http_api.c
+++ b/http_api.c
@@ -36,6 +36,13 @@
 
 #include <ctype.h>
 
+#ifdef HTTP_HAVE_MAGIC
+#      if defined(PHP_WIN32) && !defined(USE_MAGIC_DLL) && !defined(USE_MAGIC_STATIC)
+#              define USE_MAGIC_STATIC
+#      endif
+#      include <magic.h>
+#endif
+
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
 /* char *pretty_key(char *, size_t, zend_bool, zend_bool) */
@@ -157,24 +164,20 @@ STATUS _http_parse_key_list(const char *list, HashTable *items, char separator,
 /* }}} */
 
 /* {{{ void http_error(long, long, char*) */
-void _http_error_ex(long type, long code, const char *format, ...)
+void _http_error_ex(long type TSRMLS_DC, long code, const char *format, ...)
 {
        va_list args;
-       TSRMLS_FETCH();
-
+       
        va_start(args, format);
-       if (type == E_THROW) {
 #ifdef ZEND_ENGINE_2
+       if ((type == E_THROW) || (PG(error_handling) == EH_THROW)) {
                char *message;
+               
                vspprintf(&message, 0, format, args);
                zend_throw_exception(http_exception_get_for_code(code), message, code TSRMLS_CC);
-#else
-               type = E_WARNING;
+       } else
 #endif
-       }
-       if (type != E_THROW) {
-               php_verror(NULL, "", type, format, args TSRMLS_CC);
-       }
+       php_verror(NULL, "", type, format, args TSRMLS_CC);
        va_end(args);
 }
 /* }}} */
@@ -194,7 +197,7 @@ void _http_log_ex(char *file, const char *ident, const char *message TSRMLS_DC)
                php_stream *log = php_stream_open_wrapper(file, "ab", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL); \
                 \
                if (log) { \
-                       php_stream_printf(log TSRMLS_CC, "%s [%12s] %32s <%s>%s", datetime, type, msg, SG(request_info).request_uri, PHP_EOL); \
+                       php_stream_printf(log TSRMLS_CC, "%s\t[%s]\t%s\t<%s>%s", datetime, type, msg, SG(request_info).request_uri, PHP_EOL); \
                        php_stream_close(log); \
                } \
         \
@@ -328,7 +331,6 @@ PHP_HTTP_API const char *_http_chunked_decode(const char *encoded, size_t encode
                                        http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid chunk size: '%s' at pos %d", error, n_ptr - encoded);
                                        efree(error);
                                }
-
                                return NULL;
                        }
                } else {
@@ -350,6 +352,59 @@ PHP_HTTP_API const char *_http_chunked_decode(const char *encoded, size_t encode
 }
 /* }}} */
 
+/* {{{ char *http_guess_content_type(char *magic_file, long magic_mode, void *data, size_t size, http_send_mode mode) */
+PHP_HTTP_API char *_http_guess_content_type(const char *magicfile, long magicmode, void *data_ptr, size_t data_len, http_send_mode data_mode TSRMLS_DC)
+{
+       char *ct = NULL;
+
+#ifdef HTTP_HAVE_MAGIC
+       struct magic_set *magic = magic_open(magicmode);
+       
+       if (!magic) {
+               http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid magic mode: %ld", magicmode);
+       } else if (-1 == magic_load(magic, magicfile)) {
+               http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Failed to load magic database '%s'", magicfile);
+       } else {
+               const char *ctype = NULL;
+               
+               switch (data_mode)
+               {
+                       case SEND_RSRC:
+                       {
+                               char *buffer;
+                               size_t b_len;
+                               
+                               b_len = php_stream_copy_to_mem(data_ptr, &buffer, 65536, 0);
+                               ctype = magic_buffer(magic, buffer, b_len);
+                               efree(buffer);
+                       }
+                       break;
+                       
+                       case SEND_DATA:
+                               ctype = magic_buffer(magic, data_ptr, data_len);
+                       break;
+                       
+                       default:
+                               ctype = magic_file(magic, data_ptr);
+                       break;
+               }
+               
+               if (ctype) {
+                       ct = estrdup(ctype);
+               } else {
+                       http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Failed to guess Content-Type: %s", magic_error(magic));
+               }
+       }
+       if (magic) {
+               magic_close(magic);
+       }
+#else
+       http_error(HE_WARNING, HTTP_E_RUNTIME, "Cannot guess Content-Type; libmagic not available");
+#endif
+       
+       return ct;
+}
+/* }}} */
 /*
  * Local variables:
  * tab-width: 4