push a load of changes before holidays

[m6w6/ext-http] / php_http_misc.c

diff --git a/php_http_misc.c b/php_http_misc.c
index 8d52382f6105a444888c76d4baf93fa1472fe0da..b345eff6e20800e290a9d597101ffb760928c072 100644 (file)
--- a/php_http_misc.c
+++ b/php_http_misc.c
@@ -14,6 +14,10 @@
 
 #include "php_http.h"
 
+#include <ext/standard/php_lcg.h>
+#include <ext/standard/php_string.h>
+#include <Zend/zend_exceptions.h>
+
 /* SLEEP */
 
 PHP_HTTP_API void php_http_sleep(double s)
@@ -47,7 +51,7 @@ PHP_HTTP_API void php_http_sleep(double s)
 
 int php_http_match(const char *haystack_str, const char *needle_str, int flags)
 {
-       int result;
+       int result = 0;
 
        if (flags & PHP_HTTP_MATCH_FULL) {
                if (flags & PHP_HTTP_MATCH_CASE) {
@@ -208,7 +212,7 @@ void php_http_error(long type TSRMLS_DC, long code, const char *format, ...)
                        char *message;
                        zend_class_entry *ce;
 
-                       if (EG(exception_class) && instanceof_function(EG(exception_class), php_http_exception_class_entry)) {
+                       if (0&& EG(exception_class) && instanceof_function(EG(exception_class), php_http_exception_class_entry)) {
                                ce = EG(exception_class);
                        } else {
                                ce = php_http_exception_get_for_code(code);