diff options
Diffstat (limited to 'Zend/zend_signal.h')
| -rw-r--r-- | Zend/zend_signal.h | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/Zend/zend_signal.h b/Zend/zend_signal.h index 37bb0139d5..0bb191db73 100644 --- a/Zend/zend_signal.h +++ b/Zend/zend_signal.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | Zend Signal Handling | +----------------------------------------------------------------------+ - | Copyright (c) 2008-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -23,9 +23,7 @@ #ifdef ZEND_SIGNALS -# ifdef HAVE_SIGNAL_H -# include <signal.h> -# endif +#include <signal.h> #ifndef NSIG #define NSIG 65 @@ -59,14 +57,16 @@ typedef struct _zend_signal_globals_t { int running; /* in signal handler execution */ int active; /* internal signal handling is enabled */ zend_bool check; /* check for replaced handlers on shutdown */ + zend_bool reset; /* reset signal handlers on each request */ zend_signal_entry_t handlers[NSIG]; zend_signal_queue_t pstorage[ZEND_SIGNAL_QUEUE_SIZE], *phead, *ptail, *pavail; /* pending queue */ } zend_signal_globals_t; # ifdef ZTS -# define SIGG(v) ZEND_TSRMG(zend_signal_globals_id, zend_signal_globals_t *, v) +# define SIGG(v) ZEND_TSRMG_FAST(zend_signal_globals_offset, zend_signal_globals_t *, v) BEGIN_EXTERN_C() ZEND_API extern int zend_signal_globals_id; +ZEND_API extern size_t zend_signal_globals_offset; END_EXTERN_C() # else # define SIGG(v) (zend_signal_globals.v) @@ -110,13 +110,3 @@ ZEND_API int zend_sigaction(int signo, const struct sigaction *act, struct sigac #endif /* ZEND_SIGNALS */ #endif /* ZEND_SIGNAL_H */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * indent-tabs-mode: t - * End: - * vim600: sw=4 ts=4 fdm=marker - * vim<600: sw=4 ts=4 - */ |