X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=364710d5191e2f2d14bc8d85fe01d307a950ba8d;hp=831040916bf2eef7a72ff7e082ddf55644d75d18;hb=ed599c827d2e799b749b913cad2b9f05ab724375;hpb=1a0dbb96fbe46a2edec1c813798cef7b0898eebe

diff --git a/http.c b/http.c
index 8310409..364710d 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>            |
     +--------------------------------------------------------------------+
 */
 
@@ -24,12 +24,18 @@
 
 #include "php_http_api.h"
 #include "php_http_send_api.h"
+#include "php_http_cookie_api.h"
 #include "php_http_cache_api.h"
 #include "php_http_send_api.h"
 #include "php_http_message_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"
+#	ifdef HTTP_HAVE_PERSISTENT_HANDLES
+#		include "php_http_persistent_handle_api.h"
+#	endif
 #endif
 #ifdef HTTP_HAVE_ZLIB
 #	include "php_http_encoding_api.h"
@@ -47,6 +53,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"
@@ -65,12 +72,11 @@ 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)
 #ifndef ZEND_ENGINE_2
-	PHP_FALIAS(http_build_query, http_build_str)
+	PHP_FALIAS(http_build_query, http_build_str, NULL)
 #endif
 	PHP_FE(http_negotiate_language, http_arg_pass_ref_2)
 	PHP_FE(http_negotiate_charset, http_arg_pass_ref_2)
@@ -92,17 +98,27 @@ 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)
 #ifdef HTTP_HAVE_CURL
+#	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)
 	PHP_FE(http_post_data, http_arg_pass_ref_4)
 	PHP_FE(http_post_fields, http_arg_pass_ref_5)
+	PHP_FE(http_put_data, http_arg_pass_ref_4)
 	PHP_FE(http_put_file, http_arg_pass_ref_4)
 	PHP_FE(http_put_stream, http_arg_pass_ref_4)
+	PHP_FE(http_request, http_arg_pass_ref_5)
+	PHP_FE(http_request_body_encode, NULL)
 #endif
 	PHP_FE(http_request_method_register, NULL)
 	PHP_FE(http_request_method_unregister, NULL)
@@ -121,17 +137,26 @@ zend_function_entry http_functions[] = {
 };
 /* }}} */
 
+PHP_MINIT_FUNCTION(http);
+PHP_MSHUTDOWN_FUNCTION(http);
+PHP_RINIT_FUNCTION(http);
+PHP_RSHUTDOWN_FUNCTION(http);
+PHP_MINFO_FUNCTION(http);
+
 /* {{{ http_module_dep */
 #if ZEND_EXTENSION_API_NO >= 220050617
-static zend_module_dep http_module_dep[] = {
-#	ifdef HAVE_SPL
+static zend_module_dep http_module_deps[] = {
+#	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 HTTP_HAVE_ICONV
+	ZEND_MOD_REQUIRED("iconv")
 #	endif
 	{NULL, NULL, NULL, 0}
 };
@@ -142,7 +167,7 @@ static zend_module_dep http_module_dep[] = {
 zend_module_entry http_module_entry = {
 #if ZEND_EXTENSION_API_NO >= 220050617
 	STANDARD_MODULE_HEADER_EX, NULL,
-	http_module_dep,
+	http_module_deps,
 #else
 	STANDARD_MODULE_HEADER,
 #endif
@@ -169,18 +194,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;
+	}
 }
 /* }}} */
 
@@ -204,28 +240,47 @@ 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
 #endif
 
 PHP_INI_BEGIN()
-	HTTP_PHP_INI_ENTRY("http.allowed_methods", "", PHP_INI_ALL, http_update_allowed_methods, request.methods.allowed)
-	HTTP_PHP_INI_ENTRY("http.cache_log", "", PHP_INI_ALL, OnUpdateString, log.cache)
-	HTTP_PHP_INI_ENTRY("http.redirect_log", "", PHP_INI_ALL, OnUpdateString, log.redirect)
-	HTTP_PHP_INI_ENTRY("http.allowed_methods_log", "", PHP_INI_ALL, OnUpdateString, log.allowed_methods)
-	HTTP_PHP_INI_ENTRY("http.composite_log", "", PHP_INI_ALL, OnUpdateString, log.composite)
-	HTTP_PHP_INI_ENTRY("http.etag_mode", "MD5", PHP_INI_ALL, OnUpdateString, etag.mode)
+	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
+#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
 	HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions)
 #endif
 	HTTP_PHP_INI_ENTRY("http.force_exit", "1", PHP_INI_ALL, OnUpdateBool, force_exit)
-#ifdef HTTP_HAVE_ZLIB
-	HTTP_PHP_INI_ENTRY("http.ob_inflate_auto", "0", PHP_INI_PERDIR, OnUpdateBool, send.inflate.start_auto)
-	HTTP_PHP_INI_ENTRY("http.ob_inflate_flags", "0", PHP_INI_ALL, OnUpdateLong, send.inflate.start_flags)
-	HTTP_PHP_INI_ENTRY("http.ob_deflate_auto", "0", PHP_INI_PERDIR, OnUpdateBool, send.deflate.start_auto)
-	HTTP_PHP_INI_ENTRY("http.ob_deflate_flags", "0", PHP_INI_ALL, OnUpdateLong, send.deflate.start_flags)
-#endif
 PHP_INI_END()
 /* }}} */
 
