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

SSLProtocol: allow explicit control of TLSv1.1 and TLSv1.2 flavors when

compiled against OpenSSL 1.0.1 or later. Update documentation.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1222921 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Kaspar Brand
2011-12-24 06:40:10 +00:00
parent 9900465205
commit 1af61dfb2e
5 changed files with 70 additions and 9 deletions

View File

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