From 908b662f7fcfbc032f70ece82c25fdc8d21de4b3 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Wed, 2 Mar 2016 16:56:39 +0300 Subject: PHP-7 zend_call_function() doesn't support symbol_table substitution --- sapi/phpdbg/phpdbg_prompt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sapi/phpdbg/phpdbg_prompt.c') diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index 558ca469b5..31d3c01e46 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -121,7 +121,8 @@ static inline int phpdbg_call_register(phpdbg_param_t *stack) /* {{{ */ ZVAL_STRINGL(&fci.function_name, lc_name, name->len); fci.size = sizeof(zend_fcall_info); fci.function_table = &PHPDBG_G(registered); - fci.symbol_table = zend_rebuild_symbol_table(); + //???fci.symbol_table = zend_rebuild_symbol_table(); + fci.symbol_table = NULL; fci.object = NULL; fci.retval = &fretval; fci.no_separation = 1; -- cgit v1.2.1 From c4b188871e7abb7c6cc20d05ceda4cea082efcd2 Mon Sep 17 00:00:00 2001 From: James Titcumb Date: Tue, 16 Feb 2016 22:47:37 +0000 Subject: Fix bug #71575 removing extra semicolons outside macros --- sapi/phpdbg/phpdbg_prompt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sapi/phpdbg/phpdbg_prompt.c') diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index 31d3c01e46..a01c8a399f 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -48,7 +48,7 @@ #error "phpdbg can only be built with CALL zend vm kind" #endif -ZEND_EXTERN_MODULE_GLOBALS(phpdbg); +ZEND_EXTERN_MODULE_GLOBALS(phpdbg) extern int phpdbg_startup_run; #ifdef HAVE_LIBDL -- cgit v1.2.1 From 2524ab9e67554f1de3c343ed7eb11eee0c92a093 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 30 May 2016 18:32:39 +0200 Subject: fix condition --- sapi/phpdbg/phpdbg_prompt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sapi/phpdbg/phpdbg_prompt.c') diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index a01c8a399f..6f73d3087a 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -1048,7 +1048,7 @@ PHPDBG_API const char *phpdbg_load_module_or_extension(char **path, char **name) if (!handle) { #if PHP_WIN32 char *err = GET_DL_ERROR(); - if (err && *err != "") { + if (err && err[0]) { phpdbg_error("dl", "type=\"unknown\"", "%s", err); LocalFree(err); } else { -- cgit v1.2.1