summaryrefslogtreecommitdiff
path: root/phpdbg.c
diff options
context:
space:
mode:
authorkrakjoe <joe.watkins@live.co.uk>2014-01-13 08:12:49 +0000
committerkrakjoe <joe.watkins@live.co.uk>2014-01-13 08:12:49 +0000
commit9add0e9f5ce19e9e19a0ca341cbd92c74b35bfcc (patch)
treee8a2d5e459b9b7211ed47f84109c0eaf03bf7f66 /phpdbg.c
parent333264fdb718f337fb19d208e3d41aeef31f2ca1 (diff)
downloadphp-git-9add0e9f5ce19e9e19a0ca341cbd92c74b35bfcc.tar.gz
Revert "fix #46 ignore EOF"
This reverts commit 333264fdb718f337fb19d208e3d41aeef31f2ca1.
Diffstat (limited to 'phpdbg.c')
-rw-r--r--phpdbg.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/phpdbg.c b/phpdbg.c
index c631d8f3c3..1ada36c7a1 100644
--- a/phpdbg.c
+++ b/phpdbg.c
@@ -1257,8 +1257,10 @@ phpdbg_interact:
/* this must be forced */
CG(unclean_shutdown) = 0;
} else {
- /* local consoles cannot disconnect, ignore EOF */
- PHPDBG_G(flags) &= ~PHPDBG_IS_DISCONNECTED;
+ /* local client quit console */
+ CG(unclean_shutdown) = 0;
+
+ goto phpdbg_out;
}
}
#endif
@@ -1273,7 +1275,7 @@ phpdbg_interact:
phpdbg_out:
#ifndef _WIN32
- if ((PHPDBG_G(flags) & PHPDBG_IS_DISCONNECTED)) {
+ if (PHPDBG_G(flags) & PHPDBG_IS_DISCONNECTED) {
PHPDBG_G(flags) &= ~PHPDBG_IS_DISCONNECTED;
goto phpdbg_interact;
}
@@ -1322,7 +1324,7 @@ phpdbg_out:
if (cleaning || remote) {
goto phpdbg_main;
}
-
+
#ifdef ZTS
/* bugggy */
/* tsrm_shutdown(); */