You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ig...@apache.org on 2011/07/21 01:53:26 UTC
svn commit: r1148983 - in /trafficserver/traffic/trunk:
iocore/net/SSLConfig.cc proxy/config/records.config.default.in
Author: igalic
Date: Wed Jul 20 23:53:25 2011
New Revision: 1148983
URL: http://svn.apache.org/viewvc?rev=1148983&view=rev
Log:
[TS-730] consistently use the *right* variable.
Modified:
trafficserver/traffic/trunk/iocore/net/SSLConfig.cc
trafficserver/traffic/trunk/proxy/config/records.config.default.in
Modified: trafficserver/traffic/trunk/iocore/net/SSLConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/SSLConfig.cc?rev=1148983&r1=1148982&r2=1148983&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/SSLConfig.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/SSLConfig.cc Wed Jul 20 23:53:25 2011
@@ -264,7 +264,7 @@ SslConfigParams::initialize()
if (!options)
ssl_ctx_options |= SSL_OP_NO_TLSv1;
#ifdef SSL_OP_CIPHER_SERVER_PREFERENCE
- IOCORE_ReadConfigInteger(options, "proxy.config.ssl.server.honor_cipher_suite");
+ IOCORE_ReadConfigInteger(options, "proxy.config.ssl.server.honor_cipher_order");
if (!options)
ssl_ctx_options |= SSL_OP_CIPHER_SERVER_PREFERENCE;
#endif
Modified: trafficserver/traffic/trunk/proxy/config/records.config.default.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/config/records.config.default.in?rev=1148983&r1=1148982&r2=1148983&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/config/records.config.default.in (original)
+++ trafficserver/traffic/trunk/proxy/config/records.config.default.in Wed Jul 20 23:53:25 2011
@@ -480,7 +480,7 @@ CONFIG proxy.config.ssl.TLSv1 INT 1
# selected (default) or the server selected
# Our default SSL Cipher Suite tries to be reasonably fast and strong.
CONFIG proxy.config.ssl.server.cipher_suite STRING RC4-SHA:AES128-SHA:DES-CBC3-SHA:AES256-SHA:ALL:!aNULL:!EXP:!LOW:!MD5:!SSLV2:!NULL
-CONFIG proxy.config.ssl.server.honor_cipher suite INT 0
+CONFIG proxy.config.ssl.server.honor_cipher_order INT 0
CONFIG proxy.config.ssl.server_port INT 443
# Client certification level should be:
# 0 no client certificates