summaryrefslogtreecommitdiff
path: root/sapi/phpdbg/phpdbg_cmd.c
diff options
context:
space:
mode:
authorBob Weinand <bobwei9@hotmail.com>2015-07-07 22:45:34 +0200
committerBob Weinand <bobwei9@hotmail.com>2015-07-07 22:45:34 +0200
commit7a8ea0f60d4d4302be7231f4b73c08a209e696d0 (patch)
tree6aa12ab1cf789eeba8add3cf17cc5feef73a71e9 /sapi/phpdbg/phpdbg_cmd.c
parentb3a4c05071c3786e27e1326fa1b4d5acad62fccd (diff)
downloadphp-git-7a8ea0f60d4d4302be7231f4b73c08a209e696d0.tar.gz
Properly exit on EOF on stdin in readline mode
Diffstat (limited to 'sapi/phpdbg/phpdbg_cmd.c')
-rw-r--r--sapi/phpdbg/phpdbg_cmd.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/sapi/phpdbg/phpdbg_cmd.c b/sapi/phpdbg/phpdbg_cmd.c
index 36f1a3f4ab..9a3751a424 100644
--- a/sapi/phpdbg/phpdbg_cmd.c
+++ b/sapi/phpdbg/phpdbg_cmd.c
@@ -729,11 +729,15 @@ readline:
PHPDBG_G(last_was_newline) = 1;
}
- if (!cmd) {
- goto readline;
- }
-
if (!(PHPDBG_G(flags) & PHPDBG_IS_REMOTE)) {
+ if (!cmd) {
+ if (feof(PHPDBG_G(io)[PHPDBG_STDIN].ptr)) {
+ PHPDBG_G(flags) |= PHPDBG_IS_QUITTING | PHPDBG_IS_DISCONNECTED;
+ zend_bailout();
+ }
+ goto readline;
+ }
+
add_history(cmd);
}
#endif