X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=26bcf0f1e35580c0bff50a590f380ba644472801;hp=5d0491a19ff14ce1db779ee34e1591e7c92c3bdb;hb=39feb7a7e30bb4b393a6f76aa2f35d4e9275523e;hpb=afd561b680a07837192efbdb9ffe248def36f8e9

diff --git a/http.c b/http.c
index 5d0491a..26bcf0f 100644
--- a/http.c
+++ b/http.c
@@ -30,6 +30,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_request_method_api.h"
 #ifdef HTTP_HAVE_CURL
 #	include "php_http_request_api.h"
@@ -74,9 +75,10 @@ ZEND_GET_MODULE(http)
 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_build_uri, NULL)
+	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_redirect, NULL)
 	PHP_FE(http_throttle, NULL)
 	PHP_FE(http_send_status, NULL)
@@ -263,6 +265,9 @@ PHP_MINIT_FUNCTION(http)
 
 	REGISTER_INI_ENTRIES();
 	
+	if (SUCCESS != http_headers_global_init()) {
+		return FAILURE;
+	}
 	if (SUCCESS != http_cache_global_init()) {
 		return FAILURE;
 	}