- ditch some warnings

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index b81c8cb00ff5986a33a6686d73adba3f8cc2b4d2..38f91f829d9841c3002a5607217912758742e893 100644 (file)
--- a/http.c
+++ b/http.c
@@ -30,6 +30,7 @@
 #include "php_http_send_api.h"
 #include "php_http_cache_api.h"
 #include "php_http_headers_api.h"
+#include "php_http_filter_api.h"
 #include "php_http_request_method_api.h"
 #ifdef HTTP_HAVE_CURL
 #      include "php_http_request_api.h"
@@ -292,6 +293,7 @@ PHP_MINIT_FUNCTION(http)
        if (    (SUCCESS != PHP_MINIT_CALL(http_support))       ||
                        (SUCCESS != PHP_MINIT_CALL(http_headers))       ||
                        (SUCCESS != PHP_MINIT_CALL(http_cache))         ||
+                       (SUCCESS != PHP_MINIT_CALL(http_filter))        ||
 #ifdef HTTP_HAVE_CURL
                        (SUCCESS != PHP_MINIT_CALL(http_request))       ||
 #endif /* HTTP_HAVE_CURL */
@@ -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);