X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=97899774f9f3a764f325d053bf076ecbb1476c0b;hp=50f387b81363d3b98eeaf69d2669483e4b742631;hb=d83edb65a0097de2d5baa1a9fd9dbcebed34cc79;hpb=5e35a11e19288bc1263e590c119cafc21b94555c

diff --git a/http.c b/http.c
index 50f387b..9789977 100644
--- a/http.c
+++ b/http.c
@@ -19,71 +19,66 @@
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-
-#ifdef HTTP_HAVE_CURL
-#	ifdef PHP_WIN32
-#		include <winsock2.h>
-#	endif
-#	include <curl/curl.h>
-#endif
-
 #include "php.h"
-#include "php_ini.h"
-#include "ext/standard/info.h"
 
 #include "SAPI.h"
+#include "php_ini.h"
+#include "ext/standard/info.h"
 
 #include "php_http.h"
 #include "php_http_std_defs.h"
+#include "php_http_api.h"
 #include "php_http_send_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"
 #	endif
+#	include "php_http_exception_object.h"
 #endif
 
+#include "missing.h"
 #include "phpstr/phpstr.h"
 
 #ifdef HTTP_HAVE_CURL
-#ifdef ZEND_ENGINE_2
-static
-ZEND_BEGIN_ARG_INFO(http_request_info_ref_3, 0)
-	ZEND_ARG_PASS_INFO(0)
-	ZEND_ARG_PASS_INFO(0)
-	ZEND_ARG_PASS_INFO(1)
-ZEND_END_ARG_INFO();
-
-static
-ZEND_BEGIN_ARG_INFO(http_request_info_ref_4, 0)
-	ZEND_ARG_PASS_INFO(0)
-	ZEND_ARG_PASS_INFO(0)
-	ZEND_ARG_PASS_INFO(0)
-	ZEND_ARG_PASS_INFO(1)
-ZEND_END_ARG_INFO();
-#else
-static unsigned char http_request_info_ref_3[] = {3, BYREF_NONE, BYREF_NONE, BYREF_FORCE};
-static unsigned char http_request_info_ref_4[] = {4, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE};
-#endif /* ZEND_ENGINE_2 */
-#endif /* HTTP_HAVE_CURL */
+#	ifdef PHP_WIN32
+#		include <winsock2.h>
+#	endif
+#	include <curl/curl.h>
+#endif
+#ifdef HTTP_HAVE_MHASH
+#	include <mhash.h>
+#endif
 
-ZEND_DECLARE_MODULE_GLOBALS(http)
+#include <ctype.h>
+
+ZEND_DECLARE_MODULE_GLOBALS(http);
+HTTP_DECLARE_ARG_PASS_INFO();
 
 #ifdef COMPILE_DL_HTTP
 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)
 	PHP_FE(http_negotiate_language, NULL)
 	PHP_FE(http_negotiate_charset, NULL)
 	PHP_FE(http_redirect, NULL)
+	PHP_FE(http_throttle, NULL)
 	PHP_FE(http_send_status, NULL)
 	PHP_FE(http_send_last_modified, NULL)
 	PHP_FE(http_send_content_type, NULL)
@@ -96,22 +91,29 @@ 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)
+	PHP_FE(http_match_request_header, NULL)
 #ifdef HTTP_HAVE_CURL
-	PHP_FE(http_get, http_request_info_ref_3)
-	PHP_FE(http_head, http_request_info_ref_3)
-	PHP_FE(http_post_data, http_request_info_ref_4)
-	PHP_FE(http_post_array, http_request_info_ref_4)
+	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_file, http_arg_pass_ref_4)
+	PHP_FE(http_put_stream, http_arg_pass_ref_4)
 #endif
-	PHP_FE(http_auth_basic, NULL)
-	PHP_FE(http_auth_basic_cb, NULL)
+	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)
 #ifndef ZEND_ENGINE_2
 	PHP_FE(http_build_query, NULL)
 #endif
-	PHP_FE(ob_httpetaghandler, NULL)
-	{NULL, NULL, NULL}
+	PHP_FE(ob_etaghandler, NULL)
+	
+	EMPTY_FUNCTION_ENTRY
 };
 /* }}} */
 
@@ -134,105 +136,151 @@ zend_module_entry http_module_entry = {
 };
 /* }}} */
 
+int http_module_number;
 
-static void free_to_free(void *s)
+/* {{{ http_globals */
+static void http_globals_init_once(zend_http_globals *G)
 {
-	efree(*(char **)s);
+	memset(G, 0, sizeof(zend_http_globals));
 }
 
