X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.c;h=f7a0b8698f03012f2d8460532fcdb37504ea5649;hp=1fc0513d3532c4926a4adabd65aee2302688fe04;hb=046973e332c1475f9bf7717af9d33a75283deb37;hpb=aacbe6aa75ca07853bf88d5b3647f67f107d1af7

diff --git a/php_http.c b/php_http.c
index 1fc0513..f7a0b86 100644
--- a/php_http.c
+++ b/php_http.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -20,12 +20,14 @@
 #if PHP_HTTP_HAVE_CURL
 #	include <curl/curl.h>
 #	if PHP_HTTP_HAVE_EVENT
-#		include <event.h>
+#		if PHP_HTTP_HAVE_EVENT2
+#			include <event2/event.h>
+#			include <event2/event_struct.h>
+#		else
+#			include <event.h>
+#		endif
 #	endif
 #endif
-#if PHP_HTTP_HAVE_NEON
-#	include <neon/ne_utils.h>
-#endif
 #if PHP_HTTP_HAVE_SERF
 #	include <serf.h>
 #endif
@@ -47,6 +49,8 @@ PHP_RSHUTDOWN_FUNCTION(http);
 PHP_MINFO_FUNCTION(http);
 
 static zend_module_dep http_module_deps[] = {
+	ZEND_MOD_REQUIRED("raphf")
+	ZEND_MOD_REQUIRED("propro")
 	ZEND_MOD_REQUIRED("spl")
 #ifdef PHP_HTTP_HAVE_HASH
 	ZEND_MOD_REQUIRED("hash")
@@ -54,8 +58,8 @@ static zend_module_dep http_module_deps[] = {
 #ifdef PHP_HTTP_HAVE_ICONV
 	ZEND_MOD_REQUIRED("iconv")
 #endif
-#ifdef PHP_HTTP_HAVE_EVENT
-	ZEND_MOD_CONFLICTS("event")
+#ifdef PHP_HTTP_HAVE_JSON
+	ZEND_MOD_REQUIRED("json")
 #endif
 	{NULL, NULL, NULL, 0}
 };
@@ -71,13 +75,13 @@ zend_module_entry http_module_entry = {
 	PHP_RINIT(http),
 	PHP_RSHUTDOWN(http),
 	PHP_MINFO(http),
-	PHP_HTTP_EXT_VERSION,
+	PHP_PECL_HTTP_VERSION,
 	STANDARD_MODULE_PROPERTIES
 };
 
 int http_module_number;
 
-#if PHP_DEBUG
+#if PHP_DEBUG && !HAVE_GCOV
 void _dpf(int type, const char *data, size_t length)
 {
 	static const char _sym[] = "><><><";
@@ -103,6 +107,7 @@ static void php_http_globals_init_once(zend_php_http_globals *G)
 	memset(G, 0, sizeof(*G));
 }
 
+#if 0
 static inline void php_http_globals_init(zend_php_http_globals *G TSRMLS_DC)
 {
 }
@@ -110,23 +115,18 @@ static inline void php_http_globals_init(zend_php_http_globals *G TSRMLS_DC)
 static inline void php_http_globals_free(zend_php_http_globals *G TSRMLS_DC)
 {
 }
+#endif
 
-#if defined(ZTS) && defined(PHP_DEBUG)
-#if ZTS && PHP_DEBUG
+#if ZTS && PHP_DEBUG && !HAVE_GCOV
 zend_php_http_globals *php_http_globals(void)
 {
 	TSRMLS_FETCH();
 	return PHP_HTTP_G;
 }
 #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.persistent_handle.limit", "-1", PHP_INI_SYSTEM, OnUpdateLong, persistent_handle.limit)
+	STD_PHP_INI_ENTRY("http.etag.mode", "crc32b", PHP_INI_ALL, OnUpdateString, env.etag_mode, zend_php_http_globals, php_http_globals)
 PHP_INI_END()
 
 PHP_MINIT_FUNCTION(http)
@@ -136,30 +136,25 @@ PHP_MINIT_FUNCTION(http)
 	REGISTER_INI_ENTRIES();
 	
 	if (0
-	|| SUCCESS != PHP_MINIT_CALL(http_object)
 	|| SUCCESS != PHP_MINIT_CALL(http_exception)
-	|| SUCCESS != PHP_MINIT_CALL(http_persistent_handle)
 	|| SUCCESS != PHP_MINIT_CALL(http_cookie)
 	|| SUCCESS != PHP_MINIT_CALL(http_encoding)
 	|| SUCCESS != PHP_MINIT_CALL(http_filter)
 	|| SUCCESS != PHP_MINIT_CALL(http_header)
 	|| SUCCESS != PHP_MINIT_CALL(http_message)
+	|| SUCCESS != PHP_MINIT_CALL(http_message_parser)
 	|| 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)
+	|| SUCCESS != PHP_MINIT_CALL(http_client_request)
+	|| SUCCESS != PHP_MINIT_CALL(http_client_response)
 #if PHP_HTTP_HAVE_CURL
 	|| SUCCESS != PHP_MINIT_CALL(http_curl)
+	|| SUCCESS != PHP_MINIT_CALL(http_client_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_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)
 	) {
@@ -178,14 +173,10 @@ PHP_MSHUTDOWN_FUNCTION(http)
 	if (0
 	|| SUCCESS != PHP_MSHUTDOWN_CALL(http_message)
 #if PHP_HTTP_HAVE_CURL
+	|| SUCCESS != PHP_MSHUTDOWN_CALL(http_client_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)
 	) {
 		return FAILURE;
 	}
@@ -197,10 +188,6 @@ 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)
-#endif
 	) {
 		return FAILURE;
 	}
