From: Christophe Jaillet <jailletc36@apache.org>
Date: Thu, 5 Sep 2013 22:30:59 +0000 (+0000)
Subject: Add a warning if protocol given in SSLProtocol  or SSLProxyProtocol will override... 
X-Git-Tag: 2.5.0-alpha~5101
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b663bd4a01f5b67a46d18dac67d71b90576d3914;p=apache

Add a warning if protocol given in SSLProtocol  or SSLProxyProtocol will override other parameters given in the same directive.
This could be a missing + or - prefix.

PR 52820

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

diff --git a/docs/log-message-tags/next-number b/docs/log-message-tags/next-number
index 4aabc755bc..96633c95e7 100644
--- a/docs/log-message-tags/next-number
+++ b/docs/log-message-tags/next-number
@@ -1 +1 @@
-2532
+2533
diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
index 296752ad65..5b973c783b 100644
--- a/modules/ssl/ssl_engine_config.c
+++ b/modules/ssl/ssl_engine_config.c
@@ -1352,6 +1352,13 @@ static const char *ssl_cmd_protocol_parse(cmd_parms *parms,
             *options |= thisopt;
         }
         else {
+            if (*options != SSL_PROTOCOL_NONE)
+            {
+                ap_log_error(APLOG_MARK, APLOG_WARNING, 0, parms->server, APLOGNO(02532)
+                             "Protocol '%s' of directive '%s' overrides already set parameters. "
+                             "Check if a prefix is not missing.",
+                             w, parms->cmd->name);
+            }
             *options = thisopt;
         }
     }