From: Kaspar Brand <kbrand@apache.org>
Date: Fri, 30 Dec 2011 10:42:16 +0000 (+0000)
Subject: merge r1225791 from trunk:
X-Git-Tag: 2.4.0~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fcd53efbefe243713aff9fe37e5dbb5e7a69f951;p=apache

merge r1225791 from trunk:

Fix another case of #ifdef-within-a-macro (which was inadvertently
introduced a few days ago).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1225792 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
index 0140b6182d..fe7aeae5f7 100644
--- a/modules/ssl/mod_ssl.c
+++ b/modules/ssl/mod_ssl.c
@@ -128,13 +128,14 @@ static const command_rec ssl_config_cmds[] = {
     SSL_CMD_SRV(SessionCacheTimeout, TAKE1,
                 "SSL Session Cache object lifetime "
                 "('N' - number of seconds)")
-    SSL_CMD_SRV(Protocol, RAW_ARGS,
-                "Enable or disable various SSL protocols"
 #ifdef HAVE_TLSV1_X
-                "('[+-][SSLv3|TLSv1|TLSv1.1|TLSv1.2] ...' - see manual)")
+#define SSL_PROTOCOLS "SSLv3|TLSv1|TLSv1.1|TLSv1.2"
 #else
-                "('[+-][SSLv3|TLSv1] ...' - see manual)")
+#define SSL_PROTOCOLS "SSLv3|TLSv1"
 #endif
+    SSL_CMD_SRV(Protocol, RAW_ARGS,
+                "Enable or disable various SSL protocols "
+                "('[+-][" SSL_PROTOCOLS "] ...' - see manual)")
     SSL_CMD_SRV(HonorCipherOrder, FLAG,
                 "Use the server's cipher ordering preference")
     SSL_CMD_SRV(InsecureRenegotiation, FLAG,
@@ -152,11 +153,7 @@ static const command_rec ssl_config_cmds[] = {
                 "('on', 'off')")
     SSL_CMD_SRV(ProxyProtocol, RAW_ARGS,
                "SSL Proxy: enable or disable SSL protocol flavors "
-#ifdef HAVE_TLSV1_X
-                "('[+-][SSLv3|TLSv1|TLSv1.1|TLSv1.2] ...' - see manual)")
-#else
-                "('[+-][SSLv3|TLSv1] ...' - see manual)")
-#endif
+                "('[+-][" SSL_PROTOCOLS "] ...' - see manual)")
     SSL_CMD_SRV(ProxyCipherSuite, TAKE1,
                "SSL Proxy: colon-delimited list of permitted SSL ciphers "
                "('XXX:...:XXX' - see manual)")