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 2011/12/30 11:39:01 UTC
svn commit: r1225791 - /httpd/httpd/trunk/modules/ssl/mod_ssl.c
Author: kbrand
Date: Fri Dec 30 10:39:00 2011
New Revision: 1225791
URL: http://svn.apache.org/viewvc?rev=1225791&view=rev
Log:
Fix another case of #ifdef-within-a-macro (which was inadvertently
introduced a few days ago).
Modified:
httpd/httpd/trunk/modules/ssl/mod_ssl.c
Modified: httpd/httpd/trunk/modules/ssl/mod_ssl.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/mod_ssl.c?rev=1225791&r1=1225790&r2=1225791&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/mod_ssl.c (original)
+++ httpd/httpd/trunk/modules/ssl/mod_ssl.c Fri Dec 30 10:39:00 2011
@@ -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)")