summaryrefslogtreecommitdiffstats
path: root/net/socket
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-03 22:35:13 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-03 22:35:13 +0000
commitd0f00492e87aad82b786425f48cdee4c18aff0df (patch)
treeb2e80592fa0cb925d7b01533182f7ab7fa2a3f7f /net/socket
parent8b07d4f6dfc0b561d3d430f94cbc71f847482295 (diff)
downloadchromium_src-d0f00492e87aad82b786425f48cdee4c18aff0df.zip
chromium_src-d0f00492e87aad82b786425f48cdee4c18aff0df.tar.gz
chromium_src-d0f00492e87aad82b786425f48cdee4c18aff0df.tar.bz2
net: disable TLS compression with OpenSSL.
BUG=139744 Review URL: https://chromiumcodereview.appspot.com/10825183 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149947 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
-rw-r--r--net/socket/ssl_client_socket_openssl.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc
index 8bdbfd1..d03e093 100644
--- a/net/socket/ssl_client_socket_openssl.cc
+++ b/net/socket/ssl_client_socket_openssl.cc
@@ -490,10 +490,7 @@ bool SSLClientSocketOpenSSL::Init() {
#endif
#if defined(SSL_OP_NO_COMPRESSION)
- // If TLS was disabled also disable compression, to provide maximum site
- // compatibility in the case of protocol fallback. See http://crbug.com/31628
- options.ConfigureFlag(SSL_OP_NO_COMPRESSION,
- ssl_config_.version_max < SSL_PROTOCOL_VERSION_TLS1);
+ options.ConfigureFlag(SSL_OP_NO_COMPRESSION, true);
#endif
// TODO(joth): Set this conditionally, see http://crbug.com/55410