]> granicus.if.org Git - apache/commit
Merge of r1764236 from trunk:
authorStefan Eissing <icing@apache.org>
Tue, 11 Oct 2016 13:40:08 +0000 (13:40 +0000)
committerStefan Eissing <icing@apache.org>
Tue, 11 Oct 2016 13:40:08 +0000 (13:40 +0000)
commit65087717a8bac221fd53f2635dfdd8afa7e10b2a
tree43738c835551c593cf23edba8c26630eee9b5bbb
parent30da4e4dd2ab3ca7d7ee43a4f85f5d39d110c921
Merge of r1764236 from trunk:

mod_proxy_http2: renaming duplicate symbol clash between h2_proxy_util and h2_util externals

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1764238 13f79535-47bb-0310-9956-ffa450edef68
17 files changed:
CHANGES
modules/http2/NWGNUmod_http2
modules/http2/h2_mplx.c
modules/http2/h2_proxy_session.c
modules/http2/h2_proxy_session.h
modules/http2/h2_proxy_util.c
modules/http2/h2_proxy_util.h
modules/http2/h2_push.c
modules/http2/h2_push.h
modules/http2/h2_request.c
modules/http2/h2_session.c
modules/http2/h2_stream.c
modules/http2/h2_task.c
modules/http2/h2_util.c
modules/http2/h2_version.h
modules/http2/mod_http2.c
modules/http2/mod_proxy_http2.c