X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_params.c;h=c722f06a322295d9d6f5d7df0ef4cd8f9a40ca6a;hp=5adeb91c761f390bd3e6705ea71eb6eaf5225422;hb=e761c34103c0c5316cce092ea42a789b95e887d2;hpb=bdd6edb59194cda9e5fcb393c48ab4230fceb32a diff --git a/src/php_http_params.c b/src/php_http_params.c index 5adeb91..c722f06 100644 --- a/src/php_http_params.c +++ b/src/php_http_params.c @@ -234,11 +234,13 @@ static inline void sanitize_key(unsigned flags, char *str, size_t len, zval *zv, return; } - eos = &Z_STRVAL_P(zv)[Z_STRLEN_P(zv)-1]; - if (*eos == '*') { - *eos = '\0'; - *rfc5987 = 1; - Z_STRLEN_P(zv) -= 1; + if (flags & PHP_HTTP_PARAMS_RFC5987) { + eos = &Z_STRVAL_P(zv)[Z_STRLEN_P(zv)-1]; + if (*eos == '*') { + *eos = '\0'; + *rfc5987 = 1; + Z_STRLEN_P(zv) -= 1; + } } if (flags & PHP_HTTP_PARAMS_URLENCODED) { @@ -523,6 +525,8 @@ static void push_param(HashTable *params, php_http_params_state_t *state, const if (state->val.str) { if (0 < (state->val.len = state->input.str - state->val.str)) { sanitize_value(opts->flags, state->val.str, state->val.len, *(state->current.val), state->rfc5987 TSRMLS_CC); + } else { + ZVAL_EMPTY_STRING(*(state->current.val)); } state->rfc5987 = 0; } else if (state->arg.str) {