Merge r1685779 from trunk:

mod_ssl: Remove deprecated SSLCertificateChainFile warning.
Submitted by: ylavic
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685870 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index e9a498add728afc17b2a3e6fc4bdccc0da2efc8e..d6f9cd51bd368063b513c52a03200c21cad63e78 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
 
 Changes with Apache 2.4.15
 
+  *) mod_ssl: Remove deprecated SSLCertificateChainFile warning.
+     [Yann Ylavic]
 
 Changes with Apache 2.4.14
 

diff --git a/STATUS b/STATUS
index 16058e4bf44da20ea6d3e9e4ce3ed6e2e4e14da3..77235b6d8e75529a2bf4feb342c3a28fcbae09ed 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -118,10 +118,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
 
-  *) mod_ssl: Remove deprecated SSLCertificateChainFile warning.
-     trunk patch: http://svn.apache.org/r1685779
-     2.4.x patch: trunk works (modulo CHANGES)
-     +1: ylavic, covener, wrowe
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:

diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
index 45f83b5cf097b93690a30fc472175f2839df7a3b..8e8e7618500a42487fbc71cf9bc8049a093b2190 100644 (file)
--- a/modules/ssl/ssl_engine_config.c
+++ b/modules/ssl/ssl_engine_config.c
@@ -862,12 +862,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;
     }