From 49ce9b9bff5d83742ab6eeb852a899e51c9778c9 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Tue, 14 Feb 2012 09:27:08 +0000 Subject: Added ability to reset user opcode handlers (Yoram) --- Zend/zend_execute.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'Zend/zend_execute.c') diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 1798045bc9..d72fc7369a 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1512,7 +1512,12 @@ ZEND_API void execute_internal(zend_execute_data *execute_data_ptr, int return_v ZEND_API int zend_set_user_opcode_handler(zend_uchar opcode, user_opcode_handler_t handler) { if (opcode != ZEND_USER_OPCODE) { - zend_user_opcodes[opcode] = ZEND_USER_OPCODE; + if (handler == NULL) { + /* restore the original handler */ + zend_user_opcodes[opcode] = opcode; + } else { + zend_user_opcodes[opcode] = ZEND_USER_OPCODE; + } zend_user_opcode_handlers[opcode] = handler; return SUCCESS; } -- cgit v1.2.1