com php-src: Fix phpdbg: sapi/phpdbg/phpdbg_prompt.c
| From: | Nikita Popov | Date: | Tue, 17 Mar 2015 21:59:11 +0000 |
| Subject: | com php-src: Fix phpdbg: sapi/phpdbg/phpdbg_prompt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85578@lists.php.net to get a copy of this message | ||
Commit: e39db5773d9443e2cfee92bc31651848c044c325
Author: Nikita Popov <nikic@php.net> Tue, 17 Mar 2015 22:58:37 +0100
Parents: 87cec4ccc90ce46c94d801c75b62aa25fa18025e
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e39db5773d9443e2cfee92bc31651848c044c325
Log:
Fix phpdbg
Changed paths:
M sapi/phpdbg/phpdbg_prompt.c
Diff:
diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c
index dec11f2..9218c4a 100644
--- a/sapi/phpdbg/phpdbg_prompt.c
+++ b/sapi/phpdbg/phpdbg_prompt.c
@@ -444,6 +444,10 @@ int phpdbg_compile(void) /* {{{ */
if (php_stream_open_for_zend_ex(PHPDBG_G(exec), &fh, USE_PATH|STREAM_OPEN_FOR_INCLUDE) ==
SUCCESS) {
PHPDBG_G(ops) = zend_compile_file(&fh, ZEND_INCLUDE);
zend_destroy_file_handle(&fh);
+ if (EG(exception)) {
+ zend_exception_error(EG(exception), E_ERROR);
+ zend_bailout();
+ }
phpdbg_notice("compile", "context=\"%s\"", "Successful
compilation of %s", PHPDBG_G(exec));