diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2015-09-23 17:53:22 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2015-09-23 17:53:29 +0200 |
| commit | 4a174ca7e602fb20d12b8b665eaf3ce5d4d46bd3 (patch) | |
| tree | 47a850b3a3411b943ff421b0cd37af6583b03809 /sapi | |
| parent | aba42e3dda6e3210cf26e667badd2eb7766dae4e (diff) | |
| download | php-git-4a174ca7e602fb20d12b8b665eaf3ce5d4d46bd3.tar.gz | |
Fixed bug #70532 (respect set_exception_handler in phpdbg)
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/phpdbg/create-test.php | 4 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_prompt.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sapi/phpdbg/create-test.php b/sapi/phpdbg/create-test.php index 6de10bd56f..5dc1ba48bb 100644 --- a/sapi/phpdbg/create-test.php +++ b/sapi/phpdbg/create-test.php @@ -98,11 +98,11 @@ stream_set_blocking(STDIN, true); print "\n"; if (!isset($name)) { - print "Specifiy the test description: "; + print "Specify the test description: "; $desc = trim(fgets(STDIN)); } while (!isset($testfile)) { - print "Specifiy the test file name (leave empty to write to stderr): "; + print "Specify the test file name (leave empty to write to stderr): "; $testfile = trim(fgets(STDIN)); if ($testfile != "" && file_exists($testfile)) { print "That file already exists. Type y or yes to overwrite: "; diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index cacfe932aa..0314d39f24 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -744,6 +744,8 @@ PHPDBG_COMMAND(run) /* {{{ */ } if (restore) { + zend_exception_restore(); + zend_try_exception_handler(); if (EG(exception)) { phpdbg_handle_exception(); } |