- typo

[m6w6/ext-http] / http_api.c

diff --git a/http_api.c b/http_api.c
index 4e6942ad6ab1a466ac47eb738c3c93f48e75b706..cbc5a60d7d9adefdc21eb592c4bc0ff6e0f0eb72 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>
@@ -167,19 +167,11 @@ STATUS _http_parse_key_list(const char *list, HashTable *items, char separator,
 void _http_error_ex(long type, 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);