summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Weinand <bobwei9@hotmail.com>2016-10-16 13:47:49 +0200
committerBob Weinand <bobwei9@hotmail.com>2016-10-16 13:47:49 +0200
commite93eaee1648a55d3d58788e2b898e8fb00f0c13c (patch)
tree0c89122e497c21581522cbb03e52fc1857a4d049
parent6d91772c2f591fa7838bd9c0e141d13c5ab6b196 (diff)
downloadphp-git-e93eaee1648a55d3d58788e2b898e8fb00f0c13c.tar.gz
Fixed bug #70776 (Simple SIGINT does not have any effect)
-rw-r--r--NEWS1
-rw-r--r--sapi/phpdbg/phpdbg.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 3ac6949da7..67401958d1 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 9e82578412..e7012d0905 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;
+ }
}
}
} /* }}} */