com php-src: Fixed bug #70776 (Simple SIGINT does not have any effect): NEWS sapi/phpdbg/phpdbg.c
| From: | Bob Weinand | Date: | Sun, 16 Oct 2016 11:47:49 +0000 |
| Subject: | com php-src: Fixed bug #70776 (Simple SIGINT does not have any effect): NEWS sapi/phpdbg/phpdbg.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-95117@lists.php.net to get a copy of this message | ||
Commit: e93eaee1648a55d3d58788e2b898e8fb00f0c13c
Author: Bob Weinand <bobwei9@hotmail.com> Sun, 16 Oct 2016 13:47:49 +0200
Parents: 6d91772c2f591fa7838bd9c0e141d13c5ab6b196
Branches: PHP-7.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e93eaee1648a55d3d58788e2b898e8fb00f0c13c
Log:
Fixed bug #70776 (Simple SIGINT does not have any effect)
Bugs:
https://bugs.php.net/70776
Changed paths:
M NEWS
M sapi/phpdbg/phpdbg.c
Diff:
diff --git a/NEWS b/NEWS
index 3ac6949..6740195 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,7 @@ PHP NEWS
. Add -s command line option / stdin command for reading script from stdin.
(Bob)
. Ignore non-executable opcodes in line mode of phpdbg_end_oplog(). (Bob)
+ . Fixed bug #70776 (Simple SIGINT does not have any effect). (Bob)
- Session:
. Fixed bug #73273 (session_unset() empties values from all variables in which
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
index 9e82578..e7012d0 100644
--- a/sapi/phpdbg/phpdbg.c
+++ b/sapi/phpdbg/phpdbg.c
@@ -1140,6 +1140,10 @@ static inline void phpdbg_sigint_handler(int signo) /* {{{ */
}
} else {
PHPDBG_G(flags) |= PHPDBG_IS_SIGNALED;
+ if (PHPDBG_G(flags) & PHPDBG_PREVENT_INTERACTIVE) {
+ PHPDBG_G(flags) |= PHPDBG_HAS_PAGINATION;
+ PHPDBG_G(flags) &= ~PHPDBG_PREVENT_INTERACTIVE;
+ }
}
}
} /* }}} */