diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-17 17:13:01 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-17 17:13:01 +0200 |
| commit | 9b3e57921f1a56ed4b3b389e4cea0b98c4b19498 (patch) | |
| tree | df96b6399f58a725e82f2963742871a42c7952bb | |
| parent | 3d6199db8ad6b2afbdb99641f7a585729b04d784 (diff) | |
| download | php-git-9b3e57921f1a56ed4b3b389e4cea0b98c4b19498.tar.gz | |
Suppress zend signals check in two readline tests
Installing a callback handler may cause libedit to register new
signals during the request.
| -rw-r--r-- | Zend/zend.c | 2 | ||||
| -rw-r--r-- | Zend/zend_signal.c | 1 | ||||
| -rw-r--r-- | ext/readline/tests/libedit_callback_handler_install_001.phpt | 2 | ||||
| -rw-r--r-- | ext/readline/tests/libedit_callback_handler_remove_001.phpt | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index b61658ef53..2191ca8150 100644 --- 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 96870f8d5c..e69914752a 100644 --- 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 b5d921e279..4fdd4acadd 100644 --- 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 6b0d0d7887..a45783eaeb 100644 --- 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 |