X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=b50682fa8d33ac370d457b50e121acf63b0bdc12;hp=843db2284c703ba0b3cbd38f37b62af95205427b;hb=5b440d6af3dd3052dde7b137f975692f0aa84603;hpb=ebf03950ffaea849b931adf83b6c20ac9fb7ef33

diff --git a/http.c b/http.c
index 843db22..b50682f 100644
--- 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,7 @@ 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)
@@ -107,9 +110,7 @@ zend_function_entry http_functions[] = {
 	PHP_FE(http_put_file, http_arg_pass_ref_4)
 	PHP_FE(http_put_stream, http_arg_pass_ref_4)
 	PHP_FE(http_request, http_arg_pass_ref_5)
-#ifdef HAVE_CURL_GETFORMDATA
 	PHP_FE(http_request_body_encode, NULL)
-#endif
 #endif
 	PHP_FE(http_request_method_register, NULL)
 	PHP_FE(http_request_method_unregister, NULL)
@@ -137,16 +138,16 @@ PHP_MINFO_FUNCTION(http);
 /* {{{ http_module_dep */
 #if ZEND_EXTENSION_API_NO >= 220050617
 static zend_module_dep http_module_deps[] = {
-#	if defined(HAVE_SPL) && !HTTP_SHARED_EXT(SPL)
+#	ifdef HTTP_HAVE_SPL
 	ZEND_MOD_REQUIRED("spl")
 #	endif
-#	if defined(HTTP_HAVE_EXT_HASH) && !HTTP_SHARED_EXT(HASH)
+#	ifdef HTTP_HAVE_HASH
 	ZEND_MOD_REQUIRED("hash")
 #	endif
-#	if defined(HAVE_PHP_SESSION) && !HTTP_SHARED_EXT(PHP_SESSION)
+#	ifdef HTTP_HAVE_SESSION
 	ZEND_MOD_REQUIRED("session")
 #	endif
-#	if defined(HAVE_ICONV) && !HTTP_SHARED_EXT(ICONV)
+#	ifdef HTTP_HAVE_ICONV
 	ZEND_MOD_REQUIRED("iconv")
 #	endif
 	{NULL, NULL, NULL, 0}
@@ -190,7 +191,7 @@ static inline void _http_globals_init(zend_http_globals *G TSRMLS_DC)
 #else
 	G->request.time = time(NULL);
 #endif
-	G->send.buffer_size = HTTP_SENDBUF_SIZE;
+	G->send.buffer_size = 0;
 	G->send.not_found_404 = 1;
 	G->read_post_data = 0;
 }
@@ -237,6 +238,12 @@ 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)
+#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", "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
 #ifdef HTTP_HAVE_ZLIB
 	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)
@@ -266,6 +273,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))	||
@@ -285,6 +295,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))	||
@@ -304,7 +315,13 @@ PHP_MSHUTDOWN_FUNCTION(http)
 {
 	UNREGISTER_INI_ENTRIES();
 #ifdef HTTP_HAVE_CURL
-	return PHP_MSHUTDOWN_CALL(http_request);
+	if (	
+#	ifdef ZEND_ENGINE_2
+			(SUCCESS != PHP_MSHUTDOWN_CALL(http_request_datashare)) ||
+#	endif
+			(SUCCESS != PHP_MSHUTDOWN_CALL(http_request))) {
+		return FAILURE;
+	}
 #endif
 	return SUCCESS;
 }
@@ -323,6 +340,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;
@@ -341,7 +361,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;
 	}
 	
@@ -366,6 +389,7 @@ PHP_MINFO_FUNCTION(http)
 #	ifdef HTTP_HAVE_CURL
 			"HttpRequest, "
 			"HttpRequestPool, "
+			"HttpRequestDataShare, "
 #	endif
 #	ifdef HTTP_HAVE_ZLIB
 			"HttpDeflateStream, "