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: revert r1685052, r1685078 and r1685097.

Browse Source 
Will remove the deprecation message in a follow up commit.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1685777 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2015-06-16 11:53:13 +00:00
parent 52b90ac8e5
commit d631ce4fe4
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -8,9 +8,6 @@ Changes with Apache 2.5.0
using a pre-filled buffer, and log parsing failures at level INFO.
[Yann Ylavic, Jeff Trawick]
*) 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>]

15
modules/ssl/ssl_engine_config.c
View File

@@ -841,16 +841,11 @@ const char *ssl_cmd_SSLCertificateChainFile(cmd_parms *cmd,
SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
const char *err;
const char *once_key = "ssl_cmd_SSLCertificateChainFile";
if (!ap_retained_data_get(once_key)) {
ap_retained_data_create(once_key, sizeof(char));
ap_log_error(APLOG_MARK, APLOG_INFO|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);
}
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);
if ((err = ssl_cmd_check_file(cmd, &arg))) {
return err;