-fix macro parameter passing in HTTP_LOG_WRITE

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index 1c901d17ed541a9c0043aea10214fe8ae72a9408..2cd87113dee0122a0c962a6c1dbb0a8766546b8e 100644 (file)
--- a/http.c
+++ b/http.c
@@ -134,9 +134,13 @@ 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
@@ -149,8 +153,8 @@ static inline void http_globals_init(zend_http_globals *G)
 
 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);
@@ -182,6 +186,10 @@ PHP_INI_MH(http_update_allowed_methods)
        return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
 }
 
+#ifndef ZEND_ENGINE_2
+#      define OnUpdateLong OnUpdateInt
+#endif
+
 PHP_INI_BEGIN()
        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)
@@ -201,9 +209,7 @@ 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();
        
@@ -239,7 +245,9 @@ PHP_MINIT_FUNCTION(http)
 /* {{{ PHP_MSHUTDOWN_FUNCTION */
 PHP_MSHUTDOWN_FUNCTION(http)
 {
+#ifdef ZEND_ENGINE_2
        zend_hash_destroy(&http_response_statics);
+#endif
        UNREGISTER_INI_ENTRIES();
 #ifdef HTTP_HAVE_CURL
        curl_global_cleanup();
@@ -258,7 +266,9 @@ PHP_RINIT_FUNCTION(http)
        }
 
        http_globals_init(HTTP_GLOBALS);
+#ifdef ZEND_ENGINE_2
        zend_init_static_properties(http_response_object_ce, &http_response_statics TSRMLS_CC);
+#endif
        return SUCCESS;
 }
 /* }}} */