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

diff --git a/http.c b/http.c
index b50682f..e55b35f 100644
--- a/http.c
+++ b/http.c
@@ -31,7 +31,11 @@
 #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"
+#	endif
 #endif
 #ifdef HTTP_HAVE_ZLIB
 #	include "php_http_encoding_api.h"
@@ -68,7 +72,6 @@ ZEND_GET_MODULE(http)
 
 /* {{{ http_functions[] */
 zend_function_entry http_functions[] = {
-	PHP_FE(http_test, NULL)
 	PHP_FE(http_date, NULL)
 	PHP_FE(http_build_url, http_arg_pass_ref_4)
 	PHP_FE(http_build_str, NULL)
@@ -102,6 +105,10 @@ zend_function_entry http_functions[] = {
 	PHP_FE(http_get_request_body_stream, NULL)
 	PHP_FE(http_match_request_header, NULL)
 #ifdef HTTP_HAVE_CURL
+#	ifdef HTTP_HAVE_PERSISTENT_HANDLES
+	PHP_FE(http_persistent_handles_count, NULL)
+	PHP_FE(http_persistent_handles_clean, NULL)
+#	endif
 	PHP_FE(http_get, http_arg_pass_ref_3)
 	PHP_FE(http_head, http_arg_pass_ref_3)
 	PHP_FE(http_post_data, http_arg_pass_ref_4)
@@ -187,7 +194,7 @@ static void http_globals_init_once(zend_http_globals *G)
 static inline void _http_globals_init(zend_http_globals *G TSRMLS_DC)
 {
 #ifdef HTTP_HAVE_SAPI_RTIME
-	G->request.time = Z_LVAL_P(http_get_server_var("REQUEST_TIME"));
+	G->request.time = sapi_get_request_time(TSRMLS_C);
 #else
 	G->request.time = time(NULL);
 #endif
@@ -199,8 +206,17 @@ static inline void _http_globals_init(zend_http_globals *G TSRMLS_DC)
 #define http_globals_free(g) _http_globals_free((g) TSRMLS_CC)
 static inline void _http_globals_free(zend_http_globals *G TSRMLS_DC)
 {
+	if (G->request.headers) {
+		zend_hash_destroy(G->request.headers);
+		FREE_HASHTABLE(G->request.headers);
+		G->request.headers = NULL;
+	}
 	STR_SET(G->send.content_type, NULL);
 	STR_SET(G->send.unquoted_etag, NULL);
+	if (G->server_var) {
+		zval_ptr_dtor(&G->server_var);
+		G->server_var = NULL;
+	}
 }
 /* }}} */
 
@@ -272,6 +288,10 @@ PHP_MINIT_FUNCTION(http)
 			(SUCCESS != PHP_MINIT_CALL(http_send))		||
 			(SUCCESS != PHP_MINIT_CALL(http_url))		||
 #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
 			(SUCCESS != PHP_MINIT_CALL(http_request_datashare)) ||
@@ -319,7 +339,11 @@ PHP_MSHUTDOWN_FUNCTION(http)
 #	ifdef ZEND_ENGINE_2
 			(SUCCESS != PHP_MSHUTDOWN_CALL(http_request_datashare)) ||
 #	endif
-			(SUCCESS != PHP_MSHUTDOWN_CALL(http_request))) {
+			(SUCCESS != PHP_MSHUTDOWN_CALL(http_request))
+#	ifdef HTTP_HAVE_PERSISTENT_HANDLES
+			|| (SUCCESS != PHP_MSHUTDOWN_CALL(http_persistent_handle))
+#	endif
+	) {
 		return FAILURE;
 	}
 #endif
@@ -409,6 +433,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();