]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge from trunk:
authorStefan Eissing <icing@apache.org>
Tue, 29 Aug 2023 07:23:10 +0000 (07:23 +0000)
committerStefan Eissing <icing@apache.org>
Tue, 29 Aug 2023 07:23:10 +0000 (07:23 +0000)
commit0d1d79b0205ec46acd33788a5b81bf182627e260
tree375cccda3de04aff5e80f9c6dab0874154397871
parent5dbf3a89594e1264fd43d25c43eba7670eca81df
Merge from trunk:

  *) mod_http2: added support for bootstrapping WebSockets via HTTP/2, as
     described in RFC 8441. A new directive 'H2WebSockets on|off' has been
     added. The feature is by default not enabled.
     As also discussed in the manual, this feature should work for setups
     using "ProxyPass backend-url upgrade=websocket" without further changes.
     Special server modules for WebSockets will have to be adapted,
     most likely, as the handling if IO events is different with HTTP/2.
     HTTP/2 WebSockets are supported on platforms with native pipes. This
     excludes Windows.
     New directive `H2ProxyRequests on|off` to enable handling
     of HTTP/2 requests in a forward proxy configuration.
     General forward proxying is enabled via `ProxyRequests`. If the
     HTTP/2 protocol is also enabled for such a server/host, this new
     directive is needed in addition.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911979 13f79535-47bb-0310-9956-ffa450edef68
52 files changed:
.github/workflows/linux.yml
CMakeLists.txt
changes-entries/h2_proxyrequests.txt [new file with mode: 0644]
changes-entries/h2_websockets.txt [new file with mode: 0644]
configure.in
docs/manual/mod/mod_http2.xml
include/ap_mmn.h
include/http_core.h
modules/http2/config2.m4
modules/http2/h2.h
modules/http2/h2_bucket_beam.c
modules/http2/h2_bucket_beam.h
modules/http2/h2_c1_io.c
modules/http2/h2_c2.c
modules/http2/h2_c2_filter.c
modules/http2/h2_config.c
modules/http2/h2_config.h
modules/http2/h2_conn_ctx.h
modules/http2/h2_mplx.c
modules/http2/h2_push.c
modules/http2/h2_request.c
modules/http2/h2_session.c
modules/http2/h2_stream.c
modules/http2/h2_util.c
modules/http2/h2_version.h
modules/http2/h2_ws.c [new file with mode: 0644]
modules/http2/h2_ws.h [new file with mode: 0644]
modules/http2/mod_http2.c
modules/http2/mod_http2.dsp
modules/http2/mod_http2.h
modules/http2/mod_proxy_http2.c
modules/proxy/proxy_util.c
server/core.c
test/clients/.gitignore [new file with mode: 0644]
test/clients/Makefile.in [new file with mode: 0644]
test/clients/h2ws.c [new file with mode: 0644]
test/modules/http2/test_003_get.py
test/modules/http2/test_008_ranges.py
test/modules/http2/test_009_timing.py
test/modules/http2/test_401_early_hints.py
test/modules/http2/test_500_proxy.py
test/modules/http2/test_503_proxy_fwd.py [new file with mode: 0644]
test/modules/http2/test_600_h2proxy.py
test/modules/http2/test_601_h2proxy_twisted.py
test/modules/http2/test_712_buffering.py
test/modules/http2/test_800_websockets.py [new file with mode: 0644]
test/modules/http2/ws_server.py [new file with mode: 0644]
test/pyhttpd/config.ini.in
test/pyhttpd/curl.py
test/pyhttpd/env.py
test/pyhttpd/ws_util.py [new file with mode: 0644]
test/travis_run_linux.sh