com php-src: Merge branch 'PHP-5.6': main/php_variables.c
| From: | Michael Wallner | Date: | Tue, 09 Sep 2014 04:56:33 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': main/php_variables.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81470@lists.php.net to get a copy of this message | ||
Commit: a6c47caf25255669f68c30104fc9c5fbc9d1cbc8
Author: Michael Wallner <mike@php.net> Tue, 9 Sep 2014 06:56:33 +0200
Parents: 2470e01ab6d30e5ed3d890f0aaf1321215edb4cd 8d1099ac0574f3a42036085641c2df03a1d5f731
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a6c47caf25255669f68c30104fc9c5fbc9d1cbc8
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
duplicate value's string for the SAPI filter
Fine tuned the order of adding request variables.
Changed paths:
MM main/php_variables.c
Diff:
diff --cc main/php_variables.c
index 37af78b,b2df88b..0f16b92
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@@ -243,10 -241,10 +243,10 @@@ 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;
+ size_t new_vlen;
if (var->ptr >= var->end) {
return 0;