From 4f9b578980b5db22a8a418765ddcbf98bf191d97 Mon Sep 17 00:00:00 2001 From: Stefan Eissing Date: Mon, 29 Jan 2018 13:10:22 +0000 Subject: [PATCH] mod_http2/mod_proxy_http2: add new module flags git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1822503 13f79535-47bb-0310-9956-ffa450edef68 --- modules/http2/mod_http2.c | 5 ++++- modules/http2/mod_proxy_http2.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/http2/mod_http2.c b/modules/http2/mod_http2.c index e8dfb3782b..19b565ef0d 100644 --- a/modules/http2/mod_http2.c +++ b/modules/http2/mod_http2.c @@ -53,7 +53,10 @@ AP_DECLARE_MODULE(http2) = { h2_config_create_svr, /* func to create per server config */ h2_config_merge_svr, /* func to merge per server config */ h2_cmds, /* command handlers */ - h2_hooks + h2_hooks, +#if defined(AP_MODULE_FLAG_NONE) + AP_MODULE_FLAG_ALWAYS_MERGE +#endif }; static int h2_h2_fixups(request_rec *r); diff --git a/modules/http2/mod_proxy_http2.c b/modules/http2/mod_proxy_http2.c index 78781f27ea..92413090b6 100644 --- a/modules/http2/mod_proxy_http2.c +++ b/modules/http2/mod_proxy_http2.c @@ -38,7 +38,10 @@ AP_DECLARE_MODULE(proxy_http2) = { NULL, /* create per-server config structure */ NULL, /* merge per-server config structures */ NULL, /* command apr_table_t */ - register_hook /* register hooks */ + register_hook, /* register hooks */ +#if defined(AP_MODULE_FLAG_NONE) + AP_MODULE_FLAG_ALWAYS_MERGE +#endif }; /* Optional functions from mod_http2 */ -- 2.40.0