- 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 8930b67939e65efbdc47ae7331d92131a24c8425..a4b430a6812a5e6cec58e9f63554de080bd8641a 100644 (file)
--- 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$ */
@@ -261,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()
 /* }}} */
 
@@ -277,29 +275,29 @@ PHP_MINIT_FUNCTION(http)
 
        REGISTER_INI_ENTRIES();
        
-       if (    (SUCCESS != http_support_global_init())                 ||
-                       (SUCCESS != http_headers_global_init())                 ||
-                       (SUCCESS != http_cache_global_init())                   ||
-                       (SUCCESS != http_request_method_global_init())) {
-               return FAILURE;
-       }
+       if (    (SUCCESS != PHP_MINIT_CALL(http_support))       ||
+                       (SUCCESS != PHP_MINIT_CALL(http_headers))       ||
+                       (SUCCESS != PHP_MINIT_CALL(http_cache))         ||
 #ifdef HTTP_HAVE_CURL
-       if (SUCCESS != http_request_global_init()) {
+                       (SUCCESS != PHP_MINIT_CALL(http_request))       ||
+#endif /* HTTP_HAVE_CURL */
+                       (SUCCESS != PHP_MINIT_CALL(http_request_method))) {
                return FAILURE;
        }
-#endif /* HTTP_HAVE_CURL */
 
 #ifdef ZEND_ENGINE_2
-       http_util_object_init();
-       http_message_object_init();
+       if (    (SUCCESS != PHP_MINIT_CALL(http_util_object))           ||
+                       (SUCCESS != PHP_MINIT_CALL(http_message_object))        ||
 #      ifndef WONKY
-       http_response_object_init();
-#      endif
+                       (SUCCESS != PHP_MINIT_CALL(http_response_object))       ||
+#      endif /* WONKY */
 #      ifdef HTTP_HAVE_CURL
-       http_request_object_init();
-       http_requestpool_object_init();
+                       (SUCCESS != PHP_MINIT_CALL(http_request_object))        ||
+                       (SUCCESS != PHP_MINIT_CALL(http_requestpool_object))    ||
 #      endif /* HTTP_HAVE_CURL */
-       http_exception_object_init();
+                       (SUCCESS != PHP_MINIT_CALL(http_exception_object))) {
+               return FAILURE;
+       }
 #endif /* ZEND_ENGINE_2 */
 
        return SUCCESS;
@@ -311,7 +309,7 @@ PHP_MSHUTDOWN_FUNCTION(http)
 {
        UNREGISTER_INI_ENTRIES();
 #ifdef HTTP_HAVE_CURL
-       http_request_global_cleanup();
+       return PHP_MSHUTDOWN_CALL(http_request);
 #endif
        return SUCCESS;
 }
@@ -334,15 +332,14 @@ PHP_RINIT_FUNCTION(http)
 /* {{{ PHP_RSHUTDOWN_FUNCTION */
 PHP_RSHUTDOWN_FUNCTION(http)
 {
-#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
-       int i, c = zend_hash_num_elements(&HTTP_G(request).methods.custom);
+       STATUS status = SUCCESS;
        
-       for (i = 0; i < c; ++i) {
-               http_request_method_unregister(HTTP_MAX_REQUEST_METHOD + i);
-       }
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
+       status = PHP_RSHUTDOWN_CALL(http_request_method);
 #endif
+       
        http_globals_free(HTTP_GLOBALS);
-       return SUCCESS;
+       return status;
 }
 /* }}} */
 
@@ -433,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();
@@ -441,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, ", ");
                }