]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorMichael Wallner <mike@php.net>
Tue, 9 Sep 2014 04:56:33 +0000 (06:56 +0200)
committerMichael Wallner <mike@php.net>
Tue, 9 Sep 2014 04:56:33 +0000 (06:56 +0200)
* PHP-5.6:
  duplicate value's string for the SAPI filter
  Fine tuned the order of adding request variables.

1  2 
main/php_variables.c

index 37af78b98d29a89a086a3df4694db7ae22cb1e94,b2df88be615052d19ddc2bb4c671d9eca2d51a6d..0f16b92d02e4500030d558e9ff725ad8d9b4773d
@@@ -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;