diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-06-04 02:20:35 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-06-04 02:20:35 +0200 |
| commit | 1e85b9e86b561a6e92a5bd82b4bda6b069e25d7a (patch) | |
| tree | a950a74fcc04d09e75b94cca20b9266d57f09d26 /sapi/phpdbg/phpdbg.c | |
| parent | a1b0ae4247b22244a4dd25a053d8fa61d85a77dd (diff) | |
| parent | 848df6fcbe7b32f2c21ebdcfe1c1adb56753cad9 (diff) | |
| download | php-git-1e85b9e86b561a6e92a5bd82b4bda6b069e25d7a.tar.gz | |
Merge branch 'PHP-5.6'
Conflicts:
sapi/phpdbg/phpdbg.c
Diffstat (limited to 'sapi/phpdbg/phpdbg.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 0239e692b4..93fdbd7424 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -159,8 +159,6 @@ static PHP_RINIT_FUNCTION(phpdbg) /* {{{ */ zend_hash_init(&PHPDBG_G(bp)[PHPDBG_BREAK_COND], 8, NULL, php_phpdbg_destroy_bp_condition, 0); zend_hash_init(&PHPDBG_G(bp)[PHPDBG_BREAK_MAP], 8, NULL, NULL, 0); - phpdbg_setup_watchpoints(TSRMLS_C); - zend_hash_init(&PHPDBG_G(seek), 8, NULL, NULL, 0); zend_hash_init(&PHPDBG_G(registered), 8, NULL, php_phpdbg_destroy_registered, 0); @@ -1256,10 +1254,12 @@ phpdbg_main: mm_heap->use_zend_alloc = 0; } + zend_activate(TSRMLS_C); + PHPDBG_G(original_free_function) = mm_heap->_free; mm_heap->_free = phpdbg_watch_efree; - zend_activate(TSRMLS_C); + phpdbg_setup_watchpoints(TSRMLS_C); #if defined(ZEND_SIGNALS) && !defined(_WIN32) zend_try { |