]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1705749 from trunk:
authorJim Jagielski <jim@apache.org>
Mon, 28 Sep 2015 19:30:00 +0000 (19:30 +0000)
committerJim Jagielski <jim@apache.org>
Mon, 28 Sep 2015 19:30:00 +0000 (19:30 +0000)
commitf2ce5d4ab53a2a0da7f79b4a25469ac96900ecb0
tree00d24a549de3efa0f4fa5209278a758608e7f498
parent4ba79718ef48a57188d9ef9e14126e9d9485cdf0
Merge r1705749 from trunk:

bye bye mod_h2, hello mod_http2

Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705751 13f79535-47bb-0310-9956-ffa450edef68
56 files changed:
build/installwinconf.awk
docs/manual/convenience.map
docs/manual/mod/allmodules.xml
docs/manual/mod/allmodules.xml.de
docs/manual/mod/allmodules.xml.es
docs/manual/mod/allmodules.xml.fr
docs/manual/mod/allmodules.xml.ja
docs/manual/mod/allmodules.xml.ko
docs/manual/mod/allmodules.xml.tr
docs/manual/mod/allmodules.xml.zh-cn
docs/manual/mod/directives.html.de
docs/manual/mod/directives.html.en
docs/manual/mod/directives.html.es
docs/manual/mod/directives.html.fr
docs/manual/mod/directives.html.ja.utf8
docs/manual/mod/directives.html.ko.euc-kr
docs/manual/mod/directives.html.tr.utf8
docs/manual/mod/directives.html.zh-cn.utf8
docs/manual/mod/index.html.de
docs/manual/mod/index.html.en
docs/manual/mod/index.html.es
docs/manual/mod/index.html.fr
docs/manual/mod/index.html.ja.utf8
docs/manual/mod/index.html.ko.euc-kr
docs/manual/mod/index.html.tr.utf8
docs/manual/mod/index.html.zh-cn.utf8
docs/manual/mod/mod_http2.html [moved from docs/manual/mod/mod_h2.html with 81% similarity]
docs/manual/mod/mod_http2.html.en [new file with mode: 0644]
docs/manual/mod/mod_http2.xml [new file with mode: 0644]
docs/manual/mod/mod_http2.xml.meta [moved from docs/manual/mod/mod_h2.xml.meta with 73% similarity]
docs/manual/mod/quickreference.html.de
docs/manual/mod/quickreference.html.en
docs/manual/mod/quickreference.html.es
docs/manual/mod/quickreference.html.ja.utf8
docs/manual/mod/quickreference.html.ko.euc-kr
docs/manual/mod/quickreference.html.tr.utf8
docs/manual/mod/quickreference.html.zh-cn.utf8
docs/manual/sitemap.html.de
docs/manual/sitemap.html.en
docs/manual/sitemap.html.es
docs/manual/sitemap.html.fr
docs/manual/sitemap.html.ja.utf8
docs/manual/sitemap.html.ko.euc-kr
docs/manual/sitemap.html.tr.utf8
docs/manual/sitemap.html.zh-cn.utf8
modules/NWGNUmakefile
modules/http2/NWGNUmakefile
modules/http2/README.h2
modules/http2/config.m4
modules/http2/h2_config.c
modules/http2/h2_ctx.c
modules/http2/h2_private.h
modules/http2/h2_version.h
modules/http2/mod_http2.c [moved from modules/http2/mod_h2.c with 96% similarity]
modules/http2/mod_http2.dsp [moved from modules/http2/mod_h2.dsp with 77% similarity]
os/win32/BaseAddr.ref