From 822052602398c57e79ae9d3fc7122e026b922e49 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 19 May 2020 10:22:25 +0200 Subject: revert workaround for xdebug < 2.9.4 --- uopz-xdebug.patch | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 uopz-xdebug.patch (limited to 'uopz-xdebug.patch') diff --git a/uopz-xdebug.patch b/uopz-xdebug.patch new file mode 100644 index 0000000..ef07ba9 --- /dev/null +++ b/uopz-xdebug.patch @@ -0,0 +1,72 @@ + +Revert workaround to xdebug < 2.9.4 + + d9785ce7357fae2a49ba5f00a6705cd75d6fbdcd. + db01930f131eb5f673cba7bd536dab881818760c + +--- + src/handlers.c | 14 -------------- + src/handlers.h | 1 - + uopz.c | 8 +++++--- + 3 files changed, 5 insertions(+), 18 deletions(-) + +diff --git a/src/handlers.c b/src/handlers.c +index 386b840..42910d3 100644 +--- a/src/handlers.c ++++ b/src/handlers.c +@@ -163,20 +163,6 @@ void uopz_handlers_init(void) { + } + } + +-void uopz_handlers_update(void) { +- uopz_vm_handler_t *handler = uopz_vm_handlers; +- +- while (handler) { +- if (!handler->opcode) { +- break; +- } +- if (zend_get_user_opcode_handler(handler->opcode) != handler->uopz) { +- UOPZ_HANDLER_OVERLOAD(handler); +- } +- handler++; +- } +-} +- + void uopz_handlers_shutdown(void) { + uopz_vm_handler_t *handler = uopz_vm_handlers; + +diff --git a/src/handlers.h b/src/handlers.h +index 80574d3..6884faf 100644 +--- a/src/handlers.h ++++ b/src/handlers.h +@@ -20,7 +20,6 @@ + #define UOPZ_HANDLERS_H + + void uopz_handlers_init(void); +-void uopz_handlers_update(void); + void uopz_handlers_shutdown(void); + + #endif /* UOPZ_HANDLERS_H */ +diff --git a/uopz.c b/uopz.c +index b181dda..2f8c193 100644 +--- a/uopz.c ++++ b/uopz.c +@@ -24,7 +24,6 @@ + #include "php_ini.h" + #include "ext/standard/info.h" + +-#include "SAPI.h" + + #include "uopz.h" + +@@ -154,8 +152,6 @@ static PHP_RINIT_FUNCTION(uopz) + + uopz_request_init(); + +- uopz_handlers_update(); +- + return SUCCESS; + } /* }}} */ + + + -- cgit