www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Fix regression introduced in r1222917: in ssl_find_vhost(), we must use

Browse Source 
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
This commit is contained in:
Kaspar Brand
2012-02-12 12:44:16 +00:00
parent 0415804814
commit 4060b48fcb
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/ssl/ssl_engine_kernel.c
View File

@@ -2037,8 +2037,7 @@ static int ssl_find_vhost(void *servername, conn_rec *c, server_rec *s)
sslcon = myConnConfig(c); sslcon = myConnConfig(c);
if (found && (ssl = sslcon->ssl) && if (found && (ssl = sslcon->ssl) &&
(sc = mySrvConfig(s))) { (sc = mySrvConfig(s))) {
SSL_CTX *ctx = SSL_get_SSL_CTX(ssl); SSL_CTX *ctx = SSL_set_SSL_CTX(ssl, sc->server->ssl_ctx);
SSL_set_SSL_CTX(ssl, sc->server->ssl_ctx);
/* /*
* SSL_set_SSL_CTX() only deals with the server cert, * SSL_set_SSL_CTX() only deals with the server cert,
* so we need to duplicate a few additional settings * so we need to duplicate a few additional settings