com php-src: Merge branch 'master' into watchpoints: phpdbg.c phpdbg.h phpdbg_prompt.c phpdbg_prompt.h phpdbg_utils.c phpdbg_utils.h test.php
| From: | Bob Weinand | Date: | Tue, 31 Dec 2013 17:07:10 +0000 |
| Subject: | com php-src: Merge branch 'master' into watchpoints: phpdbg.c phpdbg.h phpdbg_prompt.c phpdbg_prompt.h phpdbg_utils.c phpdbg_utils.h test.php | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77100@lists.php.net to get a copy of this message | ||
Commit: c64d692f491701a6259dd25e7b827e4952bc29ab
Author: Bob Weinand <bobwei9@hotmail.com> Tue, 31 Dec 2013 12:07:10 -0500
Parents: 433bc142a6bb8094c331cb946c15444adaa6932b 2712d7e2248ab91015502d648c9c65d8e5627e69
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c64d692f491701a6259dd25e7b827e4952bc29ab
Log:
Merge branch 'master' into watchpoints
Conflicts:
CREDITS
phpdbg.c
test.php
Changed paths:
MM phpdbg.c
MM phpdbg.h
MM phpdbg_prompt.c
MM phpdbg_prompt.h
MM phpdbg_utils.c
MM phpdbg_utils.h
MM test.php
Diff:
diff --cc phpdbg.c
index 891875e,481a181..4955d2e
--- 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 669eb34,5fdbcbe..b4b12a6
--- 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;
+});
-
- ?>