Changeset 3c475e0 in mod_gnutls

Timestamp:

Apr 19, 2018, 3:20:16 PM (5 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, debian/master, main, master, proxy-ticket

Children:

61e802c

Parents:

103cafa

Message:

Ensure that mod_gnutls child_init runs before mod_watchdog's

Our child_init hook must run before mod_watchdog's because our
watchdog threads are started there and need some child-specific
resources. A child process might (race condition) segfault if these
structures haven't been properly initialized.

File:

• src/mod_gnutls.c (modified) (2 diffs)

src/mod_gnutls.c

@@ -31 +31 @@
 
 #define MOD_HTTP2 "mod_http2.c"
+#define MOD_WATCHDOG "mod_watchdog.c"
 static const char * const mod_proxy[] = { "mod_proxy.c", NULL };
 static const char * const mod_http2[] = { MOD_HTTP2, NULL };
+static const char * const mod_watchdog[] = { MOD_WATCHDOG, NULL };
 
 static void gnutls_hooks(apr_pool_t * p __attribute__((unused)))
 {
     /* Watchdog callbacks must be configured before post_config of
-     * mod_watchdog runs, or the watchdog won't be started. */
+     * mod_watchdog runs, or the watchdog won't be started. Similarly,
+     * our child_init hook must run before mod_watchdog's because our
+     * watchdog threads are started there and need some child-specific
+     * resources. */
     static const char * const post_conf_succ[] =
-        { MOD_HTTP2, "mod_watchdog.c", NULL };
+        { MOD_HTTP2, MOD_WATCHDOG, NULL };
     ap_hook_post_config(mgs_hook_post_config, mod_proxy, post_conf_succ,
                         APR_HOOK_MIDDLE);
@@ -55 +60 @@
                        APR_HOOK_MIDDLE);
     /* Child-Init Hook */
-    ap_hook_child_init(mgs_hook_child_init, NULL, NULL,
+    ap_hook_child_init(mgs_hook_child_init, NULL, mod_watchdog,
                        APR_HOOK_MIDDLE);
     /* Authentication Hook */