}
}
-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);
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);
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 {
/* 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)
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);
state.arg.len = 0;
state.val.str = NULL;
state.val.len = 0;
+
+ continue;
+
} else
/* are we at an arg separator? */
if (0 < (sep_len = check_sep(&state, opts->arg))) {
state.arg.len = 0;
state.val.str = NULL;
state.val.len = 0;
+
+ continue;
+
} else
/* are we at a val separator? */
if (0 < (sep_len = check_sep(&state, opts->val))) {
state.val.str = state.input.str;
state.val.len = 0;
+
+ continue;
}
}
}
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)) {
- zvalue = zparam;
- }
-
- FOREACH_KEYVAL(pos1, *zvalue, key1, zargs) {
- if (zvalue == zparam && key1.type == HASH_KEY_IS_STRING && !strcmp(key1.str, "value")) {
+ if (zvalue == zparam) {
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);
- }
- }
-/*
- FOREACH_HASH_KEYVAL(pos1, params, key1, zparam) {
- if (PHP_HTTP_BUFFER_LEN(buf)) {
- php_http_buffer_append(buf, pss, psl);
- }
-
- if (key1.type == HASH_KEY_IS_STRING) {
- char *key;
- size_t len;
-
- prepare_key(flags, key1.str, key1.len - 1, &key, &len TSRMLS_CC);
- php_http_buffer_append(buf, key, len);
- efree(key);
- } else {
- php_http_buffer_appendf(buf, "%lu", key1.num);
+ zvalue = zparam;
}
- if (Z_TYPE_PP(zparam) != IS_ARRAY) {
- zval *tmp = php_http_ztyp(IS_STRING, *zparam);
-
- prepare_value(flags, tmp TSRMLS_CC);
-
- php_http_buffer_append(buf, vss, vsl);
- php_http_buffer_append(buf, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp));
- zval_ptr_dtor(&tmp);
- } else {
- zval **zvalue, **zargs, **zarg;
-
- if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(zparam), ZEND_STRS("value"), (void *) &zvalue)) {
- if (Z_TYPE_PP(zvalue) != IS_BOOL) {
- zval *tmp, *tmp2;
-
- if (Z_TYPE_PP(zvalue) == IS_ARRAY) {
- tmp = php_http_zsep(1, IS_ARRAY, *zvalue);
- do {
- if (key1.type == HASH_KEY_IS_STRING) {
- char *key;
- size_t len;
-
- prepare_key(flags, key1.str, key1.len - 1, &key, &len TSRMLS_CC);
- php_http_buffer_append(buf, key, len);
- efree(key);
- } else {
- php_http_buffer_appendf(buf, "%lu", key1.num);
- }
-
- tmp2 = php_http_zsep(1, IS_ARRAY, tmp);
- prepare_value(flags, tmp2 TSRMLS_CC);
- php_http_buffer_append(buf, Z_STRVAL_P(tmp2), Z_STRLEN_P(tmp2));
- zval_ptr_dtor(&tmp2);
-
- while (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(tmp), (void *) &zvalue) && Z_TYPE_PP(zvalue) == IS_ARRAY);
-
- tmp2 = php_http_ztyp(IS_STRING, *zvalue);
- prepare_value(flags, tmp2 TSRMLS_CC);
- php_http_buffer_append(buf, vss, vsl);
- php_http_buffer_append(buf, Z_STRVAL_P(tmp2), Z_STRLEN_P(tmp2));
- zval_ptr_dtor(&tmp2);
- } while (SUCCESS == zend_hash_move_forward(Z_ARRVAL_P(tmp)));
- zval_ptr_dtor(&tmp);
- } else {
-
- tmp = php_http_ztyp(IS_STRING, *zvalue);
- prepare_value(flags, tmp TSRMLS_CC);
- php_http_buffer_append(buf, vss, vsl);
- php_http_buffer_append(buf, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp));
- zval_ptr_dtor(&tmp);
- }
- } else if (!Z_BVAL_PP(zvalue)) {
- php_http_buffer_append(buf, vss, vsl);
- php_http_buffer_appends(buf, "0");
+ 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;
}
- }
- if (SUCCESS != zend_hash_find(Z_ARRVAL_PP(zparam), ZEND_STRS("arguments"), (void *) &zargs)) {
- zargs = zparam;
- }
- if (Z_TYPE_PP(zargs) == IS_ARRAY) {
- FOREACH_KEYVAL(pos2, *zargs, key2, zarg) {
- if (zargs == zparam && key2.type == HASH_KEY_IS_STRING && !strcmp(key2.str, "value")) {
- continue;
- }
-
- if (PHP_HTTP_BUFFER_LEN(buf)) {
- php_http_buffer_append(buf, ass, asl);
- }
-
- if (key2.type == HASH_KEY_IS_STRING) {
- char *key;
- size_t len;
-
- prepare_key(flags, key2.str, key2.len - 1, &key, &len TSRMLS_CC);
- php_http_buffer_append(buf, key, len);
- efree(key);
- } else {
- php_http_buffer_appendf(buf, "%lu", key2.num);
- }
- if (Z_TYPE_PP(zarg) != IS_BOOL) {
- zval *tmp;
-
- if (Z_TYPE_PP(zarg) == IS_ARRAY) {
- tmp = php_http_zsep(1, IS_ARRAY, *zarg);
- prepare_value(flags, tmp TSRMLS_CC);
- php_http_buffer_append(buf, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp));
- zval_ptr_dtor(&tmp);
-
- while (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_PP(zarg), (void *) &zarg) && Z_TYPE_PP(zarg) == IS_ARRAY);
- }
-
- tmp = php_http_ztyp(IS_STRING, *zarg);
- prepare_value(flags, tmp TSRMLS_CC);
- php_http_buffer_append(buf, vss, vsl);
- php_http_buffer_append(buf, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp));
- zval_ptr_dtor(&tmp);
- } else if (!Z_BVAL_PP(zarg)) {
- php_http_buffer_append(buf, vss, vsl);
- php_http_buffer_appends(buf, "0");
- }
- }
+ 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_buffer_shrink(buf);
php_http_buffer_fix(buf);
projects / m6w6 / ext-http / blobdiff