- added INI setting http.force_exit which can be used to disable script termination

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index 859e21c0c522794a0b144db21f1fd8b0b23f66c7..a4b430a6812a5e6cec58e9f63554de080bd8641a 100644 (file)
--- a/http.c
+++ b/http.c
@@ -258,10 +258,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 +430,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 +439,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, ", ");
                }