-/* {{{ php_http_init_globals(zend_http_globals *) */
-static void php_http_init_globals(zend_http_globals *http_globals)
+static inline void http_globals_init(zend_http_globals *G)
 {
-	http_globals->etag_started = 0;
-	http_globals->ctype = NULL;
-	http_globals->etag  = NULL;
-	http_globals->lmod  = 0;
+	G->send.buffer_size = HTTP_SENDBUF_SIZE;
+	zend_hash_init(&G->request.methods.custom, 0, NULL, ZVAL_PTR_DTOR, 0);
 #ifdef HTTP_HAVE_CURL
-	phpstr_init_ex(&http_globals->curlbuf, HTTP_CURLBUF_SIZE, 0);
-#	if LIBCURL_VERSION_NUM < 0x070c00
-	memset(&http_globals->curlerr, 0, sizeof(http_globals->curlerr));
-#	endif
-	zend_llist_init(&http_globals->to_free, sizeof(char *), free_to_free, 0);
+	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_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_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
-	http_globals->allowed_methods = NULL;
 }
 /* }}} */
 
-/* {{{ static inline STATUS http_check_allowed_methods(char *, int) */
+/* {{{ static inline void http_check_allowed_methods(char *, int) */
 #define http_check_allowed_methods(m, l) _http_check_allowed_methods((m), (l) TSRMLS_CC)
 static inline void _http_check_allowed_methods(char *methods, int length TSRMLS_DC)
 {
-	if (length && SG(request_info).request_method && (!strstr(methods, SG(request_info).request_method))) {
-		char *allow_header = emalloc(length + sizeof("Allow: "));
-		sprintf(allow_header, "Allow: %s", methods);
-		http_send_header(allow_header);
-		efree(allow_header);
-		http_send_status(405);
-		zend_bailout();
+	if (length && SG(request_info).request_method) {
+		if (SUCCESS != http_check_method_ex(SG(request_info).request_method, methods)) {
+			char *header = emalloc(length + sizeof("Allow: "));
+			sprintf(header, "Allow: %s", methods);
+			http_exit(405, header);
+		}
 	}
 }
 /* }}} */
 
 /* {{{ PHP_INI */
-PHP_INI_MH(update_allowed_methods)
+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_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_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|MHASH_", lenof("HTTP_ETAG_MHASH|MHASH_"));
+				ZEND_WRITE(hash_name, strlen(hash_name));
+			}
+		}
+		break;
+#endif
+	}
+}
+
+#ifndef ZEND_ENGINE_2
+#	define OnUpdateLong OnUpdateInt
+#endif
+
 PHP_INI_BEGIN()
-	STD_PHP_INI_ENTRY("http.allowed_methods",
-		/* HTTP 1.1 */
-		"GET, HEAD, POST, PUT, DELETE, OPTIONS, TRACE, CONNECT, "
-		/* WebDAV - RFC 2518 * /
-		"PROPFIND, PROPPATCH, MKCOL, COPY, MOVE, LOCK, UNLOCK, "
-		/* WebDAV Versioning - RFC 3253 * /
-		"VERSION-CONTROL, REPORT, CHECKOUT, CHECKIN, UNCHECKOUT, "
-		"MKWORKSPACE, UPDATE, LABEL, MERGE, BASELINE-CONTROL, MKACTIVITY, "
-		/* WebDAV Access Control - RFC 3744 * /
-		"ACL, "
-		/* END */
-		,
-		PHP_INI_ALL, update_allowed_methods, allowed_methods, zend_http_globals, http_globals)
+	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()
 /* }}} */
 
