- (non-)ZTS fixes

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index c951383007f5c83029c60a84a151d3de533f9bea..88125ae8e2aada3a21b6a1da0fab48bf2481abe0 100644 (file)
--- a/http.c
+++ b/http.c
@@ -31,6 +31,7 @@
 #include "php_http_request_method_api.h"
 #ifdef HTTP_HAVE_CURL
 #      include "php_http_request_api.h"
+#      include "php_http_request_datashare_api.h"
 #endif
 #ifdef HTTP_HAVE_ZLIB
 #      include "php_http_encoding_api.h"
@@ -48,6 +49,7 @@
 #      ifdef HTTP_HAVE_CURL
 #              include "php_http_request_object.h"
 #              include "php_http_requestpool_object.h"
+#              include "php_http_requestdatashare_object.h"
 #      endif
 #      ifdef HTTP_HAVE_ZLIB
 #              include "php_http_deflatestream_object.h"
@@ -93,6 +95,8 @@ zend_function_entry http_functions[] = {
        PHP_FE(http_parse_message, NULL)
        PHP_FE(http_parse_headers, NULL)
        PHP_FE(http_parse_cookie, NULL)
+       PHP_FE(http_build_cookie, NULL)
+       PHP_FE(http_parse_params, NULL)
        PHP_FE(http_get_request_headers, NULL)
        PHP_FE(http_get_request_body, NULL)
        PHP_FE(http_get_request_body_stream, NULL)
@@ -134,16 +138,16 @@ PHP_MINFO_FUNCTION(http);
 /* {{{ http_module_dep */
 #if ZEND_EXTENSION_API_NO >= 220050617
 static zend_module_dep http_module_deps[] = {
-#      ifdef HAVE_SPL
+#      ifdef HTTP_HAVE_SPL
        ZEND_MOD_REQUIRED("spl")
 #      endif
-#      ifdef HTTP_HAVE_EXT_HASH
+#      ifdef HTTP_HAVE_HASH
        ZEND_MOD_REQUIRED("hash")
 #      endif
-#      ifdef HAVE_PHP_SESSION
+#      ifdef HTTP_HAVE_SESSION
        ZEND_MOD_REQUIRED("session")
 #      endif
-#      ifdef HAVE_ICONV
+#      ifdef HTTP_HAVE_ICONV
        ZEND_MOD_REQUIRED("iconv")
 #      endif
        {NULL, NULL, NULL, 0}
@@ -182,10 +186,13 @@ static void http_globals_init_once(zend_http_globals *G)
 #define http_globals_init(g) _http_globals_init((g) TSRMLS_CC)
 static inline void _http_globals_init(zend_http_globals *G TSRMLS_DC)
 {
-       G->send.buffer_size = HTTP_SENDBUF_SIZE;
-#ifndef HTTP_HAVE_SAPI_RTIME
-       G->request_time = time(NULL);
+#ifdef HTTP_HAVE_SAPI_RTIME
+       G->request.time = Z_LVAL_P(http_get_server_var("REQUEST_TIME"));
+#else
+       G->request.time = time(NULL);
 #endif
+       G->send.buffer_size = 0;
+       G->send.not_found_404 = 1;
        G->read_post_data = 0;
 }
 
@@ -223,22 +230,31 @@ PHP_INI_MH(http_update_allowed_methods)
 #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)
-       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)
-       HTTP_PHP_INI_ENTRY("http.etag_mode", "MD5", PHP_INI_ALL, OnUpdateString, etag.mode)
+       HTTP_PHP_INI_ENTRY("http.etag.mode", "MD5", PHP_INI_ALL, OnUpdateString, etag.mode)
+       HTTP_PHP_INI_ENTRY("http.log.cache", "", PHP_INI_ALL, OnUpdateString, log.cache)
+       HTTP_PHP_INI_ENTRY("http.log.redirect", "", PHP_INI_ALL, OnUpdateString, log.redirect)
+       HTTP_PHP_INI_ENTRY("http.log.not_found", "", PHP_INI_ALL, OnUpdateString, log.not_found)
+       HTTP_PHP_INI_ENTRY("http.log.allowed_methods", "", PHP_INI_ALL, OnUpdateString, log.allowed_methods)
+       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
-       HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions)
+       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.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
-       HTTP_PHP_INI_ENTRY("http.force_exit", "1", PHP_INI_ALL, OnUpdateBool, force_exit)
 #ifdef HTTP_HAVE_ZLIB