@@ -212,7 +199,6 @@ PHP_RSHUTDOWN_FUNCTION(http)
 {
 	if (0
 	|| SUCCESS != PHP_RSHUTDOWN_CALL(http_env)
-	|| SUCCESS != PHP_RSHUTDOWN_CALL(http_request_datashare)
 	) {
 		return FAILURE;
 	}
@@ -222,9 +208,13 @@ PHP_RSHUTDOWN_FUNCTION(http)
 
 PHP_MINFO_FUNCTION(http)
 {
+	php_http_buffer_t buf;
+
+	php_http_buffer_init(&buf);
+
 	php_info_print_table_start();
 	php_info_print_table_header(2, "HTTP Support", "enabled");
-	php_info_print_table_row(2, "Extension Version", PHP_HTTP_EXT_VERSION);
+	php_info_print_table_row(2, "Extension Version", PHP_PECL_HTTP_VERSION);
 	php_info_print_table_end();
 	
 	php_info_print_table_start();
@@ -238,72 +228,19 @@ 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());
+	php_info_print_table_row(3, "libevent",
+#	ifdef LIBEVENT_VERSION
+			LIBEVENT_VERSION,
+#	else
+			PHP_HTTP_EVENT_VERSION,
+#	endif
+			event_get_version());
 #else
 	php_info_print_table_row(3, "libevent", "disabled", "disabled");
 #endif
 
-#if PHP_HTTP_HAVE_SERF
-	{
-		int v[3];
-		char sl_v[16] = {0};
-
-		serf_lib_version(&v[0], &v[1], &v[2]);
-		slprintf(sl_v, lenof(sl_v), "%d.%d.%d", v[0], v[1], v[2]);
-		php_info_print_table_row(3, "libserf", SERF_VERSION_STRING, sl_v);
-	}
-#else
-	php_info_print_table_row(3, "libserf", "disabled", "disabled");
-#endif
-	php_info_print_table_end();
-	
-	php_info_print_table_start();
-	php_info_print_table_colspan_header(4, "Persistent Handles");
-	php_info_print_table_header(4, "Provider", "Ident", "Used", "Free");
-	{
-		HashTable *ht;
-		HashPosition pos1, pos2;
-		php_http_array_hashkey_t provider = php_http_array_hashkey_init(0), ident = php_http_array_hashkey_init(0);
-		zval **val, **sub, **zused, **zfree;
-		
-		if ((ht = php_http_persistent_handle_statall(NULL TSRMLS_CC)) && zend_hash_num_elements(ht)) {
-			FOREACH_HASH_KEYVAL(pos1, ht, provider, val) {
-				if (zend_hash_num_elements(Z_ARRVAL_PP(val))) {
-					FOREACH_KEYVAL(pos2, *val, ident, sub) {
-						if (	SUCCESS == zend_hash_find(Z_ARRVAL_PP(sub), ZEND_STRS("used"), (void *) &zused) &&
-								SUCCESS == zend_hash_find(Z_ARRVAL_PP(sub), ZEND_STRS("free"), (void *) &zfree)) {
-							zval *used = php_http_ztyp(IS_STRING, *zused);
-							zval *free = php_http_ztyp(IS_STRING, *zfree);
-							php_info_print_table_row(4, provider.str, ident.str, Z_STRVAL_P(used), Z_STRVAL_P(free));
-							zval_ptr_dtor(&used);
-							zval_ptr_dtor(&free);
-						} else {
-							php_info_print_table_row(4, provider.str, ident.str, "0", "0");
-						}
-					}
-				} else {
-					php_info_print_table_row(4, provider.str, "N/A", "0", "0");
-				}
-			}
-		} else {
-			php_info_print_table_row(4, "N/A", "N/A", "0", "0");
-		}
-		if (ht) {
-			zend_hash_destroy(ht);
-			FREE_HASHTABLE(ht);
-		}
-	}
 	php_info_print_table_end();
 	
 	DISPLAY_INI_ENTRIES();