From: krakjoe Date: Mon, 13 Jan 2014 20:16:50 +0000 (+0000) Subject: issues raised in #46, don't quit on CTRL+C if not executing X-Git-Tag: php-5.6.0alpha1~14^2~4 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=231a1c401bf91aa154585cbc465a6902e90bddb4;p=php issues raised in #46, don't quit on CTRL+C if not executing --- 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)) {