X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=5d0491a19ff14ce1db779ee34e1591e7c92c3bdb;hp=3b0588719324a8140363227e023e543f47552643;hb=ffc893b125c6cc9b385a68a357b08ba2cc4e91f6;hpb=f6280c0f47b07d5c6079f7074491b6173c89599f

diff --git a/http.c b/http.c
index 3b05887..5d0491a 100644
--- a/http.c
+++ b/http.c
@@ -29,12 +29,18 @@
 #include "php_http_std_defs.h"
 #include "php_http_api.h"
 #include "php_http_send_api.h"
-#include "php_http_request_api.h"
+#include "php_http_cache_api.h"
+#include "php_http_request_method_api.h"
+#ifdef HTTP_HAVE_CURL
+#	include "php_http_request_api.h"
+#endif
 
 #ifdef ZEND_ENGINE_2
 #	include "php_http_util_object.h"
 #	include "php_http_message_object.h"
-#	include "php_http_response_object.h"
+#	ifndef WONKY
+#		include "php_http_response_object.h"
+#	endif
 #	ifdef HTTP_HAVE_CURL
 #		include "php_http_request_object.h"
 #		include "php_http_requestpool_object.h"
@@ -42,6 +48,7 @@
 #	include "php_http_exception_object.h"
 #endif
 
+#include "missing.h"
 #include "phpstr/phpstr.h"
 
 #ifdef HTTP_HAVE_CURL
@@ -50,6 +57,9 @@
 #	endif
 #	include <curl/curl.h>
 #endif
+#ifdef HTTP_HAVE_MHASH
+#	include <mhash.h>
+#endif
 
 #include <ctype.h>
 
@@ -61,7 +71,7 @@ ZEND_GET_MODULE(http)
 #endif
 
 /* {{{ http_functions[] */
