X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http.c;h=05244d18287a8080193a4e7d598bcdc87ae13cd3;hb=eeffa6a1d5984f6f7d7dfa86cd3f4b5486fa297b;hp=fefdab17c1524283ef747e8dfbbb37e408217a8d;hpb=32e91737086db53bb1fd9ed9f79d693c43ec459f;p=m6w6%2Fext-http

diff --git a/http.c b/http.c
index fefdab1..05244d1 100644
--- a/http.c
+++ b/http.c
@@ -29,7 +29,7 @@
 #include "php_http_api.h"
 #include "php_http_send_api.h"
 #include "php_http_cache_api.h"
-#include "php_http_headers_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
@@ -235,7 +235,7 @@ PHP_MINIT_FUNCTION(http)
 	REGISTER_INI_ENTRIES();
 	
 	if (	(SUCCESS != PHP_MINIT_CALL(http_support))	||
-			(SUCCESS != PHP_MINIT_CALL(http_headers))	||
+			(SUCCESS != PHP_MINIT_CALL(http_send))		||
 #ifdef HTTP_HAVE_CURL
 			(SUCCESS != PHP_MINIT_CALL(http_request))	||
 #endif /* HTTP_HAVE_CURL */
@@ -345,6 +345,14 @@ PHP_MINFO_FUNCTION(http)
 #	ifndef WONKY
 			"HttpResponse"
 #	endif
+#endif
+		);
+		php_info_print_table_row(2, "Output Handlers", "ob_deflatehandler, ob_inflatehandler, ob_etaghandler");
+		php_info_print_table_row(2, "Stream Filters", 
+#ifndef ZEND_ENGINE_2
+			"none"
+#else
+			"http.chunked_decode, http.chunked_encode, http.deflate, http.inflate"
 #endif
 		);
 	}
@@ -377,17 +385,13 @@ PHP_MINFO_FUNCTION(http)
 	{
 		int i;
 		getGlobals(G);
-		struct _entry {char *name; char *cnst;} *entry;
-		phpstr *known_request_methods = phpstr_new();
 		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;
 
-		for (i = HTTP_MIN_REQUEST_METHOD; i < HTTP_MAX_REQUEST_METHOD; ++i) {
-			phpstr_appendl(known_request_methods, http_request_method_name(i));
-			phpstr_appends(known_request_methods, ", ");
-		}
 		for (i = 0; i < G->request.methods.custom.count; ++i) {
-			if ((entry = ((struct _entry **) G->request.methods.custom.entries)[i])) {
-				phpstr_appendf(custom_request_methods, "%s, ", entry->name);
+			if (ptr[i]) {
+				phpstr_appendf(custom_request_methods, "%s, ", ptr[i]->name);
 			}
 		}
 
@@ -398,7 +402,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(HTTP_G(request).methods.allowed) ? HTTP_G(request).methods.allowed : "(ANY)");
+		php_info_print_table_row(2, "Allowed", strlen(G->request.methods.allowed) ? G->request.methods.allowed : "(ANY)");
 		
 		phpstr_free(&known_request_methods);
 		phpstr_free(&custom_request_methods);