diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-02 19:25:45 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-02 19:25:45 +0000 |
| commit | 911f58e47d84776cef0039afa61bd4d34f8b53c9 (patch) | |
| tree | 1d67535f427868910ffbd33c8eca8b0d1a648141 /net/socket | |
| parent | 3080922ff33ec0d3af89cfb6d2aebe48d3d76ee2 (diff) | |
| download | chromium_src-911f58e47d84776cef0039afa61bd4d34f8b53c9.zip chromium_src-911f58e47d84776cef0039afa61bd4d34f8b53c9.tar.gz chromium_src-911f58e47d84776cef0039afa61bd4d34f8b53c9.tar.bz2 | |
net: disable SSL compression
This change also updates the page-info dialog to assume that compression isn't
used. It doesn't, however, remove the message from the .grd file in order to
make this change easier to merge.
BUG=139744
Review URL: https://chromiumcodereview.appspot.com/10823111
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149672 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index 46facf1..21089d5 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -3125,17 +3125,6 @@ int SSLClientSocketNSS::InitializeSSLOptions() { #error "You need to install NSS-3.12 or later to build chromium" #endif -#ifdef SSL_ENABLE_DEFLATE - // Some web servers have been found to break if TLS is used *or* if DEFLATE - // is advertised. Thus, if TLS is disabled (probably because we are doing - // SSLv3 fallback), we disable DEFLATE also. - // See http://crbug.com/31628 - rv = SSL_OptionSet(nss_fd_, SSL_ENABLE_DEFLATE, - ssl_config_.version_max >= SSL_PROTOCOL_VERSION_TLS1); - if (rv != SECSuccess) - LogFailedNSSFunction(net_log_, "SSL_OptionSet", "SSL_ENABLE_DEFLATE"); -#endif - #ifdef SSL_ENABLE_FALSE_START rv = SSL_OptionSet(nss_fd_, SSL_ENABLE_FALSE_START, ssl_config_.false_start_enabled); |