-/* {{{ HTTP_CURL_USE_ZEND_MM */
-#if defined(HTTP_HAVE_CURL) && defined(HTTP_CURL_USE_ZEND_MM)
-static void http_curl_free(void *p)					{ efree(p); }
-static char *http_curl_strdup(const char *p)		{ return estrdup(p); }
-static void *http_curl_malloc(size_t s)				{ return emalloc(s); }
-static void *http_curl_realloc(void *p, size_t s)	{ return erealloc(p, s); }
-static void *http_curl_calloc(size_t n, size_t s)	{ return ecalloc(n, s); }
-#endif /* HTTP_HAVE_CURL && HTTP_CURL_USE_ZEND_MM */
-/* }}} */
 
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(http)
 {
-	ZEND_INIT_MODULE_GLOBALS(http, php_http_init_globals, NULL);
+	http_module_number = module_number;
+
+	ZEND_INIT_MODULE_GLOBALS(http, http_globals_init_once, NULL)
+
 	REGISTER_INI_ENTRIES();
+	
+	HTTP_LONG_CONSTANT("HTTP_ETAG_MD5", HTTP_ETAG_MD5);
+	HTTP_LONG_CONSTANT("HTTP_ETAG_SHA1", HTTP_ETAG_SHA1);
+	HTTP_LONG_CONSTANT("HTTP_ETAG_MHASH", HTTP_ETAG_MHASH);
 
 #ifdef HTTP_HAVE_CURL
-#	ifdef HTTP_CURL_USE_ZEND_MM
-	if (CURLE_OK != curl_global_init_mem(CURL_GLOBAL_ALL,
-			http_curl_malloc,
-			http_curl_free,
-			http_curl_realloc,
-			http_curl_strdup,
-			http_curl_calloc)) {
+	if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) {
 		return FAILURE;
 	}
-#	endif /* HTTP_CURL_USE_ZEND_MM */
 #endif /* HTTP_HAVE_CURL */
 
 #ifdef ZEND_ENGINE_2
-	http_util_object_init(INIT_FUNC_ARGS_PASSTHRU);
-	http_message_object_init(INIT_FUNC_ARGS_PASSTHRU);
-	http_response_object_init(INIT_FUNC_ARGS_PASSTHRU);
+	http_util_object_init();
+	http_message_object_init();
+#	ifndef WONKY
+	http_response_object_init();
+#	endif
 #	ifdef HTTP_HAVE_CURL
-	http_request_object_init(INIT_FUNC_ARGS_PASSTHRU);
+	http_request_object_init();
+	http_requestpool_object_init();
 #	endif /* HTTP_HAVE_CURL */
+	http_exception_object_init();
 #endif /* ZEND_ENGINE_2 */
 
 	return SUCCESS;
@@ -244,7 +292,6 @@ PHP_MSHUTDOWN_FUNCTION(http)
 {
 	UNREGISTER_INI_ENTRIES();
 #ifdef HTTP_HAVE_CURL
-	phpstr_dtor(&HTTP_G(curlbuf));
 	curl_global_cleanup();
 #endif
 	return SUCCESS;
@@ -254,8 +301,13 @@ PHP_MSHUTDOWN_FUNCTION(http)
 /* {{{ PHP_RINIT_FUNCTION */
 PHP_RINIT_FUNCTION(http)
 {
-	char *allowed_methods = INI_STR("http.allowed_methods");
-	http_check_allowed_methods(allowed_methods, strlen(allowed_methods));
+	char *m;
+
+	if (m = INI_STR("http.allowed_methods")) {
+		http_check_allowed_methods(m, strlen(m));
+	}
+
+	http_globals_init(HTTP_GLOBALS);
 	return SUCCESS;
 }
 /* }}} */
@@ -263,26 +315,7 @@ PHP_RINIT_FUNCTION(http)
 /* {{{ PHP_RSHUTDOWN_FUNCTION */
 PHP_RSHUTDOWN_FUNCTION(http)
 {
-	HTTP_G(etag_started) = 0;
-	HTTP_G(lmod) = 0;
-
-	if (HTTP_G(etag)) {
-		efree(HTTP_G(etag));
-		HTTP_G(etag) = NULL;
-	}
-
-	if (HTTP_G(ctype)) {
-		efree(HTTP_G(ctype));
-		HTTP_G(ctype) = NULL;
-	}
-
-#ifdef HTTP_HAVE_CURL
-#	if LIBCURL_VERSION_NUM < 0x070c00
-	memset(&HTTP_G(curlerr), 0, sizeof(HTTP_G(curlerr)));
-#	endif
-	phpstr_dtor(&HTTP_G(curlbuf));
-#endif
-
+	http_globals_free(HTTP_GLOBALS);
 	return SUCCESS;
 }
 /* }}} */
@@ -290,37 +323,75 @@ PHP_RSHUTDOWN_FUNCTION(http)
 /* {{{ PHP_MINFO_FUNCTION */
 PHP_MINFO_FUNCTION(http)
 {
-#ifdef ZEND_ENGINE_2
-#	define HTTP_FUNC_AVAIL(CLASS) "procedural, object oriented (class " 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 " 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
-
-	char full_version_string[1024] = {0};
-	snprintf(full_version_string, 1023, "%s (%s)", HTTP_PEXT_VERSION, HTTP_CURL_VERSION);
-
-	php_info_print_table_start();
-	php_info_print_table_row(2, "Extended HTTP support", "enabled");
-	php_info_print_table_row(2, "Extension Version:", full_version_string);
+#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_header(2, "Functionality",            "Availability");
-	php_info_print_table_row(2,    "Miscellaneous Utilities:", HTTP_FUNC_AVAIL("HttpUtil"));
-	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"));
+	{
+		unsigned i;
+		zval **custom_method;
+		phpstr *known_request_methods = phpstr_new();
+		phpstr *custom_request_methods = phpstr_new();
+
+		for (i = HTTP_NO_REQUEST_METHOD+1; i < HTTP_MAX_REQUEST_METHOD; ++i) {
+			phpstr_appendl(known_request_methods, http_request_method_name(i));
+			phpstr_appends(known_request_methods, ", ");
+		}
+		FOREACH_HASH_VAL(&HTTP_G(request).methods.custom, custom_method) {
+			phpstr_append(custom_request_methods, Z_STRVAL_PP(custom_method), Z_STRLEN_PP(custom_method));
+			phpstr_appends(custom_request_methods, ", ");
+		}
+
+		phpstr_append(known_request_methods, PHPSTR_VAL(custom_request_methods), PHPSTR_LEN(custom_request_methods));
+		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:",
+			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();
 
 	DISPLAY_INI_ENTRIES();