- fix dep on SPL in PHP-5.1

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index 859e21c0c522794a0b144db21f1fd8b0b23f66c7..b81c8cb00ff5986a33a6686d73adba3f8cc2b4d2 100644 (file)
--- a/http.c
+++ b/http.c
@@ -18,6 +18,8 @@
 #endif
 #include "php.h"
 
+#include "zend_extensions.h"
+
 #include "SAPI.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
@@ -128,9 +130,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",
@@ -140,9 +156,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
 };
 /* }}} */
@@ -258,10 +272,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()
 /* }}} */
 
@@ -429,6 +444,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();
@@ -437,7 +453,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, ", ");
                }