diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-10-19 11:48:27 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-10-19 11:48:27 +0100 |
| commit | 0397b8c5c5b78f11a4eefa6302c303c56ac32b32 (patch) | |
| tree | 03e91bc2696880ccd81dba34fc80a7d941cba91b | |
| parent | 965daf43493879314013c1d8a64ede3da372f712 (diff) | |
| parent | bb1814b5c3ae78d1d3cb383f58a9729227138b7c (diff) | |
| download | php-git-0397b8c5c5b78f11a4eefa6302c303c56ac32b32.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix issue with zend signals in php_request_startup
| -rw-r--r-- | main/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/main/main.c b/main/main.c index a84f7cdb6f..26105f62b8 100644 --- a/main/main.c +++ b/main/main.c @@ -1658,7 +1658,9 @@ int php_request_startup(void) zend_activate(); sapi_activate(); +#ifdef ZEND_SIGNALS zend_signal_activate(); +#endif if (PG(max_input_time) == -1) { zend_set_timeout(EG(timeout_seconds), 1); |