Skip to content

Commit d7e96c1

Browse files
committed
Merge branch 'PHP-7.2' into PHP-7.3
2 parents b617a5b + 56d1578 commit d7e96c1

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

sapi/apache2handler/sapi_apache2.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -734,13 +734,20 @@ static void php_apache_child_init(apr_pool_t *pchild, server_rec *s)
734734
apr_pool_cleanup_register(pchild, NULL, php_apache_child_shutdown, apr_pool_cleanup_null);
735735
}
736736

737+
#ifdef ZEND_SIGNALS
738+
static void php_apache_signal_init(apr_pool_t *pchild, server_rec *s)
739+
{
740+
zend_signal_init();
741+
}
742+
#endif
743+
737744
void php_ap2_register_hook(apr_pool_t *p)
738745
{
739746
ap_hook_pre_config(php_pre_config, NULL, NULL, APR_HOOK_MIDDLE);
740747
ap_hook_post_config(php_apache_server_startup, NULL, NULL, APR_HOOK_MIDDLE);
741748
ap_hook_handler(php_handler, NULL, NULL, APR_HOOK_MIDDLE);
742749
#ifdef ZEND_SIGNALS
743-
ap_hook_child_init(zend_signal_init, NULL, NULL, APR_HOOK_MIDDLE);
750+
ap_hook_child_init(php_apache_signal_init, NULL, NULL, APR_HOOK_MIDDLE);
744751
#endif
745752
ap_hook_child_init(php_apache_child_init, NULL, NULL, APR_HOOK_MIDDLE);
746753
}

0 commit comments

Comments
 (0)