com php-src: ...: phpdbg.c
| From: | Bob Weinand | Date: | Fri, 17 Jan 2014 21:15:03 +0000 |
| Subject: | com php-src: ...: phpdbg.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75668@lists.php.net to get a copy of this message | ||
Commit: 18f31d474ee384509e4e06d5441c38be747df383
Author: krakjoe <joe.watkins@live.co.uk> Fri, 17 Jan 2014 21:15:03 +0000
Parents: 54fa2883f0be3f4ac3e9faab77434e1833bbae5c
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=18f31d474ee384509e4e06d5441c38be747df383
Log:
..
Changed paths:
M phpdbg..c
Diff:
diff --git a/phpdbg.c b/phpdbg.c
index 8225a90..a2e1e75 100644
--- a/phpdbg.c
+++ b/phpdbg.c
@@ -1242,25 +1242,28 @@ phpdbg_interact:
} else {
cleaning = 0;
}
+
#ifndef _WIN32
- /* remote client disconnected */
- if ((PHPDBG_G(flags) & PHPDBG_IS_DISCONNECTED)) {
+ if (!cleaning) {
+ /* remote client disconnected */
+ if ((PHPDBG_G(flags) & PHPDBG_IS_DISCONNECTED)) {
- if (PHPDBG_G(flags) & PHPDBG_IS_REMOTE) {
- /* renegociate connections */
- phpdbg_open_sockets(
- address, listen, &server, &socket, streams);
+ if (PHPDBG_G(flags) & PHPDBG_IS_REMOTE) {
+ /* renegociate connections */
+ phpdbg_open_sockets(
+ address, listen, &server, &socket, streams);
- /* set streams */
- if (streams[0] && streams[1]) {
- PHPDBG_G(flags) &= ~PHPDBG_IS_QUITTING;
- }
+ /* set streams */
+ if (streams[0] && streams[1]) {
+ PHPDBG_G(flags) &= ~PHPDBG_IS_QUITTING;
+ }
- /* this must be forced */
- CG(unclean_shutdown) = 0;
- } else {
- /* local consoles cannot disconnect, ignore EOF */
- PHPDBG_G(flags) &= ~PHPDBG_IS_DISCONNECTED;
+ /* this must be forced */
+ CG(unclean_shutdown) = 0;
+ } else {
+ /* local consoles cannot disconnect, ignore EOF */
+ PHPDBG_G(flags) &= ~PHPDBG_IS_DISCONNECTED;
+ }
}
}
#endif