From 21fc28be12302cdbc5a7c10f7ba00fc2aaaa1877 Mon Sep 17 00:00:00 2001 From: Kaspar Brand Date: Sun, 12 Feb 2012 12:46:14 +0000 Subject: [PATCH] merge r1243246 from trunk: Fix regression introduced in r1222917: in ssl_find_vhost(), we must use the *new* SSL_CTX settings for the SSL_set_options/SSL_set_verify calls. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1243247 13f79535-47bb-0310-9956-ffa450edef68 --- modules/ssl/ssl_engine_kernel.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c index df4a146724..8d1aad812e 100644 --- a/modules/ssl/ssl_engine_kernel.c +++ b/modules/ssl/ssl_engine_kernel.c @@ -2037,8 +2037,7 @@ static int ssl_find_vhost(void *servername, conn_rec *c, server_rec *s) sslcon = myConnConfig(c); if (found && (ssl = sslcon->ssl) && (sc = mySrvConfig(s))) { - SSL_CTX *ctx = SSL_get_SSL_CTX(ssl); - SSL_set_SSL_CTX(ssl, sc->server->ssl_ctx); + SSL_CTX *ctx = SSL_set_SSL_CTX(ssl, sc->server->ssl_ctx); /* * SSL_set_SSL_CTX() only deals with the server cert, * so we need to duplicate a few additional settings -- 2.40.0