diff options
| author | Stefan Eissing <icing@apache.org> | 2016-11-13 22:30:40 +0100 |
|---|---|---|
| committer | Stefan Eissing <icing@apache.org> | 2016-11-13 22:30:40 +0100 |
| commit | d300afee341908cd90a78f48e362690ad3f3a8eb (patch) | |
| tree | c68c85f18da478735ff2ac16293182e00ab0f551 /modules/http2/mod_http2.c | |
| parent | Rebuild. (diff) | |
| download | apache2-d300afee341908cd90a78f48e362690ad3f3a8eb.tar.xz apache2-d300afee341908cd90a78f48e362690ad3f3a8eb.zip | |
mod_http2: H2PushResource directive for early pushing
mod_proxy_http2: Link header uris are reverse mapped
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1769550 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/http2/mod_http2.c')
| -rw-r--r-- | modules/http2/mod_http2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/http2/mod_http2.c b/modules/http2/mod_http2.c index 7452cd7c2b..e0a4b90883 100644 --- a/modules/http2/mod_http2.c +++ b/modules/http2/mod_http2.c @@ -48,9 +48,9 @@ static void h2_hooks(apr_pool_t *pool); AP_DECLARE_MODULE(http2) = { STANDARD20_MODULE_STUFF, h2_config_create_dir, /* func to create per dir config */ - h2_config_merge, + h2_config_merge_dir, /* func to merge per dir config */ h2_config_create_svr, /* func to create per server config */ - h2_config_merge, /* func to merge per server config */ + h2_config_merge_svr, /* func to merge per server config */ h2_cmds, /* command handlers */ h2_hooks }; |