diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-10-01 11:19:36 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-10-01 11:19:36 +0300 |
| commit | 2d87b51ae9dafc4000830bdebd49d7665d0a4f6f (patch) | |
| tree | 2610a5e2641e17ba8bdbcebc618a73c6dfcb8e13 /sapi/apache2handler | |
| parent | 9d47cb4593972859d7bb8747f1f0b8ae56d7712e (diff) | |
| parent | 4fc5833b3ebda3078911808d296e62d5baa9bf52 (diff) | |
| download | php-git-2d87b51ae9dafc4000830bdebd49d7665d0a4f6f.tar.gz | |
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src: (29 commits)
Fix the deplister rule to not ignore the .c file (Anatol)
Update .gitignore to include the Windows deplister program (win32/build/deplister.c)
Bug > Feature Request
NEWS and UPGRADING
Fixed bug #75479
Fix test
Fix some tests and improve coverage for Windows in SPL
Use already set variable
Fix reflection arguments for sodium_memzero function
Deprecate unbinding of $this of non-static methods
Generalize compile_typename
Fixed bug #76737
Fixed bug #72635
Remove and refactor ext/spl/examples
Remove outdated soap examples
Remove unused ext/bz2/php_bz2.def
Remove redundant ce from reflection property_reference
Only store zend_type inside reflection type_reference
Fixed bug #76946
Bump versions for 7.1.24-dev
...
Diffstat (limited to 'sapi/apache2handler')
| -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 121ed683d6..23eef816a8 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -734,13 +734,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); } |