From: krakjoe <joe.watkins@live.co.uk>
Date: Mon, 9 Dec 2013 09:33:32 +0000 (+0000)
Subject: remove zend extension
X-Git-Tag: php-5.6.0alpha1~110^2~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=12d071fa7c94c7edafd56499443a26cd8716cc6b;p=php

remove zend extension
---

diff --git a/phpdbg.c b/phpdbg.c
index 7fd89f1b29..7a5cd48e43 100644
--- a/phpdbg.c
+++ b/phpdbg.c
@@ -540,37 +540,6 @@ static sapi_module_struct phpdbg_sapi_module = {
 };
 /* }}} */
 
-void phpdbg_op_array_handler(zend_op_array *op_array) {
-	TSRMLS_FETCH();
-
-	phpdbg_resolve_op_array_breaks(op_array TSRMLS_CC);
-}
-
-#ifndef ZEND_EXT_API
-#define ZEND_EXT_API ZEND_DLEXPORT
-#endif
-ZEND_EXTENSION();
-
-ZEND_DLEXPORT zend_extension zend_extension_entry = {
-	PHPDBG_NAME,
-	PHPDBG_VERSION,
-	PHPDBG_AUTHORS,
-	PHPDBG_URL,
-	"(c) 2013",
-	NULL,                    /* startup_func_t */
-	NULL,                    /* shutdown_func_t */
-	NULL,                    /* activate_func_t */
-	NULL,                    /* deactivate_func_t */
-	NULL,                    /* message_handler_func_t */
-	phpdbg_op_array_handler, /* op_array_handler_func_t */
-	NULL,                    /* statement_handler_func_t */
-	NULL,                    /* fcall_begin_handler_func_t */
-	NULL,                    /* fcall_end_handler_func_t */
-	NULL,                    /* op_array_ctor_func_t */
-	NULL,                    /* op_array_dtor_func_t */
-	STANDARD_ZEND_EXTENSION_PROPERTIES
-};
-
 const opt_struct OPTIONS[] = { /* {{{ */
 	{'c', 1, "ini path override"},
 	{'d', 1, "define ini entry on command line"},
@@ -1090,8 +1059,7 @@ phpdbg_main:
 	phpdbg->ini_entries = ini_entries;
 		
 	if (phpdbg->startup(phpdbg) == SUCCESS) {
-		zend_register_extension(&zend_extension_entry, NULL);
-
+		
 		zend_activate(TSRMLS_C);
 		
 		/* do not install sigint handlers for remote consoles */
diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index bff0975b9f..7e01b2e18f 100644
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -1318,6 +1318,9 @@ zend_vm_enter:
 #endif
 
 	while (1) {
+		/* resolve nth opline breakpoints */
+		phpdbg_resolve_op_array_breaks(EG(active_op_array) TSRMLS_CC);
+		
 #ifdef ZEND_WIN32
 		if (EG(timed_out)) {
 			zend_timeout(0);