X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=76d4dff7e7ba86e7e354bd203083ae3ea554b5f3;hp=41456dc3f8f7ac7d5462f7963c4aab0160f0761d;hb=1382fe5a3ed5209ab05745ca95495885e85ff2a0;hpb=0ecd173659b63e77e47271e5bd521599cd9e500f

diff --git a/http.c b/http.c
index 41456dc..76d4dff 100644
--- a/http.c
+++ b/http.c
@@ -34,6 +34,7 @@
 #ifdef HTTP_HAVE_ZLIB
 #	include "php_http_encoding_api.h"
 #endif
+#include "php_http_url_api.h"
 
 #ifdef ZEND_ENGINE_2
 #	include "php_http_filter_api.h"
@@ -67,6 +68,10 @@ 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)
+#endif
 	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)
@@ -103,9 +108,6 @@ zend_function_entry http_functions[] = {
 	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_etaghandler, NULL)
 #ifdef HTTP_HAVE_ZLIB
 	PHP_FE(http_deflate, NULL)
@@ -288,11 +290,11 @@ 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))
@@ -320,7 +322,7 @@ PHP_RSHUTDOWN_FUNCTION(http)
 		status = FAILURE;
 	}
 	
-	http_globals_free(HTTP_GLOBALS);
+	http_globals_free(HTTP_G);
 	return status;
 }
 /* }}} */
@@ -347,8 +349,9 @@ PHP_MINFO_FUNCTION(http)
 			"HttpInflateStream, "
 #	endif
 #	ifndef WONKY
-			"HttpResponse"
+			"HttpResponse, "
 #	endif
+			"HttpQueryString"
 #endif
 		);
 		php_info_print_table_row(2, "Output Handlers", "ob_deflatehandler, ob_inflatehandler, ob_etaghandler");
@@ -388,12 +391,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);
 			}
@@ -406,7 +408,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);