X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=095cc1ebdc04cb6bcdbf532d561f1fc8ea9efa8c;hp=9eb59b99e600625eb57946d109e65f6d699dd8aa;hb=3a6772376bf9d4cf83484c51e5ed059e958e83cf;hpb=dbc4ec02cd319000b5c8589910047cfe6d5738be

diff --git a/http.c b/http.c
index 9eb59b9..095cc1e 100644
--- a/http.c
+++ b/http.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2007, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -28,9 +28,12 @@
 #include "php_http_cache_api.h"
 #include "php_http_send_api.h"
 #include "php_http_message_api.h"
+#include "php_http_persistent_handle_api.h"
 #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"
 #endif
 #ifdef HTTP_HAVE_ZLIB
 #	include "php_http_encoding_api.h"
@@ -48,6 +51,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"
@@ -66,7 +70,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)
@@ -93,11 +96,15 @@ 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)
 	PHP_FE(http_get_request_body_stream, NULL)
 	PHP_FE(http_match_request_header, NULL)
+	PHP_FE(http_persistent_handles_count, NULL)
+	PHP_FE(http_persistent_handles_clean, NULL)
+	PHP_FE(http_persistent_handles_ident, NULL)
 #ifdef HTTP_HAVE_CURL
 	PHP_FE(http_get, http_arg_pass_ref_3)
 	PHP_FE(http_head, http_arg_pass_ref_3)
@@ -135,16 +142,16 @@ PHP_MINFO_FUNCTION(http);
 /* {{{ http_module_dep */
 #if ZEND_EXTENSION_API_NO >= 220050617
 static zend_module_dep http_module_deps[] = {
-#	ifdef HAVE_SPL
+#	ifdef HTTP_HAVE_SPL
 	ZEND_MOD_REQUIRED("spl")
 #	endif
-#	ifdef HTTP_HAVE_EXT_HASH
+#	ifdef HTTP_HAVE_HASH
 	ZEND_MOD_REQUIRED("hash")
 #	endif
-#	ifdef HAVE_PHP_SESSION
+#	ifdef HTTP_HAVE_SESSION
 	ZEND_MOD_REQUIRED("session")
 #	endif
-#	ifdef HAVE_ICONV
+#	ifdef HTTP_HAVE_ICONV
 	ZEND_MOD_REQUIRED("iconv")
 #	endif
 	{NULL, NULL, NULL, 0}
@@ -183,18 +190,29 @@ static void http_globals_init_once(zend_http_globals *G)
 #define http_globals_init(g) _http_globals_init((g) TSRMLS_CC)
 static inline void _http_globals_init(zend_http_globals *G TSRMLS_DC)
 {
-	G->send.buffer_size = HTTP_SENDBUF_SIZE;
-#ifndef HTTP_HAVE_SAPI_RTIME
-	G->request_time = time(NULL);
+#ifdef HTTP_HAVE_SAPI_RTIME
+	G->request.time = sapi_get_request_time(TSRMLS_C);
+#else
+	G->request.time = time(NULL);
 #endif
+	G->send.buffer_size = 0;
 	G->read_post_data = 0;
 }
 
 #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;
+	}
 }
 /* }}} */
 
@@ -218,6 +236,11 @@ 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);
 }
+PHP_INI_MH(http_update_persistent_handle_ident)
+{
+	HTTP_G->persistent.handles.ident.h = zend_hash_func(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);
+}
 
 #ifndef ZEND_ENGINE_2
 #	define OnUpdateLong OnUpdateInt
@@ -227,16 +250,26 @@ PHP_INI_BEGIN()
 	HTTP_PHP_INI_ENTRY("http.etag.mode", "MD5", PHP_INI_ALL, OnUpdateString, etag.mode)
 	HTTP_PHP_INI_ENTRY("http.log.cache", "", PHP_INI_ALL, OnUpdateString, log.cache)
 	HTTP_PHP_INI_ENTRY("http.log.redirect", "", PHP_INI_ALL, OnUpdateString, log.redirect)
