From: Michael Wallner <mike@php.net>
Date: Tue, 9 Sep 2014 04:56:33 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: POST_PHP7_EREG_MYSQL_REMOVALS~4^2~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6c47caf25255669f68c30104fc9c5fbc9d1cbc8;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  duplicate value's string for the SAPI filter
  Fine tuned the order of adding request variables.
---

a6c47caf25255669f68c30104fc9c5fbc9d1cbc8
diff --cc main/php_variables.c
index 37af78b98d,b2df88be61..0f16b92d02
--- 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;