zval **args;
zval **val;
} current;
+ unsigned quotes:1;
+ unsigned escape:1;
} php_http_params_state_t;
static inline void sanitize_default(zval *zv TSRMLS_DC)
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);
{
php_http_params_token_t **sep = separators;
+ if (state->quotes || state->escape) {
+ return 0;
+ }
+
if (sep) while (*sep) {
if (check_str(state->input.str, state->input.len, (*sep)->str, (*sep)->len)) {
return (*sep)->len;
PHP_HTTP_API HashTable *php_http_params_parse(HashTable *params, const php_http_params_opts_t *opts TSRMLS_DC)
{
- php_http_params_state_t state = {{NULL,0}, {NULL,0}, {NULL,0}, {NULL,0}, {NULL,NULL,NULL}};
+ php_http_params_state_t state = {{NULL,0}, {NULL,0}, {NULL,0}, {NULL,0}, {NULL,NULL,NULL}, 0, 0};
state.input.str = opts->input.str;
state.input.len = opts->input.len;
}
while (state.input.len) {
- if (*state.input.str == '\\') {
- ++state.input.str;
- --state.input.len;
- } else if (!state.param.str) {
+ if (*state.input.str == '"' && !state.escape) {
+ state.quotes = !state.quotes;
+ } else {
+ state.escape = (*state.input.str == '\\');
+ }
+
+ if (!state.param.str) {
/* initialize */
skip_sep(0, &state, opts->param, opts->arg, opts->val TSRMLS_CC);
state.param.str = state.input.str;
}
}
}
-
+
if (state.input.len) {
++state.input.str;
--state.input.len;
static inline void shift_val(php_http_buffer_t *buf, zval *zvalue, const char *vss, size_t vsl, unsigned flags TSRMLS_DC)
{
if (Z_TYPE_P(zvalue) != IS_BOOL) {
- zval *tmp;
-
- if (Z_TYPE_P(zvalue) == IS_ARRAY) {
- tmp = php_http_zsep(1, IS_ARRAY, zvalue);
- } else {
- tmp = php_http_zsep(1, IS_STRING, zvalue);
- }
+ zval *tmp = php_http_zsep(1, IS_STRING, zvalue);
prepare_value(flags, tmp TSRMLS_CC);
php_http_buffer_append(buf, vss, vsl);
php_http_array_hashkey_t key = php_http_array_hashkey_init(0);
zval **val;
+ shift_key(buf, key_str, key_len, ass, asl, flags TSRMLS_CC);
FOREACH_KEYVAL(pos, zvalue, key, val) {
/* did you mean recursion? */
php_http_array_hashkey_stringify(&key);