- (non-)ZTS fixes

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index 51d452ab47c6ddebc667425df563d34592e9e175..88125ae8e2aada3a21b6a1da0fab48bf2481abe0 100644 (file)
--- a/http.c
+++ b/http.c
@@ -241,7 +241,7 @@ PHP_INI_BEGIN()
 #ifdef ZEND_ENGINE_2
        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.sll", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.ssl)
+       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
 #ifdef HTTP_HAVE_ZLIB
@@ -335,6 +335,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 +356,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;
        }