Merge branch 'master' into phpng

[m6w6/ext-http] / php_http_params.c

diff --git a/php_http_params.c b/php_http_params.c
index ad32f0e58155a3dd83bde7109a28435f73979970..6e5dd4a0df442602ca6cd52e882d2a9231fc7086 100644 (file)
--- a/php_http_params.c
+++ b/php_http_params.c
@@ -60,14 +60,14 @@ static inline void sanitize_escaped(zval *zv)
                ZVAL_STR(zv, php_http_cs2zs(deq, deq_len));
        }
 
-       php_stripcslashes(Z_STRVAL_P(zv), &Z_STRLEN_P(zv));
+       php_stripcslashes(Z_STR_P(zv));
 }
 
 static inline void prepare_escaped(zval *zv)
 {
        if (Z_TYPE_P(zv) == IS_STRING) {
                size_t len = Z_STRLEN_P(zv);
-               zend_string *stripped = php_addcslashes(Z_STRVAL_P(zv), Z_STRLEN_P(zv), 1,
+               zend_string *stripped = php_addcslashes(Z_STR_P(zv), 0,
                                ZEND_STRL("\0..\37\173\\\""));
 
                if (len != stripped->len || strpbrk(stripped->val, "()<>@,;:\"[]?={} ")) {
@@ -176,7 +176,7 @@ static void prepare_dimension(php_http_buffer_t *buf, php_http_buffer_t *keybuf,
                php_http_buffer_init(&prefix);
                php_http_buffer_append(&prefix, keybuf->data, keybuf->used);
 
-               ZEND_HASH_FOREACH_KEY_VAL(ht, key.h, key.key, val)
+               ZEND_HASH_FOREACH_KEY_VAL_IND(ht, key.h, key.key, val)
                {
                        if (key.key && !*key.key->val) {
                                /* only public properties */
@@ -397,7 +397,7 @@ static void merge_param(HashTable *params, zval *zdata, zval **current_param, zv
        }
 #endif
 
-       zend_hash_get_current_key_ex(Z_ARRVAL_P(zdata), &hkey.key, &hkey.h, NULL);
+       zend_hash_get_current_key(Z_ARRVAL_P(zdata), &hkey.key, &hkey.h);
 
        if ((hkey.key && !zend_hash_exists(params, hkey.key))
        ||      (!hkey.key && !zend_hash_index_exists(params, hkey.h))
@@ -444,10 +444,13 @@ static void merge_param(HashTable *params, zval *zdata, zval **current_param, zv
                        while (Z_TYPE_P(zdata_ptr) == IS_ARRAY && (test_ptr = zend_hash_get_current_data(Z_ARRVAL_P(zdata_ptr)))) {
                                if (Z_TYPE_P(test_ptr) == IS_ARRAY) {
                                        /* now find key in ptr */
-                                       if (HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(Z_ARRVAL_P(zdata_ptr), &hkey.key, &hkey.h, NULL)) {
+                                       if (HASH_KEY_IS_STRING == zend_hash_get_current_key(Z_ARRVAL_P(zdata_ptr), &hkey.key, &hkey.h)) {
+                                               zval *tmp_ptr = ptr;
+
                                                if ((ptr = zend_hash_find(Z_ARRVAL_P(ptr), hkey.key))) {
                                                        zdata_ptr = test_ptr;
                                                } else {
+                                                       ptr = tmp_ptr;
                                                        Z_TRY_ADDREF_P(test_ptr);
                                                        ptr = zend_hash_update(Z_ARRVAL_P(ptr), hkey.key, test_ptr);
                                                        break;
@@ -472,7 +475,7 @@ static void merge_param(HashTable *params, zval *zdata, zval **current_param, zv
                                                zval_dtor(ptr);
                                                array_init(ptr);
                                        }
-                                       if (HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(Z_ARRVAL_P(zdata_ptr), &hkey.key, &hkey.h, NULL)) {
+                                       if (HASH_KEY_IS_STRING == zend_hash_get_current_key(Z_ARRVAL_P(zdata_ptr), &hkey.key, &hkey.h)) {
                                                ptr = zend_hash_update(Z_ARRVAL_P(ptr), hkey.key, test_ptr);
                                        } else if (hkey.h) {
                                                ptr = zend_hash_index_update(Z_ARRVAL_P(ptr), hkey.h, test_ptr);
@@ -543,10 +546,11 @@ 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, &rfc5987);
                        state->rfc5987 = rfc5987;
-                       if (Z_TYPE(key) != IS_STRING) {
+                       if (Z_TYPE(key) == IS_ARRAY) {
                                merge_param(params, &key, &state->current.val, &state->current.args);
-                       } else if (Z_STRLEN(key)) {
-                               array_init_size(&prm, 2);
+                       } else if (Z_TYPE(key) == IS_STRING && Z_STRLEN(key)) {
+                               //array_init_size(&prm, 2);
+                               array_init(&prm);
 
                                if (!Z_ISUNDEF(opts->defval)) {
                                        ZVAL_COPY_VALUE(&val, &opts->defval);
@@ -559,8 +563,8 @@ static void push_param(HashTable *params, php_http_params_state_t *state, const
                                } else {
                                        state->current.val = zend_hash_str_update(Z_ARRVAL(prm), "value", lenof("value"), &val);
                                }
-
-                               array_init_size(&arg, 3);
+                               //array_init_size(&arg, 3);
+                               array_init(&arg);
                                state->current.args = zend_hash_str_update(Z_ARRVAL(prm), "arguments", lenof("arguments"), &arg);
                                state->current.param = zend_symtable_str_update(params, Z_STRVAL(key), Z_STRLEN(key), &prm);
                        }
@@ -712,7 +716,7 @@ static inline void shift_rfc5987(php_http_buffer_t *buf, zval *zvalue, const cha
        php_http_arrkey_t key = {0};
 
        if ((zdata = zend_hash_get_current_data(ht))
-       &&      HASH_KEY_NON_EXISTENT != zend_hash_get_current_key_ex(ht, &key.key, &key.h, NULL)
+       &&      HASH_KEY_NON_EXISTENT != zend_hash_get_current_key(ht, &key.key, &key.h)
        ) {
                php_http_arrkey_stringify(&key, NULL);
                php_http_buffer_appendf(buf, "*%.*sutf-8'%.*s'",
@@ -720,6 +724,9 @@ static inline void shift_rfc5987(php_http_buffer_t *buf, zval *zvalue, const cha
                                (int) (key.key->len > INT_MAX ? INT_MAX : key.key->len), key.key->val);
                php_http_arrkey_dtor(&key);
 
+               if (Z_TYPE_P(zdata) == IS_INDIRECT) {
+                       zdata = Z_INDIRECT_P(zdata);
+               }
                zs = zval_get_string(zdata);
                ZVAL_STR(&tmp, zs);
                prepare_value(flags | PHP_HTTP_PARAMS_URLENCODED, &tmp);
@@ -766,7 +773,7 @@ static void shift_arg(php_http_buffer_t *buf, char *key_str, size_t key_len, zva
                if (!rfc5987) {
                        shift_key(buf, key_str, key_len, ass, asl, flags);
                }
-               ZEND_HASH_FOREACH_KEY_VAL(ht, key.h, key.key, val)
+               ZEND_HASH_FOREACH_KEY_VAL_IND(ht, key.h, key.key, val)
                {
                        /* did you mean recursion? */
                        php_http_arrkey_stringify(&key, NULL);
@@ -842,8 +849,9 @@ php_http_buffer_t *php_http_params_to_string(php_http_buffer_t *buf, HashTable *
                                zvalue = tmp;
                        } else if (zvalue == zparam) {
                                continue;
+                       } else {
+                               zvalue = zparam;
                        }
-                       zvalue = zparam;
                }
 
                if (Z_TYPE_P(zvalue) == IS_ARRAY) {
@@ -870,15 +878,17 @@ php_http_buffer_t *php_http_params_to_string(php_http_buffer_t *buf, HashTable *
 
 php_http_params_token_t **php_http_params_separator_init(zval *zv)
 {
-       zval *sep;
+       zval *sep, ztmp;
        php_http_params_token_t **ret, **tmp;
 
        if (!zv) {
                return NULL;
        }
 
-       SEPARATE_ZVAL(zv);
+       ZVAL_DUP(&ztmp, zv);
+       zv = &ztmp;
        convert_to_array(zv);
+
        ret = ecalloc(zend_hash_num_elements(Z_ARRVAL_P(zv)) + 1, sizeof(*ret));
 
        tmp = ret;
@@ -894,7 +904,8 @@ php_http_params_token_t **php_http_params_separator_init(zval *zv)
                zend_string_release(zs);
        }
        ZEND_HASH_FOREACH_END();
-       zval_ptr_dtor(zv);
+
+       zval_ptr_dtor(&ztmp);
 
        *tmp = NULL;
        return ret;
@@ -956,27 +967,34 @@ PHP_METHOD(HttpParams, __construct)
                                default:
                                        zs = zval_get_string(zparams);
                                        if (zs->len) {
+                                               zval tmp;
+
                                                php_http_params_opts_t opts = {
                                                        {zs->val, zs->len},
-                                                       php_http_params_separator_init(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("param_sep"), 0)),
-                                                       php_http_params_separator_init(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("arg_sep"), 0)),
-                                                       php_http_params_separator_init(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("val_sep"), 0)),
+                                                       php_http_params_separator_init(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("param_sep"), 0, &tmp)),
+                                                       php_http_params_separator_init(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("arg_sep"), 0, &tmp)),
+                                                       php_http_params_separator_init(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("val_sep"), 0, &tmp)),
                                                        {{0}}, flags
                                                };
 
-                                               array_init(zparams);
-                                               php_http_params_parse(Z_ARRVAL_P(zparams), &opts);
-                                               zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), zparams);
+                                               array_init(&tmp);
+                                               php_http_params_parse(Z_ARRVAL(tmp), &opts);
+                                               zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), &tmp);
+                                               zval_ptr_dtor(&tmp);
 
                                                php_http_params_separator_free(opts.param);
                                                php_http_params_separator_free(opts.arg);
                                                php_http_params_separator_free(opts.val);
                                        }
+                                       zend_string_release(zs);
                                        break;
                        }
                } else {
-                       array_init(zparams);
-                       zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), zparams);
+                       zval tmp;
+
+                       array_init(&tmp);
+                       zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), &tmp);
+                       zval_ptr_dtor(&tmp);
                }
        }
        zend_restore_error_handling(&zeh);
@@ -986,12 +1004,12 @@ ZEND_BEGIN_ARG_INFO_EX(ai_HttpParams_toArray, 0, 0, 0)
 ZEND_END_ARG_INFO();
 PHP_METHOD(HttpParams, toArray)
 {
-       zval *zparams;
+       zval zparams_tmp, *zparams;
 
        if (SUCCESS != zend_parse_parameters_none()) {
                return;
        }
-       zparams = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0);
+       zparams = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0, &zparams_tmp);
        RETURN_ZVAL_FAST(zparams);
 }
 
@@ -1000,27 +1018,28 @@ ZEND_END_ARG_INFO();
 PHP_METHOD(HttpParams, toString)
 {
        zval *tmp, *zparams, *zpsep, *zasep, *zvsep;
+       zval zparams_tmp, flags_tmp, psep_tmp, asep_tmp, vsep_tmp;
        zend_string *psep, *asep, *vsep;
        long flags;
        php_http_buffer_t buf;
 
-       zparams = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0);
+       zparams = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0, &zparams_tmp);
        convert_to_array_ex(zparams);
-       flags = zval_get_long(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("flags"), 0));
+       flags = zval_get_long(zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("flags"), 0, &flags_tmp));
 
-       zpsep = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("param_sep"), 0);
+       zpsep = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("param_sep"), 0, &psep_tmp);
        if (Z_TYPE_P(zpsep) == IS_ARRAY && (tmp = zend_hash_get_current_data(Z_ARRVAL_P(zpsep)))) {
                psep = zval_get_string(tmp);
        } else {
                psep = zval_get_string(zpsep);
        }
