summaryrefslogtreecommitdiff
path: root/modules/http2/mod_proxy_http2.c
diff options
context:
space:
mode:
authorStefan Eissing <icing@apache.org>2018-01-29 13:10:22 +0000
committerStefan Eissing <icing@apache.org>2018-01-29 13:10:22 +0000
commit4f9b578980b5db22a8a418765ddcbf98bf191d97 (patch)
treec4b0b47939fb906da7e89c56cb19119789f511cb /modules/http2/mod_proxy_http2.c
parent41515d4f0958a23d4a925ac4bf0329454f9ede1f (diff)
downloadhttpd-4f9b578980b5db22a8a418765ddcbf98bf191d97.tar.gz
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
Diffstat (limited to 'modules/http2/mod_proxy_http2.c')
-rw-r--r--modules/http2/mod_proxy_http2.c5
1 files changed, 4 insertions, 1 deletions
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 */