Merge branch 'PHP-7.1'

xuenru · Oct 16, 2016 · b1c6299 · b1c6299
2 parents 0399a43 + 47bd3d9
commit b1c6299
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
@@ -1175,6 +1175,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;
+			}
 		}
 	}
 } /* }}} */