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

mod_ssl: follow up to r1809302.

Browse Source 
Make use of AP_MODULE_FLAG_ALWAYS_MERGE.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1809303 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2017-09-22 11:59:57 +00:00
parent e18300e525
commit a40e705b5e
2 changed files with 3 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/ssl/mod_ssl.c
View File

@@ -838,4 +838,7 @@ module AP_MODULE_DECLARE_DATA ssl_module = {
ssl_config_server_merge, /* merge per-server config structures */ ssl_config_server_merge, /* merge per-server config structures */
ssl_config_cmds, /* table of configuration directives */ ssl_config_cmds, /* table of configuration directives */
ssl_register_hooks /* register hooks */ ssl_register_hooks /* register hooks */
#if AP_MODULE_HAS_FLAGS
,AP_MODULE_FLAG_ALWAYS_MERGE /* flags */
#endif
}; };

25
modules/ssl/ssl_engine_init.c
View File

@@ -189,25 +189,6 @@ int ssl_is_challenge(conn_rec *c, const char *servername,
return 0; return 0;
} }
static SSLSrvConfigRec *ssl_config_server_uniq(apr_pool_t *p, server_rec *s,
server_rec *base_s)
{
SSLSrvConfigRec *sc, *base_sc, *nsc;
sc = mySrvConfig(s);
if (s != base_s) {
base_sc = mySrvConfig(base_s);
if (sc == base_sc) {
/* Give s its own SSLSrvConfigRec instance by using the
* standard create/merge methods. */
nsc = ssl_config_server_create(p, s);
sc = ssl_config_server_merge(p, base_sc, nsc);
ap_set_module_config(s->module_config, &ssl_module, sc);
}
}
return sc;
}
/* /*
* Per-module initialization * Per-module initialization
*/ */
@@ -258,12 +239,6 @@ apr_status_t ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,
md_get_certificate = NULL; md_get_certificate = NULL;
} }
/* Take care that we have individual config records before
* we start modifying them. */
for (s = base_server->next; s; s = s->next) {
sc = ssl_config_server_uniq(p, s, base_server);
}
/* /*
* try to fix the configuration and open the dedicated SSL * try to fix the configuration and open the dedicated SSL
* logfile as early as possible * logfile as early as possible