Skip to content

Commit 4c071a3

Browse files
committed
Rip out Zend signal handling
1 parent 8977a98 commit 4c071a3

File tree

20 files changed

+5
-656
lines changed

20 files changed

+5
-656
lines changed

Zend/Zend.m4

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -303,22 +303,7 @@ AC_MSG_RESULT(done)
303303
304304
AC_CHECK_FUNCS(mremap)
305305
306-
AC_ARG_ENABLE([zend-signals],
307-
[AS_HELP_STRING([--disable-zend-signals],
308-
[whether to enable zend signal handling])],
309-
[ZEND_SIGNALS=$enableval],
310-
[ZEND_SIGNALS=yes])
311-
312-
AC_CHECK_FUNCS([sigaction], [], [
313-
ZEND_SIGNALS=no
314-
])
315-
if test "$ZEND_SIGNALS" = "yes"; then
316-
AC_DEFINE(ZEND_SIGNALS, 1, [Use zend signal handling])
317-
CFLAGS="$CFLAGS -DZEND_SIGNALS"
318-
fi
319-
320-
AC_MSG_CHECKING(whether to enable zend signal handling)
321-
AC_MSG_RESULT($ZEND_SIGNALS)
306+
AC_CHECK_FUNCS(sigaction)
322307
323308
])
324309

Zend/zend.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,6 @@ ZEND_INI_BEGIN()
164164
STD_ZEND_INI_BOOLEAN("zend.multibyte", "0", ZEND_INI_PERDIR, OnUpdateBool, multibyte, zend_compiler_globals, compiler_globals)
165165
ZEND_INI_ENTRY("zend.script_encoding", NULL, ZEND_INI_ALL, OnUpdateScriptEncoding)
166166
STD_ZEND_INI_BOOLEAN("zend.detect_unicode", "1", ZEND_INI_ALL, OnUpdateBool, detect_unicode, zend_compiler_globals, compiler_globals)
167-
#ifdef ZEND_SIGNALS
168-
STD_ZEND_INI_BOOLEAN("zend.signal_check", "0", ZEND_INI_SYSTEM, OnUpdateBool, check, zend_signal_globals_t, zend_signal_globals)
169-
#endif
170167
STD_ZEND_INI_BOOLEAN("zend.exception_ignore_args", "0", ZEND_INI_ALL, OnUpdateBool, exception_ignore_args, zend_executor_globals, executor_globals)
171168
ZEND_INI_END()
172169

Zend/zend.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
#include "zend_stream.h"
3939
#include "zend_smart_str_public.h"
4040
#include "zend_smart_string_public.h"
41-
#include "zend_signal.h"
4241

4342
#define zend_sprintf sprintf
4443

0 commit comments

Comments
 (0)