change array_list API

[m6w6/ext-http] / php_http_params.c

diff --git a/php_http_params.c b/php_http_params.c
index 9db11c2aa57e1e133241dfd5e1f5bca3c6050aae..da78303d3e0affa311b0d3444ad0fa8b1a15b27e 100644 (file)
--- a/php_http_params.c
+++ b/php_http_params.c
@@ -16,11 +16,12 @@ static php_http_params_token_t def_param_sep = {",", 1}, *def_param_sep_ptr[] =
 static php_http_params_token_t def_arg_sep = {";", 1}, *def_arg_sep_ptr[] = {&def_arg_sep, NULL};
 static php_http_params_token_t def_val_sep = {"=", 1}, *def_val_sep_ptr[] = {&def_val_sep, NULL};
 static php_http_params_opts_t def_opts = {
-       .param = def_param_sep_ptr,
-       .arg = def_arg_sep_ptr,
-       .val = def_val_sep_ptr,
-       .defval = NULL,
-       .flags = PHP_HTTP_PARAMS_DEFAULT
+       {{0},0},
+       def_param_sep_ptr,
+       def_arg_sep_ptr,
+       def_val_sep_ptr,
+       NULL,
+       PHP_HTTP_PARAMS_DEFAULT
 };
 
 PHP_HTTP_API php_http_params_opts_t *php_http_params_opts_default_get(php_http_params_opts_t *opts)
@@ -146,7 +147,12 @@ static void sanitize_dimension(zval *zv TSRMLS_DC)
 
        if (zend_hash_num_elements(Z_ARRVAL_P(arr))) {
                zval_dtor(zv);
+#if PHP_VERSION_ID >= 50400
                ZVAL_COPY_VALUE(zv, arr);
+#else
+       zv->value = arr->value;
+       Z_TYPE_P(zv) = Z_TYPE_P(arr);
+#endif
                FREE_ZVAL(arr);
        } else {
                zval_ptr_dtor(&arr);
@@ -244,7 +250,7 @@ static void prepare_value(unsigned flags, zval *zv TSRMLS_DC)
        }
 }
 