-       zasep = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("arg_sep"), 0);
+       zasep = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("arg_sep"), 0, &asep_tmp);
        if (Z_TYPE_P(zasep) == IS_ARRAY && (tmp = zend_hash_get_current_data(Z_ARRVAL_P(zasep)))) {
                asep = zval_get_string(tmp);
        } else {
                asep = zval_get_string(zasep);
        }
-       zvsep = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("val_sep"), 0);
+       zvsep = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("val_sep"), 0, &vsep_tmp);
        if (Z_TYPE_P(zvsep) == IS_ARRAY && (tmp = zend_hash_get_current_data(Z_ARRVAL_P(zvsep)))) {
                vsep = zval_get_string(tmp);
        } else {
@@ -1043,13 +1062,13 @@ ZEND_END_ARG_INFO();
 PHP_METHOD(HttpParams, offsetExists)
 {
        zend_string *name;
-       zval *zparam, *zparams;
+       zval zparams_tmp, *zparam, *zparams;
 
        if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S", &name)) {
                return;
        }
 
-       zparams = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0);
+       zparams = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0, &zparams_tmp);
 
        if (Z_TYPE_P(zparams) == IS_ARRAY && (zparam = zend_symtable_find(Z_ARRVAL_P(zparams), name))) {
                RETVAL_BOOL(Z_TYPE_P(zparam) != IS_NULL);
@@ -1064,13 +1083,13 @@ ZEND_END_ARG_INFO();
 PHP_METHOD(HttpParams, offsetGet)
 {
        zend_string *name;
-       zval *zparam, *zparams;
+       zval zparams_tmp, *zparam, *zparams;
 
        if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S", &name)) {
                return;
        }
 
-       zparams = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0);
+       zparams = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0, &zparams_tmp);
 
        if (Z_TYPE_P(zparams) == IS_ARRAY && (zparam = zend_symtable_find(Z_ARRVAL_P(zparams), name))) {
                RETVAL_ZVAL_FAST(zparam);
@@ -1083,17 +1102,16 @@ ZEND_END_ARG_INFO();
 PHP_METHOD(HttpParams, offsetUnset)
 {
        zend_string *name;
-       zval *zparams;
+       zval zparams_tmp, *zparams;
 
        if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S", &name)) {
                return;
        }
 
-       zparams = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0);
+       zparams = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0, &zparams_tmp);
 
        if (Z_TYPE_P(zparams) == IS_ARRAY) {
                zend_symtable_del(Z_ARRVAL_P(zparams), name);
-               zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), zparams);
        }
 }
 
