From 26848f7a23fc2e4d446ab8fc5a2f8af8b7674775 Mon Sep 17 00:00:00 2001 From: Ruediger Pluem Date: Fri, 24 Oct 2014 19:00:10 +0000 Subject: [PATCH] * Use the correct server name for SNI in case the backend SSL connection itself is established via a proxy server. PR: 57139 Submitted by: Szabolcs Gyurko git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1634120 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 4 ++++ modules/proxy/proxy_util.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/CHANGES b/CHANGES index 30e58e1fa9..1af338b61d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,10 @@ -*- coding: utf-8 -*- Changes with Apache 2.5.0 + *) mod_proxy: Use the correct server name for SNI in case the backend + SSL connection itself is established via a proxy server. + PR 57139 [Szabolcs Gyurko ] + *) mod_ssl: Do not crash when looking up SSL related variables during expression evaluation on non SSL connections. PR 57070 [Ruediger Pluem] diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index da4c0ef23d..2ffebf80d5 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -2429,6 +2429,10 @@ ap_proxy_determine_connection(apr_pool_t *p, request_rec *r, if (dconf->preserve_host) { ssl_hostname = r->hostname; } + else if (conn->forward + && ((forward_info *)(conn->forward))->use_http_connect) { + ssl_hostname = ((forward_info *)conn->forward)->target_host; + } else { ssl_hostname = conn->hostname; } -- 2.40.0