You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by kb...@apache.org on 2015/04/26 08:43:26 UTC

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

Author: kbrand
Date: Sun Apr 26 06:43:26 2015
New Revision: 1676085

URL: http://svn.apache.org/r1676085
Log:
consistently output SSLCertificateChainFile deprecation warnings

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=1676085&r1=1676084&r2=1676085&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sun Apr 26 06:43:26 2015
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_ssl: make sure to consistently output SSLCertificateChainFile
+     deprecation warnings, when encountered in a VirtualHost block.
+     [Falco Schwarz <hiding falco.me>]
+
   *) Allow FallbackResource to work when a directory is requested and
      there is no autoindex nor DirectoryIndex. PR56067.
      [Jack <tjerk.meesters gmail.com>, Eric Covener]

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=1676085&r1=1676084&r2=1676085&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_config.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_config.c Sun Apr 26 06:43:26 2015
@@ -840,7 +840,7 @@ const char *ssl_cmd_SSLCertificateChainF
     SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
     const char *err;
 
-    ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_STARTUP, 0, cmd->server,
+    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",