X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=e57263c0c075f4f4dd7f419d0d45d851f81356d8;hp=eccffd8e0bc7ed4576f5958e7d88db1b41ec35e8;hb=197ec5e6c91d92a964d2b85bb43be66c21121e05;hpb=fa6e9a361695e1c273266c79d0d27ff19059bb8a

diff --git a/http.c b/http.c
index eccffd8..e57263c 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_pool_api.h"
 #	include "php_http_request_datashare_api.h"
 #	ifdef HTTP_HAVE_PERSISTENT_HANDLES
 #		include "php_http_persistent_handle_api.h"
@@ -107,6 +108,7 @@ zend_function_entry http_functions[] = {
 #	ifdef HTTP_HAVE_PERSISTENT_HANDLES
 	PHP_FE(http_persistent_handles_count, NULL)
 	PHP_FE(http_persistent_handles_clean, NULL)
+	PHP_FE(http_persistent_handles_ident, NULL)
 #	endif
 	PHP_FE(http_get, http_arg_pass_ref_3)
 	PHP_FE(http_head, http_arg_pass_ref_3)
@@ -198,7 +200,6 @@ static inline void _http_globals_init(zend_http_globals *G TSRMLS_DC)
 	G->request.time = time(NULL);
 #endif
 	G->send.buffer_size = 0;
-	G->send.not_found_404 = 1;
 	G->read_post_data = 0;
 }
 
@@ -239,6 +240,13 @@ PHP_INI_MH(http_update_allowed_methods)
 	http_check_allowed_methods(new_value, new_value_length);
 	return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
 }
+#ifdef HTTP_HAVE_PERSISTENT_HANDLES
+PHP_INI_MH(http_update_persistent_handle_ident)
+{
+	HTTP_G->persistent.handles.ident.h = zend_get_hash_value(new_value, HTTP_G->persistent.handles.ident.l = new_value_length+1);
+	return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
+}
+#endif
 
 #ifndef ZEND_ENGINE_2
 #	define OnUpdateLong OnUpdateInt
@@ -264,6 +272,9 @@ PHP_INI_BEGIN()
 	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
+#ifdef HTTP_HAVE_PERSISTENT_HANDLES
+	HTTP_PHP_INI_ENTRY("http.persistent.handles.ident", "GLOBAL", PHP_INI_ALL, http_update_persistent_handle_ident, persistent.handles.ident.s)
 #endif
 	HTTP_PHP_INI_ENTRY("http.send.not_found_404", "1", PHP_INI_ALL, OnUpdateBool, send.not_found_404)
 #ifdef ZEND_ENGINE_2
@@ -289,6 +300,7 @@ PHP_MINIT_FUNCTION(http)
 #ifdef HTTP_HAVE_CURL
 #	ifdef HTTP_HAVE_PERSISTENT_HANDLES
 			(SUCCESS != PHP_MINIT_CALL(http_persistent_handle)) ||
+			(SUCCESS != PHP_MINIT_CALL(http_request_pool)) ||
 #	endif
 			(SUCCESS != PHP_MINIT_CALL(http_request))	||
 #	ifdef ZEND_ENGINE_2
@@ -431,6 +443,35 @@ PHP_MINFO_FUNCTION(http)
 			"http.chunked_decode, http.chunked_encode, http.deflate, http.inflate"
 #endif
 		);
+#ifdef HTTP_HAVE_PERSISTENT_HANDLES
+		{
+			phpstr s;
+			HashTable *ht;
+			HashPosition pos;
+			HashKey key = initHashKey(0);
+			zval **val;
+			
+			if ((ht = http_persistent_handle_statall())) {
+				phpstr_init(&s);
+				
+				FOREACH_HASH_KEYVAL(pos, ht, key, val) {
+					phpstr_appendf(&s, "%s (%ld), ", key.str, Z_LVAL_PP(val));
+				}
+				zend_hash_destroy(ht);
+				FREE_HASHTABLE(ht);
+				
+				PHPSTR_LEN(&s) -= 2; /* get rid of last ", " */
+				phpstr_fix(&s);
+				
+				php_info_print_table_row(2, "Persistent Handles", PHPSTR_VAL(&s));
+				phpstr_dtor(&s);
+			} else {
+				php_info_print_table_row(2, "Persistent Handles", "none");
+			}
+		}
+#else
+		php_info_print_table_row(2, "Persistent Handles", "disabled");
+#endif
 	}
 	php_info_print_table_end();
 	
@@ -448,7 +489,7 @@ PHP_MINFO_FUNCTION(http)
 #else
 		php_info_print_table_row(3, "libz", "disabled", "disabled");
 #endif
-#if defined(HTTP_HAVE_MAGIC) && !defined(WONKY)
+#if defined(HTTP_HAVE_MAGIC)
 		php_info_print_table_row(3, "libmagic", "unknown", "unknown");
 #else
 		php_info_print_table_row(3, "libmagic", "disabled", "disabled");