From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 16 Jun 2015 11:53:13 +0000 (+0000)
Subject: mod_ssl: revert r1685052, r1685078 and r1685097.
X-Git-Tag: 2.5.0-alpha~3072
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d631ce4fe485a77e79214520fddd56bacbd7458e;p=apache

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

diff --git a/CHANGES b/CHANGES
index d178390318..c8902fa718 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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>]
 
diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
index 569922651a..f85a8a0fb9 100644
--- a/modules/ssl/ssl_engine_config.c
+++ b/modules/ssl/ssl_engine_config.c
@@ -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;