-       HTTP_PHP_INI_ENTRY("http.ob_inflate_auto", "0", PHP_INI_PERDIR, OnUpdateBool, send.inflate.start_auto)
-       HTTP_PHP_INI_ENTRY("http.ob_inflate_flags", "0", PHP_INI_ALL, OnUpdateLong, send.inflate.start_flags)
-       HTTP_PHP_INI_ENTRY("http.ob_deflate_auto", "0", PHP_INI_PERDIR, OnUpdateBool, send.deflate.start_auto)
-       HTTP_PHP_INI_ENTRY("http.ob_deflate_flags", "0", PHP_INI_ALL, OnUpdateLong, send.deflate.start_flags)
+       HTTP_PHP_INI_ENTRY("http.send.inflate.start_auto", "0", PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateBool, send.inflate.start_auto)
+       HTTP_PHP_INI_ENTRY("http.send.inflate.start_flags", "0", PHP_INI_ALL, OnUpdateLong, send.inflate.start_flags)
+       HTTP_PHP_INI_ENTRY("http.send.deflate.start_auto", "0", PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateBool, send.deflate.start_auto)
+       HTTP_PHP_INI_ENTRY("http.send.deflate.start_flags", "0", PHP_INI_ALL, OnUpdateLong, send.deflate.start_flags)
+#endif
+       HTTP_PHP_INI_ENTRY("http.send.not_found_404", "1", PHP_INI_ALL, OnUpdateBool, send.not_found_404)
+#ifdef ZEND_ENGINE_2
+       HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions)
 #endif
+       HTTP_PHP_INI_ENTRY("http.force_exit", "1", PHP_INI_ALL, OnUpdateBool, force_exit)
 PHP_INI_END()
 /* }}} */
 
@@ -257,6 +273,7 @@ PHP_MINIT_FUNCTION(http)
                        (SUCCESS != PHP_MINIT_CALL(http_url))           ||
 #ifdef HTTP_HAVE_CURL
                        (SUCCESS != PHP_MINIT_CALL(http_request))       ||
+                       (SUCCESS != PHP_MINIT_CALL(http_request_datashare)) ||
 #endif /* HTTP_HAVE_CURL */
 #ifdef HTTP_HAVE_ZLIB
                        (SUCCESS != PHP_MINIT_CALL(http_encoding))      ||
@@ -276,6 +293,7 @@ PHP_MINIT_FUNCTION(http)
 #      ifdef HTTP_HAVE_CURL
                        (SUCCESS != PHP_MINIT_CALL(http_request_object))        ||
                        (SUCCESS != PHP_MINIT_CALL(http_requestpool_object))||
+                       (SUCCESS != PHP_MINIT_CALL(http_requestdatashare_object))||
 #      endif /* HTTP_HAVE_CURL */
 #      ifdef HTTP_HAVE_ZLIB
                        (SUCCESS != PHP_MINIT_CALL(http_deflatestream_object))  ||
@@ -295,7 +313,10 @@ PHP_MSHUTDOWN_FUNCTION(http)
 {
        UNREGISTER_INI_ENTRIES();
 #ifdef HTTP_HAVE_CURL
-       return PHP_MSHUTDOWN_CALL(http_request);
+       if (    (SUCCESS != PHP_MSHUTDOWN_CALL(http_request_datashare)) ||
+                       (SUCCESS != PHP_MSHUTDOWN_CALL(http_request))) {
+               return FAILURE;
+       }
 #endif
        return SUCCESS;
 }
@@ -314,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;
@@ -332,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;
        }
        
@@ -357,6 +384,7 @@ PHP_MINFO_FUNCTION(http)
 #      ifdef HTTP_HAVE_CURL
                        "HttpRequest, "
                        "HttpRequestPool, "
+                       "HttpRequestDataShare, "
 #      endif
 #      ifdef HTTP_HAVE_ZLIB
                        "HttpDeflateStream, "