-function_entry http_functions[] = {
+zend_function_entry http_functions[] = {
 	PHP_FE(http_test, NULL)
 	PHP_FE(http_date, NULL)
 	PHP_FE(http_absolute_uri, NULL)
@@ -81,7 +91,7 @@ function_entry http_functions[] = {
 	PHP_FE(http_send_file, NULL)
 	PHP_FE(http_send_stream, NULL)
 	PHP_FE(http_chunked_decode, NULL)
-	PHP_FE(http_split_response, NULL)
+	PHP_FE(http_parse_message, NULL)
 	PHP_FE(http_parse_headers, NULL)
 	PHP_FE(http_get_request_headers, NULL)
 	PHP_FE(http_get_request_body, NULL)
@@ -93,18 +103,17 @@ function_entry http_functions[] = {
 	PHP_FE(http_post_fields, http_arg_pass_ref_5)
 	PHP_FE(http_put_file, http_arg_pass_ref_4)
 	PHP_FE(http_put_stream, http_arg_pass_ref_4)
+#endif
 	PHP_FE(http_request_method_register, NULL)
 	PHP_FE(http_request_method_unregister, NULL)
 	PHP_FE(http_request_method_exists, NULL)
 	PHP_FE(http_request_method_name, NULL)
-#endif
-	PHP_FE(http_auth_basic, NULL)
-	PHP_FE(http_auth_basic_cb, NULL)
 #ifndef ZEND_ENGINE_2
 	PHP_FE(http_build_query, NULL)
 #endif
 	PHP_FE(ob_etaghandler, NULL)
-	{NULL, NULL, NULL}
+	
+	EMPTY_FUNCTION_ENTRY
 };
 /* }}} */
 
@@ -130,27 +139,33 @@ zend_module_entry http_module_entry = {
 int http_module_number;
 
 /* {{{ http_globals */
-static inline void http_globals_init(zend_http_globals *G)
+static void http_globals_init_once(zend_http_globals *G)
 {
 	memset(G, 0, sizeof(zend_http_globals));
+}
+
+static inline void http_globals_init(zend_http_globals *G)
+{
 	G->send.buffer_size = HTTP_SENDBUF_SIZE;
 	zend_hash_init(&G->request.methods.custom, 0, NULL, ZVAL_PTR_DTOR, 0);
 #ifdef HTTP_HAVE_CURL
 	zend_llist_init(&G->request.copies.strings, sizeof(char *), http_request_data_free_string, 0);
 	zend_llist_init(&G->request.copies.slists, sizeof(struct curl_slist *), http_request_data_free_slist, 0);
-	zend_llist_init(&G->request.copies.contexts, sizeof(http_curl_callback_ctx *), http_request_data_free_context, 0);
+	zend_llist_init(&G->request.copies.contexts, sizeof(http_request_callback_ctx *), http_request_data_free_context, 0);
+	zend_llist_init(&G->request.copies.convs, sizeof(http_request_conv *), http_request_data_free_conv, 0);
 #endif
 }
 
 static inline void http_globals_free(zend_http_globals *G)
 {
-	STR_FREE(G->send.content_type);
-	STR_FREE(G->send.unquoted_etag);
+	STR_SET(G->send.content_type, NULL);
+	STR_SET(G->send.unquoted_etag, NULL);
 	zend_hash_destroy(&G->request.methods.custom);
 #ifdef HTTP_HAVE_CURL
 	zend_llist_clean(&G->request.copies.strings);
 	zend_llist_clean(&G->request.copies.slists);
 	zend_llist_clean(&G->request.copies.contexts);
+	zend_llist_clean(&G->request.copies.convs);
 #endif
 }
 /* }}} */
@@ -176,24 +191,84 @@ PHP_INI_MH(http_update_allowed_methods)
 	return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
 }
 
+PHP_INI_DISP(http_etag_mode_displayer)
+{
+	long value;
+	
+	if (type == ZEND_INI_DISPLAY_ORIG && ini_entry->modified) {
+		value = (ini_entry->orig_value) ? atoi(ini_entry->orig_value) : HTTP_ETAG_MD5;
+	} else if (ini_entry->value) {
+		value = (ini_entry->value[0]) ? atoi(ini_entry->value) : HTTP_ETAG_MD5;
+	} else {
+		value = HTTP_ETAG_MD5;
+	}
+	
+	switch (value)
+	{
+		case HTTP_ETAG_CRC32:
+			ZEND_WRITE("HTTP_ETAG_CRC32", lenof("HTTP_ETAG_CRC32"));
+		break;
+		
+		case HTTP_ETAG_SHA1:
+			ZEND_WRITE("HTTP_ETAG_SHA1", lenof("HTTP_ETAG_SHA1"));
+		break;
+		
+		case HTTP_ETAG_MD5:
+#ifndef HTTP_HAVE_MHASH
+		default:
+#endif
+			ZEND_WRITE("HTTP_ETAG_MD5", lenof("HTTP_ETAG_MD5"));
+		break;
+		
+#ifdef HTTP_HAVE_MHASH
+		default:
+		{
+			const char *hash_name = mhash_get_hash_name_static(value);
+			
+			if (!hash_name) {
+				ZEND_WRITE("HTTP_ETAG_MD5", lenof("HTTP_ETAG_MD5"));
+			} else {
+				ZEND_WRITE("HTTP_ETAG_MHASH_", lenof("HTTP_ETAG_MHASH_"));
+				ZEND_WRITE(hash_name, strlen(hash_name));
+			}
+		}
+		break;
+#endif
+	}
+}
+
+#ifndef ZEND_ENGINE_2
+#	define OnUpdateLong OnUpdateInt
+#endif
+
 PHP_INI_BEGIN()
-	HTTP_PHP_INI_ENTRY("http.allowed_methods", NULL, PHP_INI_ALL, http_update_allowed_methods, request.methods.allowed)
-	HTTP_PHP_INI_ENTRY("http.cache_log", NULL, PHP_INI_ALL, OnUpdateString, log.cache)
+	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)
+#ifdef ZEND_ENGINE_2
+	HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions)
+#endif
+	HTTP_PHP_INI_ENTRY_EX("http.etag_mode", "-2", PHP_INI_ALL, OnUpdateLong, http_etag_mode_displayer, etag.mode)
 PHP_INI_END()
 /* }}} */
 
-
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(http)
 {
 	http_module_number = module_number;
 
-#ifdef ZTS
-	ZEND_INIT_MODULE_GLOBALS(http, NULL, NULL)
-#endif
+	ZEND_INIT_MODULE_GLOBALS(http, http_globals_init_once, NULL)
 
 	REGISTER_INI_ENTRIES();
-
+	
+	if (SUCCESS != http_cache_global_init()) {
+		return FAILURE;
+	}
+	if (SUCCESS != http_request_method_global_init()) {
+		return FAILURE;
+	}
 #ifdef HTTP_HAVE_CURL
 	if (SUCCESS != http_request_global_init()) {
 		return FAILURE;
@@ -203,7 +278,9 @@ PHP_MINIT_FUNCTION(http)
 #ifdef ZEND_ENGINE_2
 	http_util_object_init();
 	http_message_object_init();
+#	ifndef WONKY
 	http_response_object_init();
+#	endif
 #	ifdef HTTP_HAVE_CURL
 	http_request_object_init();
 	http_requestpool_object_init();
@@ -220,7 +297,7 @@ PHP_MSHUTDOWN_FUNCTION(http)
 {
 	UNREGISTER_INI_ENTRIES();
 #ifdef HTTP_HAVE_CURL
-	curl_global_cleanup();
+	http_request_global_cleanup();
 #endif
 	return SUCCESS;
 }
@@ -243,6 +320,13 @@ PHP_RINIT_FUNCTION(http)
 /* {{{ PHP_RSHUTDOWN_FUNCTION */
 PHP_RSHUTDOWN_FUNCTION(http)
 {
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
+	int i, c = zend_hash_num_elements(&HTTP_G(request).methods.custom);
+	
+	for (i = 0; i < c; ++i) {
+		http_request_method_unregister(HTTP_MAX_REQUEST_METHOD + i);
+	}
+#endif
 	http_globals_free(HTTP_GLOBALS);
 	return SUCCESS;
 }
@@ -251,37 +335,77 @@ PHP_RSHUTDOWN_FUNCTION(http)
 /* {{{ PHP_MINFO_FUNCTION */
 PHP_MINFO_FUNCTION(http)
 {
-#ifdef ZEND_ENGINE_2
-#	define HTTP_FUNC_AVAIL(CLASS) "procedural, object oriented (" CLASS ")"
+	php_info_print_table_start();
+	{
+		php_info_print_table_row(2, "Extended HTTP support", "enabled");
+		php_info_print_table_row(2, "Extension Version", HTTP_PEXT_VERSION);
+#ifdef HTTP_HAVE_CURL
+		php_info_print_table_row(2, "cURL HTTP Requests", curl_version());
 #else
-#	define HTTP_FUNC_AVAIL(CLASS) "procedural"
+		php_info_print_table_row(2, "cURL HTTP Requests", "disabled");
 #endif
-
-#ifdef HTTP_HAVE_CURL
-#	define HTTP_CURL_VERSION curl_version()
-#	ifdef ZEND_ENGINE_2
-#		define HTTP_CURL_AVAIL(CLASS) "procedural, object oriented (" CLASS ")"
-#	else
-#		define HTTP_CURL_AVAIL(CLASS) "procedural"
-#	endif
+#ifdef HTTP_HAVE_MHASH
+		{
+			char mhash_info[32];
+			
+			snprintf(mhash_info, 32, "libmhash/%d", MHASH_API_VERSION);
+			php_info_print_table_row(2, "mhash ETag Generator", mhash_info);
+		}
 #else
-#	define HTTP_CURL_VERSION "libcurl not available"
-#	define HTTP_CURL_AVAIL(CLASS) "libcurl not available"
+		php_info_print_table_row(2, "mhash ETag Generator", "disabled");
 #endif
-
-#include "php_http_request_api.h"
-
+#if defined(HTTP_HAVE_MAGIC) && !defined(WONKY)
+		php_info_print_table_row(2, "magic MIME Guessing", "libmagic/unknown");
+#else
+		php_info_print_table_row(2, "magic MIME Guessing", "disabled");
+#endif
+		php_info_print_table_row(2, "Registered Classes",
+#ifndef ZEND_ENGINE_2
+			"none"
+#else
+			"HttpUtil, "
+			"HttpMessage, "
+#	ifdef HTTP_HAVE_CURL
+			"HttpRequest, "
+			"HttpRequestPool, "
+#	endif
+#	ifndef WONKY
+			"HttpResponse"
+#	endif
+#endif
+		);
+	}
+	php_info_print_table_end();
+	
 	php_info_print_table_start();
+	php_info_print_table_colspan_header(2, "Supported ETag Hash Algorithms");
 	{
-		char full_version_string[1024] = {0};
-		snprintf(full_version_string, 1023, "%s (%s)", HTTP_PEXT_VERSION, HTTP_CURL_VERSION);
-
-		php_info_print_table_row(2, "Extended HTTP support:", "enabled");
-		php_info_print_table_row(2, "Extension Version:", full_version_string);
+			
+		php_info_print_table_row(2, "PHP", "CRC32, MD5, SHA1");
+#ifdef HTTP_HAVE_MHASH
+		{
+			phpstr *algos = phpstr_new();
+			int i, c = mhash_count();
+			
+			for (i = 0; i <= c; ++i) {
+				const char *hash = mhash_get_hash_name_static(i);
+				
+				if (hash) {
+					phpstr_appendf(algos, "%s, ", hash);
+				}
+			}
+			phpstr_fix(algos);
+			php_info_print_table_row(2, "MHASH", PHPSTR_VAL(algos));
+			phpstr_free(&algos);
+		}
+#else
+		php_info_print_table_row(2, "MHASH", "not available");
+#endif
 	}
 	php_info_print_table_end();
 
 	php_info_print_table_start();
+	php_info_print_table_colspan_header(2, "Request Methods");
 	{
 		unsigned i;
 		zval **custom_method;
@@ -301,21 +425,13 @@ PHP_MINFO_FUNCTION(http)
 		phpstr_fix(known_request_methods);
 		phpstr_fix(custom_request_methods);
 
-		php_info_print_table_row(2, "Known Request Methods:", PHPSTR_VAL(known_request_methods));
-		php_info_print_table_row(2, "Custom Request Methods:",
+		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");
-
-		phpstr_free(known_request_methods);
-		phpstr_free(custom_request_methods);
-	}
-	php_info_print_table_end();
-
-	php_info_print_table_start();
-	{
-		php_info_print_table_header(2, "Functionality",            "Availability");
-		php_info_print_table_row(2,    "Miscellaneous Utilities:", HTTP_FUNC_AVAIL("HttpUtil, HttpMessage"));
-		php_info_print_table_row(2,    "Extended HTTP Responses:", HTTP_FUNC_AVAIL("HttpResponse"));
-		php_info_print_table_row(2,    "Extended HTTP Requests:",  HTTP_CURL_AVAIL("HttpRequest, HttpRequestPool"));
+		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);
 	}
 	php_info_print_table_end();