]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1572630, r1572611, r1572967, r1573229 from trunk:
authorYann Ylavic <ylavic@apache.org>
Fri, 18 Jul 2014 21:38:38 +0000 (21:38 +0000)
committerYann Ylavic <ylavic@apache.org>
Fri, 18 Jul 2014 21:38:38 +0000 (21:38 +0000)
commite20c8a2bba393c88d4b773c2ec9339940dbf4636
treef549e03a3c86e0b6c8869c80f6c6f7c1182d0411
parent45cda448e88f7d55f1661b5e69757b9c8db0bf38
Merge r1572630, r1572611, r1572967, r1573229 from trunk:

Redo what was reverted in r1572627.
Don't reuse a SSL backend connection whose SNI differs. PR 55782.
This may happen when ProxyPreserveHost is on and the proxy-worker
handles connections to different Hosts.

Follows up r1572606.
MMN minor bump required by proxy_conn_rec change.

mod_proxy: follows up r1572630.
Don't reuse a SSL backend connection with no SNI for a request requiring SNI.

mod_proxy: Add comment and avoid ternary operator as condition (no functional change).

Submitted by: ylavic
Reviewed by: ylavic, rpluem, wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1611813 13f79535-47bb-0310-9956-ffa450edef68
include/ap_mmn.h
modules/proxy/mod_proxy.h
modules/proxy/mod_proxy_http.c
modules/proxy/proxy_util.c