]> granicus.if.org Git - php/commitdiff
Fixed bug #70776 (Simple SIGINT does not have any effect)
authorBob Weinand <bobwei9@hotmail.com>
Sun, 16 Oct 2016 11:47:49 +0000 (13:47 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Sun, 16 Oct 2016 11:47:49 +0000 (13:47 +0200)
NEWS
sapi/phpdbg/phpdbg.c

diff --git a/NEWS b/NEWS
index 3ac6949da740d0c07803778c155e9b40c99d9df4..67401958d1587adfeaaef33e40bf886bd72c396e 100644 (file)
--- 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
index 9e8257841280632a45e0b83498c064b9410be8da..e7012d09058e3eb4500b5637b0215493b4a9959c 100644 (file)
@@ -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;
+                       }
                }
        }
 } /* }}} */