You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2018/01/29 13:10:22 UTC
svn commit: r1822503 - in /httpd/httpd/trunk/modules/http2: mod_http2.c
mod_proxy_http2.c
Author: icing
Date: Mon Jan 29 13:10:22 2018
New Revision: 1822503
URL: http://svn.apache.org/viewvc?rev=1822503&view=rev
Log:
mod_http2/mod_proxy_http2: add new module flags
Modified:
httpd/httpd/trunk/modules/http2/mod_http2.c
httpd/httpd/trunk/modules/http2/mod_proxy_http2.c
Modified: httpd/httpd/trunk/modules/http2/mod_http2.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/mod_http2.c?rev=1822503&r1=1822502&r2=1822503&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/mod_http2.c (original)
+++ httpd/httpd/trunk/modules/http2/mod_http2.c Mon Jan 29 13:10:22 2018
@@ -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);
Modified: httpd/httpd/trunk/modules/http2/mod_proxy_http2.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/mod_proxy_http2.c?rev=1822503&r1=1822502&r2=1822503&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/mod_proxy_http2.c (original)
+++ httpd/httpd/trunk/modules/http2/mod_proxy_http2.c Mon Jan 29 13:10:22 2018
@@ -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 */