www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Fix another case of #ifdef-within-a-macro (which was inadvertently

Browse Source 
introduced a few days ago).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1225791 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Kaspar Brand
2011-12-30 10:39:00 +00:00
parent 2e6a62f550
commit a30532d2a7
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/ssl/mod_ssl.c
View File

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