- fix PHP4 build

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index b81c8cb00ff5986a33a6686d73adba3f8cc2b4d2..6695ff9dedb324bad724789f4743cacc40c5387b 100644 (file)
--- a/http.c
+++ b/http.c
@@ -36,6 +36,7 @@
 #endif
 
 #ifdef ZEND_ENGINE_2
+#      include "php_http_filter_api.h"
 #      include "php_http_util_object.h"
 #      include "php_http_message_object.h"
 #      ifndef WONKY
@@ -300,14 +301,15 @@ PHP_MINIT_FUNCTION(http)
        }
 
 #ifdef ZEND_ENGINE_2
-       if (    (SUCCESS != PHP_MINIT_CALL(http_util_object))           ||
+       if (    (SUCCESS != PHP_MINIT_CALL(http_filter))                        ||
+                       (SUCCESS != PHP_MINIT_CALL(http_util_object))           ||
                        (SUCCESS != PHP_MINIT_CALL(http_message_object))        ||
 #      ifndef WONKY
                        (SUCCESS != PHP_MINIT_CALL(http_response_object))       ||
 #      endif /* WONKY */
 #      ifdef HTTP_HAVE_CURL
                        (SUCCESS != PHP_MINIT_CALL(http_request_object))        ||
-                       (SUCCESS != PHP_MINIT_CALL(http_requestpool_object))    ||
+                       (SUCCESS != PHP_MINIT_CALL(http_requestpool_object))||
 #      endif /* HTTP_HAVE_CURL */
                        (SUCCESS != PHP_MINIT_CALL(http_exception_object))) {
                return FAILURE;
@@ -332,10 +334,9 @@ PHP_MSHUTDOWN_FUNCTION(http)
 /* {{{ PHP_RINIT_FUNCTION */
 PHP_RINIT_FUNCTION(http)
 {
-       char *m;
-
-       if (m = INI_STR("http.allowed_methods")) {
-               http_check_allowed_methods(m, strlen(m));
+       if (HTTP_G(request).methods.allowed) {
+               http_check_allowed_methods(HTTP_G(request).methods.allowed, 
+                       strlen(HTTP_G(request).methods.allowed));
        }
 
        http_globals_init(HTTP_GLOBALS);