From: Bob Weinand <bobwei9@hotmail.com>
Date: Tue, 31 Dec 2013 17:07:10 +0000 (-0500)
Subject: Merge branch 'master' into watchpoints
X-Git-Tag: php-5.6.0beta2~1^2~37^2~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c64d692f491701a6259dd25e7b827e4952bc29ab;p=php

Merge branch 'master' into watchpoints

Conflicts:
	CREDITS
	phpdbg.c
	test.php
---

c64d692f491701a6259dd25e7b827e4952bc29ab
diff --cc phpdbg.c
index 891875ef85,481a1815db..4955d2e1bf
--- a/phpdbg.c
+++ b/phpdbg.c
@@@ -1257,6 -1274,13 +1313,12 @@@ phpdbg_out
  		}
  #endif
  
+ #ifndef ZTS
+ 		/* force cleanup of auto and core globals */
+ 		zend_hash_clean(CG(auto_globals));
+ 		memset(
+ 			&core_globals, 0, sizeof(php_core_globals));
+ #endif
 -		
  		if (ini_entries) {
  			free(ini_entries);
  		}
diff --cc test.php
index 669eb34740,5fdbcbe1a4..b4b12a6e29
--- a/test.php
+++ b/test.php
@@@ -49,19 -49,3 +49,17 @@@ function phpdbg_test_ob(
  	echo 'End';
  	echo $b;
  }
 +
 +$array = [
 +	1,
 +	2,
 +	[3, 4],
 +	[5, 6],
 +];
 +
 +array_walk($array, function (&$item) {
 +	if (is_array($item))
 +		$item[0] += 2;
 +	else
 +		$item -= 1;
 +});
- 
- ?>