From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 16 Jun 2015 11:58:47 +0000 (+0000)
Subject: mod_ssl: Remove deprecated SSLCertificateChainFile warning.
X-Git-Tag: 2.5.0-alpha~3071
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8bec5a1513979b7bde1b8094c9f87f353b336bed;p=apache

mod_ssl: Remove deprecated SSLCertificateChainFile warning.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1685779 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index c8902fa718..c074703184 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_ssl: Remove deprecated SSLCertificateChainFile warning.
+     [Yann Ylavic]
+
   *) mod_ldap: Stop leaking LDAP connections when 'LDAPConnectionPoolTTL 0' 
      is configured.  PR 58037.  [Ted Phelps <phelps gnusto.com>]
 
diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
index f85a8a0fb9..8e84fa4131 100644
--- a/modules/ssl/ssl_engine_config.c
+++ b/modules/ssl/ssl_engine_config.c
@@ -841,12 +841,6 @@ const char *ssl_cmd_SSLCertificateChainFile(cmd_parms *cmd,
     SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
     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);
-
     if ((err = ssl_cmd_check_file(cmd, &arg))) {
         return err;
     }