- fix initialization of globals

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index 192834be53f9476a16060641f9869bddaf8e9fbd..73d6f87283798cb7a9783beb3f8659520d448123 100644 (file)
--- a/http.c
+++ b/http.c
@@ -29,7 +29,10 @@
 #include "php_http_std_defs.h"
 #include "php_http_api.h"
 #include "php_http_send_api.h"
-#include "php_http_request_api.h"
+#include "php_http_cache_api.h"
+#ifdef HTTP_HAVE_CURL
+#      include "php_http_request_api.h"
+#endif
 
 #ifdef ZEND_ENGINE_2
 #      include "php_http_util_object.h"
@@ -42,6 +45,7 @@
 #      include "php_http_exception_object.h"
 #endif
 
+#include "missing.h"
 #include "phpstr/phpstr.h"
 
 #ifdef HTTP_HAVE_CURL
@@ -81,7 +85,7 @@ function_entry http_functions[] = {
        PHP_FE(http_send_file, NULL)
        PHP_FE(http_send_stream, NULL)
        PHP_FE(http_chunked_decode, NULL)
-       PHP_FE(http_split_response, NULL)
+       PHP_FE(http_parse_message, NULL)
        PHP_FE(http_parse_headers, NULL)
        PHP_FE(http_get_request_headers, NULL)
        PHP_FE(http_get_request_body, NULL)
@@ -130,27 +134,33 @@ zend_module_entry http_module_entry = {
 int http_module_number;
 
 /* {{{ http_globals */
-static inline void http_globals_init(zend_http_globals *G)
+static void http_globals_init_once(zend_http_globals *G)
 {
        memset(G, 0, sizeof(zend_http_globals));
+}
+
+static inline void http_globals_init(zend_http_globals *G)
+{
        G->send.buffer_size = HTTP_SENDBUF_SIZE;
        zend_hash_init(&G->request.methods.custom, 0, NULL, ZVAL_PTR_DTOR, 0);
 #ifdef HTTP_HAVE_CURL
        zend_llist_init(&G->request.copies.strings, sizeof(char *), http_request_data_free_string, 0);
        zend_llist_init(&G->request.copies.slists, sizeof(struct curl_slist *), http_request_data_free_slist, 0);
        zend_llist_init(&G->request.copies.contexts, sizeof(http_curl_callback_ctx *), http_request_data_free_context, 0);
+       zend_llist_init(&G->request.copies.convs, sizeof(http_curl_conv *), http_request_data_free_conv, 0);
 #endif
 }
 
 static inline void http_globals_free(zend_http_globals *G)
 {
-       STR_FREE(G->send.content_type);
-       STR_FREE(G->send.unquoted_etag);
+       STR_SET(G->send.content_type, NULL);
+       STR_SET(G->send.unquoted_etag, NULL);
        zend_hash_destroy(&G->request.methods.custom);
 #ifdef HTTP_HAVE_CURL
        zend_llist_clean(&G->request.copies.strings);
        zend_llist_clean(&G->request.copies.slists);
        zend_llist_clean(&G->request.copies.contexts);
+       zend_llist_clean(&G->request.copies.convs);
 #endif
 }
 /* }}} */
@@ -177,8 +187,15 @@ PHP_INI_MH(http_update_allowed_methods)
 }
 
 PHP_INI_BEGIN()
-       HTTP_PHP_INI_ENTRY("http.allowed_methods", NULL, PHP_INI_ALL, http_update_allowed_methods, request.methods.allowed)
-       HTTP_PHP_INI_ENTRY("http.cache_log", NULL, PHP_INI_ALL, OnUpdateString, log.cache)
+       HTTP_PHP_INI_ENTRY("http.allowed_methods", "", PHP_INI_ALL, http_update_allowed_methods, request.methods.allowed)
+       HTTP_PHP_INI_ENTRY("http.cache_log", "", PHP_INI_ALL, OnUpdateString, log.cache)
+       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)
+#ifdef ZEND_ENGINE_2
+       HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions)
+#endif
+       HTTP_PHP_INI_ENTRY("http.etag_mode", "-2", PHP_INI_ALL, OnUpdateLong, etag.mode)
 PHP_INI_END()
 /* }}} */
 
