Skip to content

Commit db80e0e

Browse files
committed
Fixed bug #75479
Wrap the zend_signal_init() call, so the hook arguments line up.
1 parent 83e2b9e commit db80e0e

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
@@ -747,13 +747,20 @@ static void php_apache_child_init(apr_pool_t *pchild, server_rec *s)
747747
apr_pool_cleanup_register(pchild, NULL, php_apache_child_shutdown, apr_pool_cleanup_null);
748748
}
749749

750+
#ifdef ZEND_SIGNALS
751+
static void php_apache_signal_init(apr_pool_t *pchild, server_rec *s)
752+
{
753+
zend_signal_init();
754+
}
755+
#endif
756+
750757
void php_ap2_register_hook(apr_pool_t *p)
751758
{
752759
ap_hook_pre_config(php_pre_config, NULL, NULL, APR_HOOK_MIDDLE);
753760
ap_hook_post_config(php_apache_server_startup, NULL, NULL, APR_HOOK_MIDDLE);
754761
ap_hook_handler(php_handler, NULL, NULL, APR_HOOK_MIDDLE);
755762
#ifdef ZEND_SIGNALS
756-
ap_hook_child_init(zend_signal_init, NULL, NULL, APR_HOOK_MIDDLE);
763+
ap_hook_child_init(php_apache_signal_init, NULL, NULL, APR_HOOK_MIDDLE);
757764
#endif
758765
ap_hook_child_init(php_apache_child_init, NULL, NULL, APR_HOOK_MIDDLE);
759766
}

0 commit comments

Comments
 (0)