+	HTTP_PHP_INI_ENTRY("http.log.not_found", "", PHP_INI_ALL, OnUpdateString, log.not_found)
 	HTTP_PHP_INI_ENTRY("http.log.allowed_methods", "", PHP_INI_ALL, OnUpdateString, log.allowed_methods)
 	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)
 	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
+	HTTP_PHP_INI_ENTRY("http.persistent.handles.limit", "-1", PHP_INI_SYSTEM, OnUpdateLong, persistent.handles.limit)
+	HTTP_PHP_INI_ENTRY("http.persistent.handles.ident", "GLOBAL", PHP_INI_ALL, http_update_persistent_handle_ident, persistent.handles.ident.s)
+	HTTP_PHP_INI_ENTRY("http.send.not_found_404", "1", PHP_INI_ALL, OnUpdateBool, send.not_found_404)
 #ifdef ZEND_ENGINE_2
 	HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions)
 #endif
@@ -253,12 +286,18 @@ PHP_MINIT_FUNCTION(http)
 
 	REGISTER_INI_ENTRIES();
 	
-	if (	(SUCCESS != PHP_MINIT_CALL(http_support))	||
+	if (	(SUCCESS != PHP_MINIT_CALL(http_persistent_handle)) || /* first */
+			(SUCCESS != PHP_MINIT_CALL(http_support))	||
 			(SUCCESS != PHP_MINIT_CALL(http_cookie))	||
 			(SUCCESS != PHP_MINIT_CALL(http_send))		||
 			(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_pool)) ||
+			(SUCCESS != PHP_MINIT_CALL(http_request_datashare)) ||
+#	endif
 #endif /* HTTP_HAVE_CURL */
 #ifdef HTTP_HAVE_ZLIB
 			(SUCCESS != PHP_MINIT_CALL(http_encoding))	||
@@ -278,6 +317,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))	||
@@ -296,9 +336,17 @@ PHP_MINIT_FUNCTION(http)
 PHP_MSHUTDOWN_FUNCTION(http)
 {
 	UNREGISTER_INI_ENTRIES();
+	if (	
 #ifdef HTTP_HAVE_CURL
-	return PHP_MSHUTDOWN_CALL(http_request);
+#	ifdef ZEND_ENGINE_2
+			(SUCCESS != PHP_MSHUTDOWN_CALL(http_request_datashare)) ||
+#	endif
+			(SUCCESS != PHP_MSHUTDOWN_CALL(http_request)) ||
 #endif
+			(SUCCESS != PHP_MSHUTDOWN_CALL(http_persistent_handle)) /* last */
+	) {
+		return FAILURE;
+	}
 	return SUCCESS;
 }
 /* }}} */
@@ -316,6 +364,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;
@@ -334,7 +385,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;
 	}
 	
@@ -359,6 +413,7 @@ PHP_MINFO_FUNCTION(http)
 #	ifdef HTTP_HAVE_CURL
 			"HttpRequest, "
 			"HttpRequestPool, "
+			"HttpRequestDataShare, "
 #	endif
 #	ifdef HTTP_HAVE_ZLIB
 			"HttpDeflateStream, "
@@ -395,7 +450,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");
@@ -403,6 +458,42 @@ PHP_MINFO_FUNCTION(http)
 	}
 	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;
+		HashKey provider = initHashKey(0), ident = initHashKey(0);
+		zval **val, **sub, **zused, **zfree;
+		
+		if ((ht = http_persistent_handle_statall()) && 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)) {
+							convert_to_string(*zused);
+							convert_to_string(*zfree);
+							php_info_print_table_row(4, provider.str, ident.str, Z_STRVAL_PP(zused), Z_STRVAL_PP(zfree));
+						} 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();
+	
 	php_info_print_table_start();
 	php_info_print_table_colspan_header(2, "Request Methods");
 	{