X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_functions.c;h=3ec05777fc273bbdacb68533fa97545a2403547c;hp=5ff5e33a7eff753d79771b9ade894f1a98c3dde0;hb=8d25696948ed61d50c417275222117f43069ddd1;hpb=266dd631dcb4e0652522ad4884ee8a40b88532ec

diff --git a/http_functions.c b/http_functions.c
index 5ff5e33..3ec0577 100644
--- a/http_functions.c
+++ b/http_functions.c
@@ -137,9 +137,10 @@ PHP_FUNCTION(http_build_uri)
 		} \
 		\
 		if (rs_array) { \
+			HashPosition pos; \
 			zval **value; \
 			 \
-			FOREACH_VAL(supported, value) { \
+			FOREACH_VAL(pos, supported, value) { \
 				convert_to_string_ex(value); \
 				add_assoc_double(rs_array, Z_STRVAL_PP(value), 1.0); \
 			} \
@@ -438,6 +439,8 @@ PHP_FUNCTION(http_cache_last_modified)
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &last_modified) != SUCCESS) {
 		RETURN_FALSE;
 	}
+	
+	HTTP_CHECK_HEADERS_SENT(RETURN_FALSE);
 
 	t = (long) time(NULL);
 
@@ -485,6 +488,8 @@ PHP_FUNCTION(http_cache_etag)
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &etag, &etag_len) != SUCCESS) {
 		RETURN_FALSE;
 	}
+	
+	HTTP_CHECK_HEADERS_SENT(RETURN_FALSE);
 
 	RETURN_SUCCESS(http_cache_etag(etag, etag_len, HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL)));
 }
@@ -1381,21 +1386,17 @@ PHP_FUNCTION(http_build_query)
 	int prefix_len = 0, arg_sep_len = strlen(arg_sep);
 	phpstr *formstr;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|ss", &formdata, &prefix, &prefix_len, &arg_sep, &arg_sep_len) != SUCCESS) {
-		RETURN_FALSE;
-	}
-
-	if (Z_TYPE_P(formdata) != IS_ARRAY && Z_TYPE_P(formdata) != IS_OBJECT) {
-		http_error(HE_WARNING, HTTP_E_INVALID_PARAM, "Parameter 1 expected to be Array or Object.  Incorrect value given.");
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|ss", &formdata, &prefix, &prefix_len, &arg_sep, &arg_sep_len) != SUCCESS) {
 		RETURN_FALSE;
 	}
 
 	if (!arg_sep_len) {
 		arg_sep = HTTP_URL_ARGSEP;
+		arg_sep_len = lenof(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))) {
+	if (SUCCESS != http_urlencode_hash_recursive(HASH_OF(formdata), formstr, arg_sep, arg_sep_len, prefix, prefix_len)) {
 		phpstr_free(&formstr);
 		RETURN_FALSE;
 	}