- FOREACH macros now require a HashPosition argument

[m6w6/ext-http] / http_functions.c

diff --git a/http_functions.c b/http_functions.c
index 7d82438ef6e059f52465c1343dac139d46545ca0..de673a724061383a2ad7eb52812dcb38169185e7 100644 (file)
--- 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); \
                        } \
@@ -1391,7 +1392,7 @@ PHP_FUNCTION(http_build_query)
        }
 
        formstr = phpstr_new();
-       if (SUCCESS != http_urlencode_hash_recursive(HASH_OF(formdata), formstr, arg_sep, prefix, prefix_len)) {
+       if (SUCCESS != http_urlencode_hash_recursive(HASH_OF(formdata), formstr, arg_sep, arg_sep_len, prefix, prefix_len)) {
                phpstr_free(&formstr);
                RETURN_FALSE;
        }