From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 18 Sep 2015 14:31:48 +0000 (+0000)
Subject: mod_ssl: update the current handshake server once a full regenegotation
X-Git-Tag: 2.5.0-alpha~2828
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=357b2a9973aa9fb804a8b8e2ddb14e54e54444a8;p=thirdparty%2Fapache%2Fhttpd.git

mod_ssl: update the current handshake server once a full regenegotation
succeeds, it is the new reference for further renegotiation or SNI check.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1703871 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c
index 83bfb73f1cc..7352397b045 100644
--- a/modules/ssl/ssl_engine_kernel.c
+++ b/modules/ssl/ssl_engine_kernel.c
@@ -850,6 +850,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;
         }
 
         /*