@@ -188,14 +205,16 @@ PHP_MINIT_FUNCTION(http)
 {
        http_module_number = module_number;
 
-#ifdef ZTS
-       ZEND_INIT_MODULE_GLOBALS(http, NULL, NULL)
-#endif
+       ZEND_INIT_MODULE_GLOBALS(http, http_globals_init_once, NULL)
 
        REGISTER_INI_ENTRIES();
+       
+       HTTP_LONG_CONSTANT("HTTP_ETAG_MD5", HTTP_ETAG_MD5);
+       HTTP_LONG_CONSTANT("HTTP_ETAG_SHA1", HTTP_ETAG_SHA1);
+       HTTP_LONG_CONSTANT("HTTP_ETAG_MHASH", HTTP_ETAG_MHASH);
 
 #ifdef HTTP_HAVE_CURL
-       if (SUCCESS != http_request_global_init()) {
+       if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) {
                return FAILURE;
        }
 #endif /* HTTP_HAVE_CURL */
@@ -211,6 +230,10 @@ PHP_MINIT_FUNCTION(http)
        http_exception_object_init();
 #endif /* ZEND_ENGINE_2 */
 
+#ifdef ZEND_ENGINE_2
+       zend_hash_init_ex(&http_response_statics, 0, NULL, ZVAL_INTERNAL_PTR_DTOR, 1, 0);
+       zend_fix_static_properties(http_response_object_ce, &http_response_statics TSRMLS_CC);
+#endif
        return SUCCESS;
 }
 /* }}} */
@@ -218,6 +241,7 @@ PHP_MINIT_FUNCTION(http)
 /* {{{ PHP_MSHUTDOWN_FUNCTION */
 PHP_MSHUTDOWN_FUNCTION(http)
 {
+       zend_hash_destroy(&http_response_statics);
        UNREGISTER_INI_ENTRIES();
 #ifdef HTTP_HAVE_CURL
        curl_global_cleanup();
@@ -236,22 +260,16 @@ PHP_RINIT_FUNCTION(http)
        }
 
        http_globals_init(HTTP_GLOBALS);
+       zend_init_static_properties(http_response_object_ce, &http_response_statics TSRMLS_CC);
        return SUCCESS;
 }
 /* }}} */
 
-static int cleanup_statics(void *p TSRMLS_DC)
-{
-       zval_dtor(*(zval **)p);
-       return 0;
-}
-
 /* {{{ PHP_RSHUTDOWN_FUNCTION */
 PHP_RSHUTDOWN_FUNCTION(http)
 {
-       /* ZE kludge */
 #ifdef ZEND_ENGINE_2
-       zend_hash_apply(http_response_object_ce->static_members, cleanup_statics TSRMLS_CC);
+       zend_clean_static_properties(http_response_object_ce TSRMLS_CC);
 #endif
        http_globals_free(HTTP_GLOBALS);
        return SUCCESS;
@@ -291,6 +309,7 @@ PHP_MINFO_FUNCTION(http)
        }
        php_info_print_table_end();
 
+#ifdef HTTP_HAVE_CURL
        php_info_print_table_start();
        {
                unsigned i;
@@ -315,10 +334,11 @@ PHP_MINFO_FUNCTION(http)
                php_info_print_table_row(2, "Custom Request Methods:",
                        PHPSTR_LEN(custom_request_methods) ? PHPSTR_VAL(custom_request_methods) : "none registered");
 
-               phpstr_free(known_request_methods);
-               phpstr_free(custom_request_methods);
+               phpstr_free(&known_request_methods);
+               phpstr_free(&custom_request_methods);
        }
        php_info_print_table_end();
+#endif
 
        php_info_print_table_start();
        {