Skip to content

Commit 4f26041

Browse files
committed
Merge branch 'PHP-7.4'
2 parents 314eedb + 9b3e579 commit 4f26041

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

Zend/zend.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ ZEND_INI_BEGIN()
166166
ZEND_INI_ENTRY("zend.script_encoding", NULL, ZEND_INI_ALL, OnUpdateScriptEncoding)
167167
STD_ZEND_INI_BOOLEAN("zend.detect_unicode", "1", ZEND_INI_ALL, OnUpdateBool, detect_unicode, zend_compiler_globals, compiler_globals)
168168
#ifdef ZEND_SIGNALS
169-
STD_ZEND_INI_BOOLEAN("zend.signal_check", "0", ZEND_INI_SYSTEM, OnUpdateBool, check, zend_signal_globals_t, zend_signal_globals)
169+
STD_ZEND_INI_BOOLEAN("zend.signal_check", ZEND_DEBUG ? "1" : "0", ZEND_INI_SYSTEM, OnUpdateBool, check, zend_signal_globals_t, zend_signal_globals)
170170
#endif
171171
STD_ZEND_INI_BOOLEAN("zend.exception_ignore_args", "0", ZEND_INI_ALL, OnUpdateBool, exception_ignore_args, zend_executor_globals, executor_globals)
172172
ZEND_INI_END()

Zend/zend_signal.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,6 @@ void zend_signal_activate(void)
328328

329329
SIGG(active) = 1;
330330
SIGG(depth) = 0;
331-
SIGG(check) = ZEND_DEBUG;
332331
} /* }}} */
333332

334333
/* {{{ zend_signal_deactivate

ext/readline/tests/libedit_callback_handler_install_001.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ readline_callback_handler_install(): Basic test
44
<?php if (!extension_loaded("readline") || !function_exists('readline_callback_handler_install')) die("skip");
55
if (READLINE_LIB != "libedit") die("skip libedit only");
66
?>
7+
--INI--
8+
zend.signal_check=0
79
--FILE--
810
<?php
911

ext/readline/tests/libedit_callback_handler_remove_001.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ readline_callback_handler_remove(): Basic test
44
<?php if (!extension_loaded("readline") || !function_exists('readline_callback_handler_remove')) die("skip");
55
if (READLINE_LIB != "libedit") die("skip libedit only");
66
?>
7+
--INI--
8+
zend.signal_check=0
79
--FILE--
810
<?php
911

0 commit comments

Comments
 (0)