You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2015/06/16 13:58:48 UTC

svn commit: r1685779 - in /httpd/httpd/trunk: CHANGES modules/ssl/ssl_engine_config.c

Author: ylavic
Date: Tue Jun 16 11:58:47 2015
New Revision: 1685779

URL: http://svn.apache.org/r1685779
Log:
mod_ssl: Remove deprecated SSLCertificateChainFile warning.

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/ssl/ssl_engine_config.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1685779&r1=1685778&r2=1685779&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Tue Jun 16 11:58:47 2015
@@ -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>]
 

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_config.c?rev=1685779&r1=1685778&r2=1685779&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_config.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_config.c Tue Jun 16 11:58:47 2015
@@ -841,12 +841,6 @@ const char *ssl_cmd_SSLCertificateChainF
     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;
     }