- fix SEGV on un/serializing HttpRequests

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index 5a0b05897ca2783cc008ec056a543a4eae74b620..521f2b5ce58b7a0f660063e8e0ef8b3ac5b45f54 100644 (file)
--- a/http.c
+++ b/http.c
@@ -68,7 +68,6 @@ ZEND_GET_MODULE(http)
 
 /* {{{ http_functions[] */
 zend_function_entry http_functions[] = {
-       PHP_FE(http_test, NULL)
        PHP_FE(http_date, NULL)
        PHP_FE(http_build_url, http_arg_pass_ref_4)
        PHP_FE(http_build_str, NULL)
@@ -187,7 +186,7 @@ static void http_globals_init_once(zend_http_globals *G)
 static inline void _http_globals_init(zend_http_globals *G TSRMLS_DC)
 {
 #ifdef HTTP_HAVE_SAPI_RTIME
-       G->request.time = Z_LVAL_P(http_get_server_var("REQUEST_TIME"));
+       G->request.time = sapi_get_request_time(TSRMLS_C);
 #else
        G->request.time = time(NULL);
 #endif
@@ -199,8 +198,17 @@ static inline void _http_globals_init(zend_http_globals *G TSRMLS_DC)
 #define http_globals_free(g) _http_globals_free((g) TSRMLS_CC)
 static inline void _http_globals_free(zend_http_globals *G TSRMLS_DC)
 {
+       if (G->request.headers) {
+               zend_hash_destroy(G->request.headers);
+               FREE_HASHTABLE(G->request.headers);
+               G->request.headers = NULL;
+       }
        STR_SET(G->send.content_type, NULL);
        STR_SET(G->send.unquoted_etag, NULL);
+       if (G->server_var) {
+               zval_ptr_dtor(&G->server_var);
+               G->server_var = NULL;
+       }
 }
 /* }}} */
 
@@ -238,9 +246,9 @@ PHP_INI_BEGIN()
        HTTP_PHP_INI_ENTRY("http.log.composite", "", PHP_INI_ALL, OnUpdateString, log.composite)
        HTTP_PHP_INI_ENTRY("http.request.methods.allowed", "", PHP_INI_ALL, http_update_allowed_methods, request.methods.allowed)
        HTTP_PHP_INI_ENTRY("http.request.methods.custom", "", PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateString, request.methods.custom.ini)
-#ifdef ZEND_ENGINE_2
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
        HTTP_PHP_INI_ENTRY("http.request.datashare.cookie", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.cookie)
-       HTTP_PHP_INI_ENTRY("http.request.datashare.dns", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.dns)
+       HTTP_PHP_INI_ENTRY("http.request.datashare.dns", "1", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.dns)
        HTTP_PHP_INI_ENTRY("http.request.datashare.ssl", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.ssl)
        HTTP_PHP_INI_ENTRY("http.request.datashare.connect", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.connect)
 #endif
@@ -273,7 +281,9 @@ PHP_MINIT_FUNCTION(http)
                        (SUCCESS != PHP_MINIT_CALL(http_url))           ||
 #ifdef HTTP_HAVE_CURL
                        (SUCCESS != PHP_MINIT_CALL(http_request))       ||
+#      ifdef ZEND_ENGINE_2
                        (SUCCESS != PHP_MINIT_CALL(http_request_datashare)) ||
+#      endif
 #endif /* HTTP_HAVE_CURL */
 #ifdef HTTP_HAVE_ZLIB
                        (SUCCESS != PHP_MINIT_CALL(http_encoding))      ||
@@ -313,7 +323,10 @@ PHP_MSHUTDOWN_FUNCTION(http)
 {
        UNREGISTER_INI_ENTRIES();
 #ifdef HTTP_HAVE_CURL
-       if (    (SUCCESS != PHP_MSHUTDOWN_CALL(http_request_datashare)) ||
+       if (    
+#      ifdef ZEND_ENGINE_2
+                       (SUCCESS != PHP_MSHUTDOWN_CALL(http_request_datashare)) ||
+#      endif
                        (SUCCESS != PHP_MSHUTDOWN_CALL(http_request))) {
                return FAILURE;
        }
@@ -335,6 +348,9 @@ PHP_RINIT_FUNCTION(http)
        if (    (SUCCESS != PHP_RINIT_CALL(http_request_method))
 #ifdef HTTP_HAVE_ZLIB  
                ||      (SUCCESS != PHP_RINIT_CALL(http_encoding))
+#endif
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
+               ||      (SUCCESS != PHP_RINIT_CALL(http_request_datashare))
 #endif
        ) {
                return FAILURE;
@@ -353,7 +369,10 @@ PHP_RSHUTDOWN_FUNCTION(http)
 #ifdef HTTP_HAVE_ZLIB
                ||      (SUCCESS != PHP_RSHUTDOWN_CALL(http_encoding))
 #endif
-       ) {
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
+               ||      (SUCCESS != PHP_RSHUTDOWN_CALL(http_request_datashare))
+#endif
+          ) {
                status = FAILURE;
        }