Skip to content

Commit 53ea09e

Browse files
committed
Added possiblity to avoid signal handlers reinitialization on each request.
1 parent 8bda225 commit 53ea09e

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

Zend/zend_signal.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,8 +322,10 @@ void zend_signal_activate(void)
322322

323323
memcpy(&SIGG(handlers), &global_orig_handlers, sizeof(global_orig_handlers));
324324

325-
for (x = 0; x < sizeof(zend_sigs) / sizeof(*zend_sigs); x++) {
326-
zend_signal_register(zend_sigs[x], zend_signal_handler_defer);
325+
if (SIGG(reset)) {
326+
for (x = 0; x < sizeof(zend_sigs) / sizeof(*zend_sigs); x++) {
327+
zend_signal_register(zend_sigs[x], zend_signal_handler_defer);
328+
}
327329
}
328330

329331
SIGG(active) = 1;
@@ -365,6 +367,7 @@ static void zend_signal_globals_ctor(zend_signal_globals_t *zend_signal_globals)
365367
size_t x;
366368

367369
memset(zend_signal_globals, 0, sizeof(*zend_signal_globals));
370+
zend_signal_globals->reset = 1;
368371

369372
for (x = 0; x < sizeof(zend_signal_globals->pstorage) / sizeof(*zend_signal_globals->pstorage); ++x) {
370373
zend_signal_queue_t *queue = &zend_signal_globals->pstorage[x];

Zend/zend_signal.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ typedef struct _zend_signal_globals_t {
5959
int running; /* in signal handler execution */
6060
int active; /* internal signal handling is enabled */
6161
zend_bool check; /* check for replaced handlers on shutdown */
62+
zend_bool reset; /* reset signal handlers on each request */
6263
zend_signal_entry_t handlers[NSIG];
6364
zend_signal_queue_t pstorage[ZEND_SIGNAL_QUEUE_SIZE], *phead, *ptail, *pavail; /* pending queue */
6465
} zend_signal_globals_t;

0 commit comments

Comments
 (0)