@@ -1104,36 +1122,29 @@ ZEND_END_ARG_INFO();
 PHP_METHOD(HttpParams, offsetSet)
 {
        zend_string *name;
-       zval *zparam, *zparams, *nvalue;
+       zval zparams_tmp, *zparam, *zparams, *nvalue;
 
        if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Sz", &name, &nvalue)) {
                return;
        }
 
-       zparams = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0);
-       SEPARATE_ZVAL(zparams);
+       zparams = zend_read_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), 0, &zparams_tmp);
        convert_to_array(zparams);
 
        if (name->len) {
                if (Z_TYPE_P(nvalue) == IS_ARRAY) {
-                       zval *new_zparam;
-
                        if ((zparam = zend_symtable_find(Z_ARRVAL_P(zparams), name))) {
-                               new_zparam = zparam;
-                               SEPARATE_ZVAL(new_zparam);
-                               convert_to_array(new_zparam);
-                               array_join(Z_ARRVAL_P(nvalue), Z_ARRVAL_P(new_zparam), 0, 0);
+                               convert_to_array(zparam);
+                               array_join(Z_ARRVAL_P(nvalue), Z_ARRVAL_P(zparam), 0, 0);
                        } else {
-                               new_zparam = nvalue;
-                               Z_TRY_ADDREF_P(new_zparam);
+                               Z_TRY_ADDREF_P(nvalue);
+                               add_assoc_zval_ex(zparams, name->val, name->len, nvalue);
                        }
-                       add_assoc_zval_ex(zparams, name->val, name->len, new_zparam);
                } else {
                        zval tmp;
 
                        if ((zparam = zend_symtable_find(Z_ARRVAL_P(zparams), name))) {
-                               tmp = *zparam;
-                               SEPARATE_ZVAL(&tmp);
+                               ZVAL_DUP(&tmp, zparam);
                                convert_to_array(&tmp);
                        } else {
                                array_init(&tmp);
@@ -1152,9 +1163,6 @@ PHP_METHOD(HttpParams, offsetSet)
                add_assoc_zval_ex(zparams, zs->val, zs->len, &arr);
                zend_string_release(zs);
        }
-
-       zend_update_property(php_http_params_class_entry, getThis(), ZEND_STRL("params"), zparams);
-       zval_ptr_dtor(zparams);
 }
 
 static zend_function_entry php_http_params_methods[] = {