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

diff --git a/http.c b/http.c
index 0f5f936..6695ff9 100644
--- a/http.c
+++ b/http.c
@@ -1,16 +1,13 @@
 /*
-   +----------------------------------------------------------------------+
-   | PECL :: http                                                         |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license, that  |
-   | is bundled with this package in the file LICENSE, and is available   |
-   | through the world-wide-web at http://www.php.net/license/3_0.txt.    |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2004-2005 Michael Wallner <mike@php.net>               |
-   +----------------------------------------------------------------------+
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
@@ -21,6 +18,8 @@
 #endif
 #include "php.h"
 
+#include "zend_extensions.h"
+
 #include "SAPI.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
@@ -37,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
@@ -131,9 +131,23 @@ zend_function_entry http_functions[] = {
 };
 /* }}} */
 
+/* {{{ http_module_dep */
+#if ZEND_EXTENSION_API_NO >= 220050617
+static zend_module_dep http_module_dep[] = {
+#	ifdef HAVE_SPL
+	ZEND_MOD_REQUIRED("spl")
+#	endif
+	{NULL, NULL, NULL, 0}
+};
+#endif
+/* }}} */
+
 /* {{{ http_module_entry */
 zend_module_entry http_module_entry = {
-#if ZEND_MODULE_API_NO >= 20010901
+#if ZEND_EXTENSION_API_NO >= 220050617
+	STANDARD_MODULE_HEADER_EX, NULL,
+	http_module_dep,
+#else
 	STANDARD_MODULE_HEADER,
 #endif
 	"http",
@@ -143,9 +157,7 @@ zend_module_entry http_module_entry = {
 	PHP_RINIT(http),
 	PHP_RSHUTDOWN(http),
 	PHP_MINFO(http),
-#if ZEND_MODULE_API_NO >= 20010901
 	HTTP_PEXT_VERSION,
-#endif
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
@@ -261,10 +273,11 @@ PHP_INI_BEGIN()
 	HTTP_PHP_INI_ENTRY("http.redirect_log", "", PHP_INI_ALL, OnUpdateString, log.redirect)
 	HTTP_PHP_INI_ENTRY("http.allowed_methods_log", "", PHP_INI_ALL, OnUpdateString, log.allowed_methods)
 	HTTP_PHP_INI_ENTRY("http.composite_log", "", PHP_INI_ALL, OnUpdateString, log.composite)
+	HTTP_PHP_INI_ENTRY_EX("http.etag_mode", "-2", PHP_INI_ALL, OnUpdateLong, http_etag_mode_displayer, etag.mode)
 #ifdef ZEND_ENGINE_2
 	HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions)
 #endif
-	HTTP_PHP_INI_ENTRY_EX("http.etag_mode", "-2", PHP_INI_ALL, OnUpdateLong, http_etag_mode_displayer, etag.mode)
+	HTTP_PHP_INI_ENTRY("http.force_exit", "1", PHP_INI_ALL, OnUpdateBool, force_exit)
 PHP_INI_END()
 /* }}} */
 
@@ -288,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;
@@ -320,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);
@@ -432,6 +445,7 @@ PHP_MINFO_FUNCTION(http)
 	php_info_print_table_colspan_header(2, "Request Methods");
 	{
 		unsigned i;
+		HashPosition pos;
 		zval **custom_method;
 		phpstr *known_request_methods = phpstr_new();
 		phpstr *custom_request_methods = phpstr_new();
@@ -440,7 +454,7 @@ PHP_MINFO_FUNCTION(http)
 			phpstr_appendl(known_request_methods, http_request_method_name(i));
 			phpstr_appends(known_request_methods, ", ");
 		}
-		FOREACH_HASH_VAL(&HTTP_G(request).methods.custom, custom_method) {
+		FOREACH_HASH_VAL(pos, &HTTP_G(request).methods.custom, custom_method) {
 			phpstr_append(custom_request_methods, Z_STRVAL_PP(custom_method), Z_STRLEN_PP(custom_method));
 			phpstr_appends(custom_request_methods, ", ");
 		}