www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity

mod_ssl: Warn about deprecated SSLCertificateChainFile once at startup,

Browse Source 
on first usage only.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1685052 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2015-06-12 09:07:34 +00:00
parent a691e368a3
commit 488f6e0459
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.5.0
*) mod_ssl: Warn about deprecated SSLCertificateChainFile once at startup,
on first usage only. [Yann Ylavic]
*) mod_substitute: Fix configuraton merge order.
PR 57641 [<Marc.Stern approach.be>]

19
modules/ssl/ssl_engine_config.c
View File

@@ -839,13 +839,22 @@ const char *ssl_cmd_SSLCertificateChainFile(cmd_parms *cmd,
const char *arg)
{
SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
void *once = NULL;
const char *err;
ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_STARTUP, 0, NULL,
APLOGNO(02559)
"The SSLCertificateChainFile directive (%s:%d) is deprecated, "
"SSLCertificateFile should be used instead",
cmd->directive->filename, cmd->directive->line_num);
apr_pool_userdata_get(&once, "ssl_cmd_SSLCertificateChainFile",
ap_pglobal);
if (!once) {
ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_STARTUP, 0, NULL,
APLOGNO(02559)
"The SSLCertificateChainFile directive (%s:%d) is "
"deprecated, SSLCertificateFile should be used instead",
cmd->directive->filename, cmd->directive->line_num);
apr_pool_userdata_set("ssl_cmd_SSLCertificateChainFile",
apr_pstrdup(ap_pglobal, "1"), NULL,
ap_pglobal);
}
if ((err = ssl_cmd_check_file(cmd, &arg))) {
return err;