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

On the trunk:

Browse Source 
mod_ssl: properly initializing server for fallback certificates provided by mod_md.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1808122 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Eissing
2017-09-12 14:27:47 +00:00
parent d48124c316
commit 162fa860dc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/ssl/ssl_engine_init.c
View File

@@ -1737,11 +1737,12 @@ static apr_status_t ssl_init_server_ctx(server_rec *s,
}
if (key_file && cert_file) {
ap_log_error(APLOG_MARK, APLOG_TRACE1, 0, s,
"%s: installing key=%s, cert=%s, chain=%s",
ssl_util_vhostid(p, s), key_file, cert_file, chain_file);
APR_ARRAY_PUSH(pks->key_files, const char *) = key_file;
APR_ARRAY_PUSH(pks->cert_files, const char *) = cert_file;
if (chain_file) {
sc->server->cert_chain = chain_file;
}
sc->server->cert_chain = chain_file;
}
if (APR_STATUS_IS_EAGAIN(rv)) {
@@ -1751,7 +1752,6 @@ static apr_status_t ssl_init_server_ctx(server_rec *s,
"host is part of a Managed Domain, but no SSL certificate is "
"available (yet).", ssl_util_vhostid(p, s));
pks->service_unavailable = 1;
return APR_SUCCESS;
}
else if (rv != APR_SUCCESS) {
return rv;