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

* Play safe in case we get no name

Browse Source 
Reverted by r1855742.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1855741 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ruediger Pluem
2019-03-18 09:16:06 +00:00
parent 807a365d91
commit 97752cb849
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
modules/ssl/mod_ssl.c
View File

@@ -491,6 +491,17 @@ static SSLConnRec *ssl_init_connection_ctx(conn_rec *c,
{
SSLConnRec *sslconn = myConnConfig(c);
/* Reinit dc in any case because it may be r->per_dir_config scoped
* and thus a caller like mod_proxy needs to update it per request.
*/
if (per_dir_config) {
sslconn->dc = ap_get_module_config(per_dir_config, &ssl_module);
}
else {
sslconn->dc = ap_get_module_config(c->base_server->lookup_defaults,
&ssl_module);
}
if (!sslconn) {
sslconn = apr_pcalloc(c->pool, sizeof(*sslconn));
@@ -508,17 +519,6 @@ static SSLConnRec *ssl_init_connection_ctx(conn_rec *c,
myConnConfigSet(c, sslconn);
}
/* Reinit dc in any case because it may be r->per_dir_config scoped
* and thus a caller like mod_proxy needs to update it per request.
*/
if (per_dir_config) {
sslconn->dc = ap_get_module_config(per_dir_config, &ssl_module);
}
else {
sslconn->dc = ap_get_module_config(c->base_server->lookup_defaults,
&ssl_module);
}
return sslconn;
}