summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkrakjoe <joe.watkins@live.co.uk>2014-01-13 20:16:50 +0000
committerkrakjoe <joe.watkins@live.co.uk>2014-01-13 20:16:50 +0000
commit231a1c401bf91aa154585cbc465a6902e90bddb4 (patch)
treee581c8e8ef1f464c58abc33955be221058726f32
parentc645e5043edadc986a24eac2bcc64842da5f0d98 (diff)
downloadphp-git-231a1c401bf91aa154585cbc465a6902e90bddb4.tar.gz
issues raised in #46, don't quit on CTRL+C if not executing
-rw-r--r--phpdbg.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/phpdbg.c b/phpdbg.c
index c631d8f3c3..1e69e4bdbf 100644
--- a/phpdbg.c
+++ b/phpdbg.c
@@ -654,8 +654,11 @@ static inline void phpdbg_sigint_handler(int signo) /* {{{ */
PHPDBG_G(flags) |= PHPDBG_IS_SIGNALED;
}
} else {
- PHPDBG_G(flags) |= PHPDBG_IS_QUITTING;
- zend_bailout();
+ /* we quit remote consoles on recv SIGINT */
+ if (PHPDBG_G(flags) & PHPDBG_IS_REMOTE) {
+ PHPDBG_G(flags) |= PHPDBG_IS_QUITTING;
+ zend_bailout();
+ }
}
} /* }}} */
@@ -1271,6 +1274,9 @@ phpdbg_interact:
/* this must be forced */
CG(unclean_shutdown) = 0;
+ /* this is just helpful */
+ PG(report_memleaks) = 0;
+
phpdbg_out:
#ifndef _WIN32
if ((PHPDBG_G(flags) & PHPDBG_IS_DISCONNECTED)) {