com php-src: issues raised in #46, don't quit on CTRL+C if not executing: phpdbg.c
| From: | Bob Weinand | Date: | Mon, 13 Jan 2014 20:16:50 +0000 |
| Subject: | com php-src: issues raised in #46, don't quit on CTRL+C if not executing: phpdbg.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75671@lists.php.net to get a copy of this message | ||
Commit: 231a1c401bf91aa154585cbc465a6902e90bddb4
Author: krakjoe <joe.watkins@live.co.uk> Mon, 13 Jan 2014 20:16:50 +0000
Parents: c645e5043edadc986a24eac2bcc64842da5f0d98
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=231a1c401bf91aa154585cbc465a6902e90bddb4
Log:
issues raised in #46, don't quit on CTRL+C if not executing
Bugs:
https://bugs.php.net/46
Changed paths:
M phpdbg.c
Diff:
diff --git a/phpdbg.c b/phpdbg.c
index c631d8f..1e69e4b 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)) {