Fixed bug #75479

Wrap the zend_signal_init() call, so the hook arguments line up.

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index 2c3356b5c12e820df448e0f149a34ecb60ff03d9..11a0b1c615d03f07affeb47db0e31061bbca5d12 100644 (file)
--- 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);
 }