- last mhash algo was missed

[m6w6/ext-http] / http_api.c

diff --git a/http_api.c b/http_api.c
index 4e6942ad6ab1a466ac47eb738c3c93f48e75b706..abc2c9beeb155a925b1b4e8dcf52568bc8ba0d86 100644 (file)
--- a/http_api.c
+++ b/http_api.c
@@ -37,7 +37,7 @@
 #include <ctype.h>
 
 #ifdef HTTP_HAVE_MAGIC
-#      if defined(PHP_WIN32) && !defined(USE_MAGIC_DLL)
+#      if defined(PHP_WIN32) && !defined(USE_MAGIC_DLL) && !defined(USE_MAGIC_STATIC)
 #              define USE_MAGIC_STATIC
 #      endif
 #      include <magic.h>
@@ -85,7 +85,7 @@ STATUS _http_parse_key_list(const char *list, HashTable *items, char separator,
        int vallen = 0, keylen = 0, done = 0;
        zval array;
 
-       Z_ARRVAL(array) = items;
+       INIT_ZARR(array, items);
 
        if (!(val = strchr(list, '='))) {
                return FAILURE;
@@ -164,22 +164,13 @@ 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;
-       zend_bool throw_exception = 0;
-       TSRMLS_FETCH();
-
-       if (type == E_THROW) {
-               throw_exception = 1;
-               type = E_WARNING;
-       } else if (PG(error_handling) == EH_THROW) {
-               throw_exception = 1;
-       }
-
+       
        va_start(args, format);
 #ifdef ZEND_ENGINE_2
-       if (throw_exception) {
+       if ((type == E_THROW) || (PG(error_handling) == EH_THROW)) {
                char *message;
                
                vspprintf(&message, 0, format, args);
@@ -206,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); \
                } \
         \