From: Kaspar Brand <kbrand@apache.org>
Date: Sun, 26 Apr 2015 06:43:26 +0000 (+0000)
Subject: consistently output SSLCertificateChainFile deprecation warnings
X-Git-Tag: 2.5.0-alpha~3214
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=700ffbf9bf602dbeb41e6ef114e699cc5be1a9e2;p=apache

consistently output SSLCertificateChainFile deprecation warnings

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

diff --git a/CHANGES b/CHANGES
index 72b2589762..77f3f103be 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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]
diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
index b19103cf6b..7eb62d1ffe 100644
--- a/modules/ssl/ssl_engine_config.c
+++ b/modules/ssl/ssl_engine_config.c
@@ -840,7 +840,7 @@ 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, 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",