diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-06-05 20:54:50 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-06-05 20:54:50 +0400 |
| commit | 717839735f92489227144fc6ae9ef1b4f637816a (patch) | |
| tree | 30204a7ce866032cfc7928d16d1e21c7e12aca47 /sapi/phpdbg/phpdbg_watch.c | |
| parent | 1b8916886b5b3b88ebe016ea311951b21db93ddd (diff) | |
| parent | e16097626a7e86e0baa9fa7d17477b6ffc13c706 (diff) | |
| download | php-git-717839735f92489227144fc6ae9ef1b4f637816a.tar.gz | |
Merge branch 'master' into phpng
* master: (29 commits)
drop exec perm on doc files
fix test for 5.4/5.5
restore correct behavior of DateTime
fix test use invalid code
add test for previous fix
NEWS
NEWS
NEWS
Fix regression introduce in fix for bug #67118
update news
update NEWS
Fix tests
Fix possible segfault depending on memory location...
Fixed startup segfault in non-debug builds Fixes issue #87
PHP 5.4/5.5 compability in phpdbg_watch.c
fix gcov data with some locales (again)
fix gcov data with some locales (again)
fix gcov data with some locales (again)
Update NEWS
Fixed startup segfault in non-debug builds Fixes issue #87
...
Diffstat (limited to 'sapi/phpdbg/phpdbg_watch.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_watch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg_watch.c b/sapi/phpdbg/phpdbg_watch.c index 2efbb1237c..e88622444b 100644 --- a/sapi/phpdbg/phpdbg_watch.c +++ b/sapi/phpdbg/phpdbg_watch.c @@ -580,7 +580,7 @@ void phpdbg_setup_watchpoints(TSRMLS_D) { zend_llist_init(&PHPDBG_G(watchlist_mem), sizeof(void *), phpdbg_watch_mem_dtor, 1); phpdbg_btree_init(&PHPDBG_G(watchpoint_tree), sizeof(void *) * 8); phpdbg_btree_init(&PHPDBG_G(watch_HashTables), sizeof(void *) * 8); - _zend_hash_init(&PHPDBG_G(watchpoints), 8, phpdbg_watch_dtor, 0 ZEND_FILE_LINE_CC); + zend_hash_init(&PHPDBG_G(watchpoints), 8, NULL, phpdbg_watch_dtor, 0 ZEND_FILE_LINE_CC); } static void phpdbg_print_changed_zval(phpdbg_watch_memdump *dump TSRMLS_DC) { |