@@ -239,10 +294,18 @@ PHP_MINIT_FUNCTION(http)
 	REGISTER_INI_ENTRIES();
 	
 	if (	(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
+#	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)) ||
+#	endif
 #endif /* HTTP_HAVE_CURL */
 #ifdef HTTP_HAVE_ZLIB
 			(SUCCESS != PHP_MINIT_CALL(http_encoding))	||
@@ -262,6 +325,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))	||
@@ -281,7 +345,17 @@ PHP_MSHUTDOWN_FUNCTION(http)
 {
 	UNREGISTER_INI_ENTRIES();
 #ifdef HTTP_HAVE_CURL
-	return PHP_MSHUTDOWN_CALL(http_request);
+	if (	
+#	ifdef ZEND_ENGINE_2
+			(SUCCESS != PHP_MSHUTDOWN_CALL(http_request_datashare)) ||
+#	endif
+			(SUCCESS != PHP_MSHUTDOWN_CALL(http_request))
+#	ifdef HTTP_HAVE_PERSISTENT_HANDLES
+			|| (SUCCESS != PHP_MSHUTDOWN_CALL(http_persistent_handle))
+#	endif
+	) {
+		return FAILURE;
+	}
 #endif
 	return SUCCESS;
 }
@@ -290,16 +364,19 @@ PHP_MSHUTDOWN_FUNCTION(http)
 /* {{{ PHP_RINIT_FUNCTION */
 PHP_RINIT_FUNCTION(http)
 {
-	http_globals_init(HTTP_GLOBALS);
+	http_globals_init(HTTP_G);
 
-	if (HTTP_G(request).methods.allowed) {
-		http_check_allowed_methods(HTTP_G(request).methods.allowed, 
-			strlen(HTTP_G(request).methods.allowed));
+	if (HTTP_G->request.methods.allowed) {
+		http_check_allowed_methods(HTTP_G->request.methods.allowed, 
+			strlen(HTTP_G->request.methods.allowed));
 	}
 
 	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;
@@ -318,11 +395,14 @@ 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;
 	}
 	
-	http_globals_free(HTTP_GLOBALS);
+	http_globals_free(HTTP_G);
 	return status;
 }
 /* }}} */
@@ -343,6 +423,7 @@ PHP_MINFO_FUNCTION(http)
 #	ifdef HTTP_HAVE_CURL
 			"HttpRequest, "
 			"HttpRequestPool, "
+			"HttpRequestDataShare, "
 #	endif
 #	ifdef HTTP_HAVE_ZLIB
 			"HttpDeflateStream, "
@@ -362,6 +443,46 @@ 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 pos1, pos2;
+			HashKey key1 = initHashKey(0), key2 = initHashKey(0);
+			zval **val1, **val2;
+			
+			if ((ht = http_persistent_handle_statall()) && zend_hash_num_elements(ht)) {
+				phpstr_init(&s);
+				
+				FOREACH_HASH_KEYVAL(pos1, ht, key1, val1) {
+					phpstr_append(&s, key1.str, key1.len-1);
+					phpstr_appends(&s, " (");
+					if (zend_hash_num_elements(Z_ARRVAL_PP(val1))) {
+						FOREACH_KEYVAL(pos2, *val1, key2, val2) {
+							phpstr_append(&s, key2.str, key2.len-1);
+							phpstr_appendf(&s, ":%ld, ", Z_LVAL_PP(val2));
+						}
+						PHPSTR_LEN(&s) -= 2;
+					} else {
+						phpstr_appends(&s, "0");
+					}
+					phpstr_appends(&s, "), ");
+				}
+				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();
 	
@@ -379,7 +500,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");
@@ -391,12 +512,11 @@ PHP_MINFO_FUNCTION(http)
 	php_info_print_table_colspan_header(2, "Request Methods");
 	{
 		int i;
-		getGlobals(G);
 		phpstr *custom_request_methods = phpstr_new();
 		phpstr *known_request_methods = phpstr_from_string(HTTP_KNOWN_METHODS, lenof(HTTP_KNOWN_METHODS));
-		http_request_method_entry **ptr = G->request.methods.custom.entries;
+		http_request_method_entry **ptr = HTTP_G->request.methods.custom.entries;
 
-		for (i = 0; i < G->request.methods.custom.count; ++i) {
+		for (i = 0; i < HTTP_G->request.methods.custom.count; ++i) {
 			if (ptr[i]) {
 				phpstr_appendf(custom_request_methods, "%s, ", ptr[i]->name);
 			}
@@ -409,7 +529,7 @@ PHP_MINFO_FUNCTION(http)
 		php_info_print_table_row(2, "Known", PHPSTR_VAL(known_request_methods));
 		php_info_print_table_row(2, "Custom",
 			PHPSTR_LEN(custom_request_methods) ? PHPSTR_VAL(custom_request_methods) : "none registered");
-		php_info_print_table_row(2, "Allowed", strlen(G->request.methods.allowed) ? G->request.methods.allowed : "(ANY)");
+		php_info_print_table_row(2, "Allowed", strlen(HTTP_G->request.methods.allowed) ? HTTP_G->request.methods.allowed : "(ANY)");
 		
 		phpstr_free(&known_request_methods);
 		phpstr_free(&custom_request_methods);