X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_functions.c;h=0b39b72cf36ef5e30715d0ea604edc474f0498a3;hp=a0eb58b3b210caf2dfd7182fad62004e7c4fbf53;hb=fb4cc3c3eda3bb4dd15ec99a4f372ccfd78b7473;hpb=0ac32c9b8590e88a5f110cc8b3154001d5c0c089

diff --git a/http_functions.c b/http_functions.c
index a0eb58b..0b39b72 100644
--- a/http_functions.c
+++ b/http_functions.c
@@ -20,6 +20,7 @@
 #endif
 
 #include "php.h"
+#include "php_ini.h"
 #include "ext/standard/info.h"
 #include "ext/session/php_session.h"
 #include "ext/standard/php_string.h"
@@ -586,7 +587,6 @@ PHP_FUNCTION(http_chunked_decode)
  *     0 => array(
  *         'Status' => '200 Ok',
  *         'Content-Type' => 'text/plain',
-
  *         'Content-Language' => 'en-US'
  *     ),
  *     1 => "Hello World!"
@@ -977,11 +977,11 @@ PHP_FUNCTION(http_build_query)
 	}
 
 	if (!arg_sep_len) {
-		arg_sep = HTTP_URL_ARGSEP_DEFAULT;
+		arg_sep = HTTP_URL_ARGSEP;
 	}
 
 	formstr = phpstr_new();
-	if (SUCCESS != http_urlencode_hash_implementation_ex(HASH_OF(formdata), formstr, arg_sep, prefix, prefix_len, NULL, 0, NULL, 0, (Z_TYPE_P(formdata) == IS_OBJECT ? formdata : NULL) TSRMLS_CC)) {
+	if (SUCCESS != http_urlencode_hash_implementation_ex(HASH_OF(formdata), formstr, arg_sep, prefix, prefix_len, NULL, 0, NULL, 0, (Z_TYPE_P(formdata) == IS_OBJECT ? formdata : NULL))) {
 		phpstr_free(formstr);
 		RETURN_FALSE;
 	}
@@ -999,21 +999,6 @@ PHP_FUNCTION(http_build_query)
 
 PHP_FUNCTION(http_test)
 {
-#define HTTP_MESSAGE_STR \
-	"GET / HTTP/1.1\r\n" \
-	"Content-Type: foo/bar\r\n" \
-	"Robots: Noindex,Nofollow\r\n" \
-	"\r\n" \
-	"Body Data!\n"
-#define HTTP_MESSAGE_LEN lenof(HTTP_MESSAGE_STR)
-	http_message *msg = http_message_parse(HTTP_MESSAGE_STR, HTTP_MESSAGE_LEN);
-	char *str;
-	size_t len;
-
-	http_message_tostring(msg, &str, &len);
-
-	RETVAL_STRINGL(str, len, 0);
-	http_message_free(msg);
 }
 
 /*