From: Stefan Eissing <icing@apache.org>
Date: Sat, 19 Sep 2015 11:52:56 +0000 (+0000)
Subject: merged 1703871 by Yann for SNI misdirect handling
X-Git-Tag: 2.4.17~79^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5ed342026a9f56d76d7f4ca19664b70d60c80a4;p=thirdparty%2Fapache%2Fhttpd.git

merged 1703871 by Yann for SNI misdirect handling

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1703994 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c
index 73f904c50d2..aef6b465350 100644
--- a/modules/ssl/ssl_engine_kernel.c
+++ b/modules/ssl/ssl_engine_kernel.c
@@ -845,6 +845,11 @@ int ssl_hook_Access(request_rec *r)
                 r->connection->keepalive = AP_CONN_CLOSE;
                 return HTTP_FORBIDDEN;
             }
+
+            /* Full renegotiation successfull, we now have handshaken with
+             * this server's parameters.
+             */
+            sslconn->server = r->server;
         }
 
         /*