X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.c;h=e3ee6ab69aced0bf96635c70eece58b780ba41a2;hp=9e976106ab79df29fe833683b4af41c0e722e84a;hb=2769c041b77a0aaba7acbee4ae469571eaeb2b0a;hpb=7bdc434a56de6c8f3442e43c9bf8674245b0ee99

diff --git a/php_http.c b/php_http.c
index 9e97610..e3ee6ab 100644
--- a/php_http.c
+++ b/php_http.c
@@ -10,26 +10,23 @@
     +--------------------------------------------------------------------+
 */
 
-#include "php_http.h"
+#include "php_http_api.h"
+
+#include <php_ini.h>
+#include <ext/standard/info.h>
 
 #include <zlib.h>
+
 #if PHP_HTTP_HAVE_CURL
 #	include <curl/curl.h>
 #	if PHP_HTTP_HAVE_EVENT
 #		include <event.h>
 #	endif
 #endif
-#if PHP_HTTP_HAVE_NEON
-#	include "neon/ne_utils.h"
-#endif
 #if PHP_HTTP_HAVE_SERF
-#	include "serf.h"
+#	include <serf.h>
 #endif
 
-#include <main/php_ini.h>
-#include <ext/standard/info.h>
-#include <Zend/zend_extensions.h>
-
 ZEND_DECLARE_MODULE_GLOBALS(php_http);
 
 #ifdef COMPILE_DL_HTTP
@@ -48,13 +45,13 @@ PHP_MINFO_FUNCTION(http);
 
 static zend_module_dep http_module_deps[] = {
 	ZEND_MOD_REQUIRED("spl")
-#if PHP_HTTP_HAVE_HASH
+#ifdef PHP_HTTP_HAVE_HASH
 	ZEND_MOD_REQUIRED("hash")
 #endif
-#if PHP_HTTP_HAVE_ICONV
+#ifdef PHP_HTTP_HAVE_ICONV
 	ZEND_MOD_REQUIRED("iconv")
 #endif
-#if PHP_HTTP_HAVE_EVENT
+#ifdef PHP_HTTP_HAVE_EVENT
 	ZEND_MOD_CONFLICTS("event")
 #endif
 	{NULL, NULL, NULL, 0}
@@ -121,11 +118,7 @@ zend_php_http_globals *php_http_globals(void)
 #endif
 #endif
 PHP_INI_BEGIN()
-	PHP_HTTP_INI_ENTRY("http.etag.mode", "md5", PHP_INI_ALL, OnUpdateString, env.etag_mode)
-	PHP_HTTP_INI_ENTRY("http.request_datashare.cookie", "0", PHP_INI_SYSTEM, OnUpdateBool, request_datashare.cookie)
-	PHP_HTTP_INI_ENTRY("http.request_datashare.dns", "1", PHP_INI_SYSTEM, OnUpdateBool, request_datashare.dns)
-	PHP_HTTP_INI_ENTRY("http.request_datashare.ssl", "0", PHP_INI_SYSTEM, OnUpdateBool, request_datashare.ssl)
-	PHP_HTTP_INI_ENTRY("http.request_datashare.connect", "0", PHP_INI_SYSTEM, OnUpdateBool, request_datashare.connect)
+	PHP_HTTP_INI_ENTRY("http.etag.mode", "crc32b", PHP_INI_ALL, OnUpdateString, env.etag_mode)
 	PHP_HTTP_INI_ENTRY("http.persistent_handle.limit", "-1", PHP_INI_SYSTEM, OnUpdateLong, persistent_handle.limit)
 PHP_INI_END()
 
@@ -147,19 +140,22 @@ PHP_MINIT_FUNCTION(http)
 	|| SUCCESS != PHP_MINIT_CALL(http_message_body)
 	|| SUCCESS != PHP_MINIT_CALL(http_property_proxy)
 	|| SUCCESS != PHP_MINIT_CALL(http_querystring)
-	|| SUCCESS != PHP_MINIT_CALL(http_request_factory)
-	|| SUCCESS != PHP_MINIT_CALL(http_request)
+	|| SUCCESS != PHP_MINIT_CALL(http_client_interface)
+	|| SUCCESS != PHP_MINIT_CALL(http_client)
+	|| SUCCESS != PHP_MINIT_CALL(http_client_request)
+	|| SUCCESS != PHP_MINIT_CALL(http_client_response)
+	|| SUCCESS != PHP_MINIT_CALL(http_client_datashare)
+	|| SUCCESS != PHP_MINIT_CALL(http_client_pool)
+	|| SUCCESS != PHP_MINIT_CALL(http_client_factory)
 #if PHP_HTTP_HAVE_CURL
 	|| SUCCESS != PHP_MINIT_CALL(http_curl)
 #endif
-#if PHP_HTTP_HAVE_NEON
-	|| SUCCESS != PHP_MINIT_CALL(http_neon)
-#endif
-	|| SUCCESS != PHP_MINIT_CALL(http_request_datashare)
-	|| SUCCESS != PHP_MINIT_CALL(http_request_method)
-	|| SUCCESS != PHP_MINIT_CALL(http_request_pool)
+	|| SUCCESS != PHP_MINIT_CALL(http_curl_client)
+	|| SUCCESS != PHP_MINIT_CALL(http_curl_client_pool)
+	|| SUCCESS != PHP_MINIT_CALL(http_curl_client_datashare)
 	|| SUCCESS != PHP_MINIT_CALL(http_url)
 	|| SUCCESS != PHP_MINIT_CALL(http_env)
+	|| SUCCESS != PHP_MINIT_CALL(http_env_request)
 	|| SUCCESS != PHP_MINIT_CALL(http_env_response)
 	|| SUCCESS != PHP_MINIT_CALL(http_params)
 	) {
@@ -180,12 +176,8 @@ PHP_MSHUTDOWN_FUNCTION(http)
 #if PHP_HTTP_HAVE_CURL
 	|| SUCCESS != PHP_MSHUTDOWN_CALL(http_curl)
 #endif
-#if PHP_HTTP_HAVE_NEON
-	|| SUCCESS != PHP_MSHUTDOWN_CALL(http_neon)
-#endif
-	|| SUCCESS != PHP_MSHUTDOWN_CALL(http_request_datashare)
-	|| SUCCESS != PHP_MSHUTDOWN_CALL(http_request_factory)
 	|| SUCCESS != PHP_MSHUTDOWN_CALL(http_persistent_handle)
+	|| SUCCESS != PHP_MSHUTDOWN_CALL(http_client_factory)
 	) {
 		return FAILURE;
 	}
