From 13525328ede9db6f8235b4e7f91f7bce80235880 Mon Sep 17 00:00:00 2001 From: Bob Weinand Date: Fri, 24 Jul 2015 17:17:09 +0200 Subject: Cleanup shutdown, enable proper memory leak displaying phpdbg should not memory leak... --- sapi/phpdbg/phpdbg.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'sapi/phpdbg/phpdbg.h') diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h index f900866211..d6e8ddb1ce 100644 --- a/sapi/phpdbg/phpdbg.h +++ b/sapi/phpdbg/phpdbg.h @@ -259,6 +259,7 @@ ZEND_BEGIN_MODULE_GLOBALS(phpdbg) int bp_count; /* breakpoint count */ int vmret; /* return from last opcode handler execution */ zend_bool in_execution; /* in execution? */ + zend_bool unclean_eval; /* do not check for memory leaks when we needed to bail out during eval */ zend_op_array *(*compile_file)(zend_file_handle *file_handle, int type); HashTable file_sources; @@ -308,8 +309,6 @@ ZEND_BEGIN_MODULE_GLOBALS(phpdbg) HANDLE sigio_watcher_thread; /* sigio watcher thread handle */ struct win32_sigio_watcher_data swd; #endif - - struct _zend_phpdbg_globals *backup; /* backup of data to store */ ZEND_END_MODULE_GLOBALS(phpdbg) /* }}} */ #endif -- cgit v1.2.1 From b4c595dd82548575304d3b41b1c9321f50a5fefd Mon Sep 17 00:00:00 2001 From: Bob Weinand Date: Sat, 25 Jul 2015 00:31:05 +0200 Subject: Fix op_arrays with opcache --- sapi/phpdbg/phpdbg.h | 1 + 1 file changed, 1 insertion(+) (limited to 'sapi/phpdbg/phpdbg.h') diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h index d6e8ddb1ce..ac9e80946b 100644 --- a/sapi/phpdbg/phpdbg.h +++ b/sapi/phpdbg/phpdbg.h @@ -262,6 +262,7 @@ ZEND_BEGIN_MODULE_GLOBALS(phpdbg) zend_bool unclean_eval; /* do not check for memory leaks when we needed to bail out during eval */ zend_op_array *(*compile_file)(zend_file_handle *file_handle, int type); + zend_op_array *(*init_compile_file)(zend_file_handle *file_handle, int type); HashTable file_sources; FILE *oplog; /* opline log */ -- cgit v1.2.1