X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=1c4a6a4e5cf19a746139019dfb5056a55803be83;hp=b81c8cb00ff5986a33a6686d73adba3f8cc2b4d2;hb=0acbfc76b5a3e4122a6d06d64bd834a810806656;hpb=3f048c60b3f3b8151eb86121eed8c9b8927c55dc

diff --git a/http.c b/http.c
index b81c8cb..1c4a6a4 100644
--- a/http.c
+++ b/http.c
@@ -36,6 +36,7 @@
 #endif
 
 #ifdef ZEND_ENGINE_2
+#	include "php_http_filter_api.h"
 #	include "php_http_util_object.h"
 #	include "php_http_message_object.h"
 #	ifndef WONKY
@@ -57,9 +58,6 @@
 #	endif
 #	include <curl/curl.h>
 #endif
-#ifdef HTTP_HAVE_MHASH
-#	include <mhash.h>
-#endif
 #ifdef HTTP_HAVE_ZLIB
 #	include <zlib.h>
 #endif
@@ -81,6 +79,7 @@ zend_function_entry http_functions[] = {
 	PHP_FALIAS(http_absolute_uri, http_build_uri, NULL)
 	PHP_FE(http_negotiate_language, http_arg_pass_ref_2)
 	PHP_FE(http_negotiate_charset, http_arg_pass_ref_2)
+	PHP_FE(http_negotiate_content_type, http_arg_pass_ref_2)
 	PHP_FE(http_redirect, NULL)
 	PHP_FE(http_throttle, NULL)
 	PHP_FE(http_send_status, NULL)
@@ -216,52 +215,6 @@ 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
@@ -272,7 +225,7 @@ PHP_INI_BEGIN()
 	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_EX("http.etag_mode", "-2", PHP_INI_ALL, OnUpdateLong, http_etag_mode_displayer, etag.mode)
+	HTTP_PHP_INI_ENTRY("http.etag_mode", "MD5", PHP_INI_ALL, OnUpdateString, etag.mode)
 #ifdef ZEND_ENGINE_2
 	HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions)
 #endif
@@ -291,7 +244,6 @@ PHP_MINIT_FUNCTION(http)
 	
 	if (	(SUCCESS != PHP_MINIT_CALL(http_support))	||
 			(SUCCESS != PHP_MINIT_CALL(http_headers))	||
-			(SUCCESS != PHP_MINIT_CALL(http_cache))		||
 #ifdef HTTP_HAVE_CURL
 			(SUCCESS != PHP_MINIT_CALL(http_request))	||
 #endif /* HTTP_HAVE_CURL */
@@ -300,14 +252,15 @@ PHP_MINIT_FUNCTION(http)
 	}
 
 #ifdef ZEND_ENGINE_2
-	if (	(SUCCESS != PHP_MINIT_CALL(http_util_object))		||
+	if (	(SUCCESS != PHP_MINIT_CALL(http_filter))			||
+			(SUCCESS != PHP_MINIT_CALL(http_util_object))		||
 			(SUCCESS != PHP_MINIT_CALL(http_message_object))	||
 #	ifndef WONKY
 			(SUCCESS != PHP_MINIT_CALL(http_response_object))	||
 #	endif /* WONKY */
 #	ifdef HTTP_HAVE_CURL
 			(SUCCESS != PHP_MINIT_CALL(http_request_object))	||
-			(SUCCESS != PHP_MINIT_CALL(http_requestpool_object))	||
+			(SUCCESS != PHP_MINIT_CALL(http_requestpool_object))||
 #	endif /* HTTP_HAVE_CURL */
 			(SUCCESS != PHP_MINIT_CALL(http_exception_object))) {
 		return FAILURE;
@@ -332,10 +285,9 @@ PHP_MSHUTDOWN_FUNCTION(http)
 /* {{{ PHP_RINIT_FUNCTION */
 PHP_RINIT_FUNCTION(http)
 {
-	char *m;
-
-	if (m = INI_STR("http.allowed_methods")) {
-		http_check_allowed_methods(m, strlen(m));
+	if (HTTP_G(request).methods.allowed) {
+		http_check_allowed_methods(HTTP_G(request).methods.allowed, 
+			strlen(HTTP_G(request).methods.allowed));
 	}
 
 	http_globals_init(HTTP_GLOBALS);
@@ -380,16 +332,6 @@ PHP_MINFO_FUNCTION(http)
 #else
 		php_info_print_table_row(2, "zlib GZIP Encodings", "disabled");
 #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
-		php_info_print_table_row(2, "mhash ETag Generator", "disabled");
-#endif
 #if defined(HTTP_HAVE_MAGIC) && !defined(WONKY)
 		php_info_print_table_row(2, "magic MIME Guessing", "libmagic/unknown");
 #else
@@ -413,33 +355,6 @@ PHP_MINFO_FUNCTION(http)
 	}
 	php_info_print_table_end();
 	
-	php_info_print_table_start();
-	php_info_print_table_colspan_header(2, "Supported ETag Hash Algorithms");
-	{
-			
-		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");
 	{