@@ -197,9 +189,8 @@ PHP_RINIT_FUNCTION(http)
 {
 	if (0
 	|| SUCCESS != PHP_RINIT_CALL(http_env)
-	|| SUCCESS != PHP_RINIT_CALL(http_request_datashare)
-#if PHP_HTTP_HAVE_CURL
-	|| SUCCESS != PHP_RINIT_CALL(http_curl)
+#if PHP_HTTP_HAVE_CURL && PHP_HTTP_HAVE_EVENT
+	|| SUCCESS != PHP_RINIT_CALL(http_curl_client_pool)
 #endif
 	) {
 		return FAILURE;
@@ -212,7 +203,6 @@ PHP_RSHUTDOWN_FUNCTION(http)
 {
 	if (0
 	|| SUCCESS != PHP_RSHUTDOWN_CALL(http_env)
-	|| SUCCESS != PHP_RSHUTDOWN_CALL(http_request_datashare)
 	) {
 		return FAILURE;
 	}
@@ -238,15 +228,6 @@ PHP_MINFO_FUNCTION(http)
 #else
 	php_info_print_table_row(3, "libcurl", "disabled", "disabled");
 #endif
-#if PHP_HTTP_HAVE_NEON
-	{
-		char ne_v[16] = {0};
-		sscanf(ne_version_string(), "neon %15[^ :]", &ne_v[0]);
-		php_info_print_table_row(3, "libneon", PHP_HTTP_NEON_VERSION, ne_v);
-	}
-#else
-	php_info_print_table_row(3, "libneon", "disabled", "disabled");
-#endif
 
 #if PHP_HTTP_HAVE_EVENT
 	php_info_print_table_row(3, "libevent", PHP_HTTP_EVENT_VERSION, event_get_version());