From: Tjerk Meesters <datibbaw@php.net>
Date: Sun, 2 Mar 2014 21:56:22 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.11RC1~41
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bbd0781b3993dc6a06c5706c4a8d0754be0c70b9;p=php

Merge branch 'PHP-5.4' into PHP-5.5
---

bbd0781b3993dc6a06c5706c4a8d0754be0c70b9
diff --cc ext/standard/proc_open.c
index 1e37e64563,7ffba0e24d..f4c3b4738c
--- a/ext/standard/proc_open.c
+++ b/ext/standard/proc_open.c
@@@ -172,9 -188,14 +188,14 @@@ static php_process_env_t _php_array_to_
  #endif
  				p += el_len + 1;
  				break;
 -			case HASH_KEY_NON_EXISTANT:
 +			case HASH_KEY_NON_EXISTENT:
  				break;
  		}
+ 
+ next_element:
+ 		if (Z_TYPE_PP(element) != IS_STRING) {
+ 			zval_dtor(&tmp);
+ 		}
  	}
  
  	assert((uint)(p - env.envp) <= sizeenv);