diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-09-30 20:05:30 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-09-30 20:07:15 +0200 |
| commit | db80e0e2ad016cbff55cc6e1311b7ffe9ad7101e (patch) | |
| tree | 659b91f777c1be98db5ada50b1e7ea459a5e1ecf | |
| parent | 83e2b9e2202da6cc25bdaac67a58022b90be88e7 (diff) | |
| download | php-git-db80e0e2ad016cbff55cc6e1311b7ffe9ad7101e.tar.gz | |
Fixed bug #75479
Wrap the zend_signal_init() call, so the hook arguments line up.
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 2c3356b5c1..11a0b1c615 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -747,13 +747,20 @@ static void php_apache_child_init(apr_pool_t *pchild, server_rec *s) apr_pool_cleanup_register(pchild, NULL, php_apache_child_shutdown, apr_pool_cleanup_null); } +#ifdef ZEND_SIGNALS +static void php_apache_signal_init(apr_pool_t *pchild, server_rec *s) +{ + zend_signal_init(); +} +#endif + void php_ap2_register_hook(apr_pool_t *p) { ap_hook_pre_config(php_pre_config, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_post_config(php_apache_server_startup, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_handler(php_handler, NULL, NULL, APR_HOOK_MIDDLE); #ifdef ZEND_SIGNALS - ap_hook_child_init(zend_signal_init, NULL, NULL, APR_HOOK_MIDDLE); + ap_hook_child_init(php_apache_signal_init, NULL, NULL, APR_HOOK_MIDDLE); #endif ap_hook_child_init(php_apache_child_init, NULL, NULL, APR_HOOK_MIDDLE); } |