Suppress zend signals check in two readline tests

Installing a callback handler may cause libedit to register new
signals during the request.

diff --git a/Zend/zend.c b/Zend/zend.c
index b61658ef53e2835b63be32c4dfe5ef08ee4fff1d..2191ca815092fa91710fbd0a52bc33498d49aff9 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -173,7 +173,7 @@ ZEND_INI_BEGIN()
        ZEND_INI_ENTRY("zend.script_encoding",                  NULL,           ZEND_INI_ALL,           OnUpdateScriptEncoding)
        STD_ZEND_INI_BOOLEAN("zend.detect_unicode",                     "1",    ZEND_INI_ALL,           OnUpdateBool, detect_unicode, zend_compiler_globals, compiler_globals)
 #ifdef ZEND_SIGNALS
-       STD_ZEND_INI_BOOLEAN("zend.signal_check", "0", ZEND_INI_SYSTEM, OnUpdateBool, check, zend_signal_globals_t, zend_signal_globals)
+       STD_ZEND_INI_BOOLEAN("zend.signal_check", ZEND_DEBUG ? "1" : "0", ZEND_INI_SYSTEM, OnUpdateBool, check, zend_signal_globals_t, zend_signal_globals)
 #endif
        STD_ZEND_INI_BOOLEAN("zend.exception_ignore_args",      "0",    ZEND_INI_ALL,           OnUpdateBool, exception_ignore_args, zend_executor_globals, executor_globals)
 ZEND_INI_END()

diff --git a/Zend/zend_signal.c b/Zend/zend_signal.c
index 96870f8d5cc49459deab19f8f5139f2e48ee7441..e69914752aca19be63286fe6a7ce57bf871bddfe 100644 (file)
--- a/Zend/zend_signal.c
+++ b/Zend/zend_signal.c
@@ -328,7 +328,6 @@ void zend_signal_activate(void)
 
        SIGG(active) = 1;
        SIGG(depth)  = 0;
-       SIGG(check)  = ZEND_DEBUG;
 } /* }}} */
 
 /* {{{ zend_signal_deactivate

diff --git a/ext/readline/tests/libedit_callback_handler_install_001.phpt b/ext/readline/tests/libedit_callback_handler_install_001.phpt
index b5d921e27962114bf5669dd118bf5dcdd67b57cc..4fdd4acadd7113b7216c5614d1794cb450712bec 100644 (file)
--- a/ext/readline/tests/libedit_callback_handler_install_001.phpt
+++ b/ext/readline/tests/libedit_callback_handler_install_001.phpt
@@ -4,6 +4,8 @@ readline_callback_handler_install(): Basic test
 <?php if (!extension_loaded("readline") || !function_exists('readline_callback_handler_install')) die("skip");
 if (READLINE_LIB != "libedit") die("skip libedit only");
 ?>
+--INI--
+zend.signal_check=0
 --FILE--
 <?php
 

diff --git a/ext/readline/tests/libedit_callback_handler_remove_001.phpt b/ext/readline/tests/libedit_callback_handler_remove_001.phpt
index 6b0d0d788795e3be94f2024ce6226c01ca7a5703..a45783eaebe32f6f062d782b9529ffb37ce4e751 100644 (file)
--- a/ext/readline/tests/libedit_callback_handler_remove_001.phpt
+++ b/ext/readline/tests/libedit_callback_handler_remove_001.phpt
@@ -4,6 +4,8 @@ readline_callback_handler_remove(): Basic test
 <?php if (!extension_loaded("readline") || !function_exists('readline_callback_handler_remove')) die("skip");
 if (READLINE_LIB != "libedit") die("skip libedit only");
 ?>
+--INI--
+zend.signal_check=0
 --FILE--
 <?php