From: Dmitry Stogov <dmitry@php.net>
Date: Tue, 14 Feb 2012 09:27:08 +0000 (+0000)
Subject: Added ability to reset user opcode handlers (Yoram)
X-Git-Tag: php-5.4.0RC8~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49ce9b9bff5d83742ab6eeb852a899e51c9778c9;p=php

Added ability to reset user opcode handlers (Yoram)
---

diff --git a/NEWS b/NEWS
index 2da0b6dbf5..613d918866 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Feb 2012, PHP 5.4.0 RC 8
 - Core:
+  . Added ability to reset user opcode handlers (Yoram).
   . Improved max_input_vars directive to check nested variables (Dmitry).
   . Fixed bug #60965 (Buffer overflow on htmlspecialchars/entities with
     $double=false). (Gustavo)
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;
 	}