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 72b2589762bec55cf538aff7daca565dec675bb4..77f3f103be3dbbdbc992e3833abb660e5fbfbde7 100644 (file)
--- 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 b19103cf6b640f7000c7b4420c6cb839165490d7..7eb62d1ffec1a206d92738a5560eeafb1781de83 100644 (file)
--- 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",