Commit f961493d authored by Kaspar Brand's avatar Kaspar Brand
Browse files

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/trunk@1243246 13f79535-47bb-0310-9956-ffa450edef68
parent 95f67891

modules/ssl/ssl_engine_kernel.c

+1 −2
Original line number Diff line number Diff line
@@ -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