Changeset 4aa63a4 in mod_gnutls

Timestamp:

Apr 19, 2018, 2:08:30 PM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, debian/master, master, proxy-ticket

Children:

5c62a6a

Parents:

e00a037

Message:

Infrastructure for mod_watchdog support

Asynchronous OCSP cache updates require some kind of timed callbacks
outside of the request handling context. The watchdog module provides
this, is included in HTTPD builds by default, and the documentation
does not mention any restrictions regarding supported MPMs.

Location:

src

Files:

• Makefile.am (modified) (1 diff)
• gnutls_watchdog.c (added)
• gnutls_watchdog.h (added)
• mod_gnutls.c (modified) (1 diff)

src/Makefile.am

@@ -7 +7 @@
 
 mod_gnutls_la_SOURCES = mod_gnutls.c gnutls_io.c gnutls_cache.c \
-        gnutls_config.c gnutls_hooks.c gnutls_ocsp.c gnutls_util.c
+        gnutls_config.c gnutls_hooks.c gnutls_ocsp.c gnutls_util.c \
+        gnutls_watchdog.c
 mod_gnutls_la_CFLAGS = -Wall ${MODULE_CFLAGS}
 mod_gnutls_la_LDFLAGS = -module -avoid-version ${MODULE_LIBS}
-noinst_HEADERS = gnutls_cache.h gnutls_config.h gnutls_ocsp.h gnutls_util.h
+noinst_HEADERS = gnutls_cache.h gnutls_config.h gnutls_ocsp.h gnutls_util.h \
+        gnutls_watchdog.h
 
 apmodpkglib_LTLIBRARIES = mod_gnutls.la

src/mod_gnutls.c

@@ -30 +30 @@
                    int proxy, int enable);
 
+#define MOD_HTTP2 "mod_http2.c"
 static const char * const mod_proxy[] = { "mod_proxy.c", NULL };
-static const char * const mod_http2[] = { "mod_http2.c", NULL };
+static const char * const mod_http2[] = { MOD_HTTP2, NULL };
 
 static void gnutls_hooks(apr_pool_t * p __attribute__((unused)))
 {
-    /* Try Run Post-Config Hook After mod_proxy */
-    ap_hook_post_config(mgs_hook_post_config, mod_proxy, mod_http2,
+    /* Watchdog callbacks must be configured before post_config of
+     * mod_watchdog runs, or the watchdog won't be started. */
+    static const char * const post_conf_succ[] =
+        { MOD_HTTP2, "mod_watchdog.c", NULL };
+    ap_hook_post_config(mgs_hook_post_config, mod_proxy, post_conf_succ,
                         APR_HOOK_MIDDLE);
     /* HTTP Scheme Hook */