X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=6695ff9dedb324bad724789f4743cacc40c5387b;hp=244c423d92e59a2c170abd94b64b99f94acf1a93;hb=fa542affedb0fe8ff87b1f5b6734d6612c63987f;hpb=34644fd4c700fb55c3a2c2ff9966d0f5e7572509

diff --git a/http.c b/http.c
index 244c423..6695ff9 100644
--- a/http.c
+++ b/http.c
@@ -30,13 +30,13 @@
 #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"
 #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
@@ -293,7 +293,6 @@ 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 */
@@ -302,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;
@@ -334,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);