diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/php_config.h.in | 3 | ||||
| -rw-r--r-- | main/php_variables.c | 12 | ||||
| -rw-r--r-- | main/php_version.h | 6 |
3 files changed, 13 insertions, 8 deletions
diff --git a/main/php_config.h.in b/main/php_config.h.in index 69d255609..00246a920 100644 --- a/main/php_config.h.in +++ b/main/php_config.h.in @@ -577,6 +577,9 @@ /* */ #undef HAVE_DCNGETTEXT +/* Define if the compiler supports Decimal32/64/128 types. */ +#undef HAVE_DECIMAL_FP_SUPPORT + /* Whether system headers declare timezone */ #undef HAVE_DECLARED_TIMEZONE diff --git a/main/php_variables.c b/main/php_variables.c index 90cfcb20b..b2df88be6 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -241,7 +241,7 @@ typedef struct post_var_data { static zend_bool add_post_var(zval *arr, post_var_data_t *var, zend_bool eof TSRMLS_DC) { - char *ksep, *vsep; + char *ksep, *vsep, *val; size_t klen, vlen; /* FIXME: string-size_t */ unsigned int new_vlen; @@ -272,15 +272,17 @@ static zend_bool add_post_var(zval *arr, post_var_data_t *var, zend_bool eof TSR vlen = 0; } - php_url_decode(var->ptr, klen); + + val = estrndup(ksep, vlen); if (vlen) { - vlen = php_url_decode(ksep, vlen); + vlen = php_url_decode(val, vlen); } - if (sapi_module.input_filter(PARSE_POST, var->ptr, &ksep, vlen, &new_vlen TSRMLS_CC)) { - php_register_variable_safe(var->ptr, ksep, new_vlen, arr TSRMLS_CC); + if (sapi_module.input_filter(PARSE_POST, var->ptr, &val, vlen, &new_vlen TSRMLS_CC)) { + php_register_variable_safe(var->ptr, val, new_vlen, arr TSRMLS_CC); } + efree(val); var->ptr = vsep + (vsep != var->end); return 1; diff --git a/main/php_version.h b/main/php_version.h index 90dfd761b..fe6057d58 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 6 -#define PHP_RELEASE_VERSION 0 +#define PHP_RELEASE_VERSION 1 #define PHP_EXTRA_VERSION "" -#define PHP_VERSION "5.6.0" -#define PHP_VERSION_ID 50600 +#define PHP_VERSION "5.6.1" +#define PHP_VERSION_ID 50601 |