diff options
| author | Joe Watkins <krakjoe@php.net> | 2015-09-01 16:51:40 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2015-09-01 16:51:40 +0100 |
| commit | a8a3b02fd9bbe65fe0ed5342423d2e1f62f7e171 (patch) | |
| tree | f01a33473febd76b8b4880d7a377893d5c733d9f | |
| parent | ccba374faf198db2c6cb0195b733387b6a27fbad (diff) | |
| download | php-git-a8a3b02fd9bbe65fe0ed5342423d2e1f62f7e171.tar.gz | |
fix for --enable-zend-signals and ZTS
temporary fix to make queue size bigger in zend_signal while I work on it
| -rw-r--r-- | Zend/zend_signal.c | 4 | ||||
| -rw-r--r-- | Zend/zend_signal.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Zend/zend_signal.c b/Zend/zend_signal.c index 1280a7085f..b4f57415d5 100644 --- a/Zend/zend_signal.c +++ b/Zend/zend_signal.c @@ -75,6 +75,10 @@ void zend_signal_handler_defer(int signo, siginfo_t *siginfo, void *context) int errno_save = errno; zend_signal_queue_t *queue, *qtmp; +#ifdef ZTS + ZEND_TSRMLS_CACHE_UPDATE(); +#endif + if (EXPECTED(SIGG(active))) { if (UNEXPECTED(SIGG(depth) == 0)) { /* try to handle signal */ if (UNEXPECTED(SIGG(blocked))) { diff --git a/Zend/zend_signal.h b/Zend/zend_signal.h index e70e409b4b..0c32db52a3 100644 --- a/Zend/zend_signal.h +++ b/Zend/zend_signal.h @@ -32,7 +32,7 @@ #endif #ifndef ZEND_SIGNAL_QUEUE_SIZE -#define ZEND_SIGNAL_QUEUE_SIZE 32 +#define ZEND_SIGNAL_QUEUE_SIZE 64 #endif /* Signal structs */ |