]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1859371, r1859422 from trunk:
authorYann Ylavic <ylavic@apache.org>
Fri, 24 May 2019 07:59:42 +0000 (07:59 +0000)
committerYann Ylavic <ylavic@apache.org>
Fri, 24 May 2019 07:59:42 +0000 (07:59 +0000)
commit313d5ee40f390da1a6ee2c2752864ad3aad0a1c3
tree086b00d6e67870777f7c5c7a96d2324e74992266
parent7d272e2628b4ae05f68cdc74b070707250896a34
Merge r1859371, r1859422 from trunk:

mod_proxy/ssl: Proxy SSL client certificate
configuration and other proxy SSL configurations
broken inside <Proxy> context.
PR 63430
Triggered by r1855646+r1855748.
Patch from rpluem (proxy) and ylavic (ssl).

Follow up to r1859371: extend to other ap_proxy_connection_create[_ex]() users.

This function now now handles SSL reuse as well as the "proxy-request-hostname"
note (SNI), so let's also call it unconditionnaly in all proxy modules.

On the mod_ssl side, since this note has the lifetime of the connection, don't
reset/unset it during handshake (ssl_io_filter_handshake).

Submitted by: rjung, ylavic
Reviewed by: rjung, rpluem, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1859845 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
modules/http2/mod_proxy_http2.c
modules/proxy/mod_proxy_ftp.c
modules/proxy/mod_proxy_hcheck.c
modules/proxy/mod_proxy_http.c
modules/proxy/mod_proxy_uwsgi.c
modules/proxy/mod_proxy_wstunnel.c
modules/proxy/proxy_util.c
modules/ssl/mod_ssl.c
modules/ssl/ssl_engine_io.c