* add a real separator vs. a type juggler

[m6w6/ext-http] / php_http_misc.c

diff --git a/php_http_misc.c b/php_http_misc.c
index c52f83f91fddc6f840e3b52964830a9a55294a36..f52c9d6348b3b7839cf90105e1805baaba01adcf 100644 (file)
--- a/php_http_misc.c
+++ b/php_http_misc.c
@@ -51,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) {
@@ -210,12 +210,10 @@ void php_http_error(long type TSRMLS_DC, long code, const char *format, ...)
        switch (scope_error_handling(type TSRMLS_CC)) {
                case EH_THROW: {
                        char *message;
-                       zend_class_entry *ce;
+                       zend_class_entry *ce = 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);
                        }
 
                        vspprintf(&message, 0, format, args);