-fix macro parameter passing in HTTP_LOG_WRITE

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index 73d6f87283798cb7a9783beb3f8659520d448123..2cd87113dee0122a0c962a6c1dbb0a8766546b8e 100644 (file)
--- a/http.c
+++ b/http.c
@@ -186,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)
@@ -241,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();
@@ -260,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;
 }
 /* }}} */