-static void merge_param(HashTable *params, zval *zdata, zval ***cur TSRMLS_DC)
+static void merge_param(HashTable *params, zval *zdata, zval ***current_param, zval ***current_args TSRMLS_DC)
 {
        zval **ptr, **zdata_ptr;
        php_http_array_hashkey_t hkey = php_http_array_hashkey_init(0);
@@ -264,7 +270,7 @@ static void merge_param(HashTable *params, zval *zdata, zval ***cur TSRMLS_DC)
        if ((hkey.type == HASH_KEY_IS_STRING && !zend_hash_exists(params, hkey.str, hkey.len))
        ||      (hkey.type == HASH_KEY_IS_LONG && !zend_hash_index_exists(params, hkey.num))
        ) {
-               zval *tmp;
+               zval *tmp, *arg, **args;
 
                /* create the entry if it doesn't exist */
                zend_hash_get_current_data(Z_ARRVAL_P(zdata), (void *) &ptr);
@@ -273,6 +279,11 @@ static void merge_param(HashTable *params, zval *zdata, zval ***cur TSRMLS_DC)
                array_init(tmp);
                add_assoc_zval_ex(tmp, ZEND_STRS("value"), *ptr);
 
+               MAKE_STD_ZVAL(arg);
+               array_init(arg);
+               zend_hash_update(Z_ARRVAL_P(tmp), "arguments", sizeof("arguments"), (void *) &arg, sizeof(zval *), (void *) &args);
+               *current_args = args;
+
                if (hkey.type == HASH_KEY_IS_STRING) {
                        zend_hash_update(params, hkey.str, hkey.len, (void *) &tmp, sizeof(zval *), (void *) &ptr);
                } else {
@@ -350,7 +361,7 @@ static void merge_param(HashTable *params, zval *zdata, zval ***cur TSRMLS_DC)
 
        /* bubble up */
        while (Z_TYPE_PP(ptr) == IS_ARRAY && SUCCESS == zend_hash_get_current_data(Z_ARRVAL_PP(ptr), (void *) &ptr));
-       *cur = ptr;
+       *current_param = ptr;
 }
 
 static void push_param(HashTable *params, php_http_params_state_t *state, const php_http_params_opts_t *opts TSRMLS_DC)
@@ -380,14 +391,19 @@ static void push_param(HashTable *params, php_http_params_state_t *state, const
                        ZVAL_NULL(key);
                        sanitize_key(opts->flags, state->param.str, state->param.len, key TSRMLS_CC);
                        if (Z_TYPE_P(key) != IS_STRING) {
-                               merge_param(params, key, &state->current.val TSRMLS_CC);
+                               merge_param(params, key, &state->current.val, &state->current.args TSRMLS_CC);
                        } else if (Z_STRLEN_P(key)) {
                                MAKE_STD_ZVAL(prm);
                                array_init(prm);
 
                                MAKE_STD_ZVAL(val);
                                if (opts->defval) {
+#if PHP_VERSION_ID >= 50400
                                        ZVAL_COPY_VALUE(val, opts->defval);
+#else
+                                       val->value = opts->defval->value;
+                                       Z_TYPE_P(val) = Z_TYPE_P(opts->defval);
+#endif
                                        zval_copy_ctor(val);
                                } else {
                                        ZVAL_TRUE(val);
@@ -609,17 +625,22 @@ PHP_HTTP_API php_http_buffer_t *php_http_params_to_string(php_http_buffer_t *buf
                php_http_array_hashkey_stringfree(&key);
 
                if (Z_TYPE_PP(zparam) == IS_ARRAY && SUCCESS != zend_hash_find(Z_ARRVAL_PP(zparam), ZEND_STRS("arguments"), (void *) &zvalue)) {
+                       if (zvalue == zparam) {
+                               continue;
+                       }
                        zvalue = zparam;
                }
 
-               FOREACH_KEYVAL(pos1, *zvalue, key1, zargs) {
-                       if (zvalue == zparam && key1.type == HASH_KEY_IS_STRING && !strcmp(key1.str, "value")) {
-                               continue;
-                       }
+               if (Z_TYPE_PP(zvalue) == IS_ARRAY) {
+                       FOREACH_KEYVAL(pos1, *zvalue, key1, zargs) {
+                               if (zvalue == zparam && key1.type == HASH_KEY_IS_STRING && !strcmp(key1.str, "value")) {
+                                       continue;
+                               }
 
-                       php_http_array_hashkey_stringify(&key1);
-                       shift_param(buf, key1.str, key1.len - 1, zargs, ass, asl, vss, vsl, flags TSRMLS_CC);
-                       php_http_array_hashkey_stringfree(&key1);
+                               php_http_array_hashkey_stringify(&key1);
+                               shift_param(buf, key1.str, key1.len - 1, zargs, ass, asl, vss, vsl, flags TSRMLS_CC);
+                               php_http_array_hashkey_stringfree(&key1);
+                       }
                }
        }
 
@@ -787,14 +808,11 @@ PHP_METHOD(HttpParams, __construct)
                                                zcopy = php_http_ztyp(IS_STRING, zparams);
                                                if (Z_STRLEN_P(zcopy)) {
                                                        php_http_params_opts_t opts = {
-                                                               .input = {
-                                                                       .str = Z_STRVAL_P(zcopy),
-                                                                       .len = Z_STRLEN_P(zcopy)
-                                                               },
-                                                               .param = php_http_params_separator_init(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("param_sep"), 0 TSRMLS_CC) TSRMLS_CC),
-                                                               .arg = php_http_params_separator_init(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("arg_sep"), 0 TSRMLS_CC) TSRMLS_CC),
-                                                               .val = php_http_params_separator_init(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("val_sep"), 0 TSRMLS_CC) TSRMLS_CC),
-                                                               .flags = flags
+                                                               {Z_STRVAL_P(zcopy), Z_STRLEN_P(zcopy)},
+                                                               php_http_params_separator_init(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("param_sep"), 0 TSRMLS_CC) TSRMLS_CC),
+                                                               php_http_params_separator_init(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("arg_sep"), 0 TSRMLS_CC) TSRMLS_CC),
+                                                               php_http_params_separator_init(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("val_sep"), 0 TSRMLS_CC) TSRMLS_CC),
+                                                               NULL, flags
                                                        };
 
                                                        MAKE_STD_ZVAL(zparams);