]> granicus.if.org Git - apache/commit
Merge r1729826, r1729847, r1732986, r1733056 from trunk:
authorJim Jagielski <jim@apache.org>
Thu, 3 Mar 2016 15:09:32 +0000 (15:09 +0000)
committerJim Jagielski <jim@apache.org>
Thu, 3 Mar 2016 15:09:32 +0000 (15:09 +0000)
commit4151e6d215cb4e92a05055c79f74826ab754251f
tree6ece0e754d3c37117960cc8b10c0b55375bc18bc
parent9ea9f2bf99ad2468c614c876031a6c7fb3c1ef98
Merge r1729826, r1729847, r1732986, r1733056 from trunk:

mod_proxy: Play/restore the TLS-SNI on new backend connections which
had to be issued because the remote closed the previous/reusable one
during idle (keep-alive) time.

mod_proxy: follow up to r1729826: really copy conn->ssl_hostname.

mod_proxy: follow up to r1729826 + r1729847.
Adjust stacked ssl_hostname maximum size.

mod_proxy: follow up to r1729826 + r1729847 + r1732986.
Don't use magic constants.
Submitted by: ylavic
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1733474 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
STATUS
modules/proxy/mod_proxy.h
modules/proxy/proxy_util.c