| Index: net/socket/ssl_client_socket_nss.cc
|
| diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
|
| index 9d0eea2a070398024e9dd5e34283ce1e2971e930..624ed307832da41f74c116cc15acec729eaf4a7e 100644
|
| --- a/net/socket/ssl_client_socket_nss.cc
|
| +++ b/net/socket/ssl_client_socket_nss.cc
|
| @@ -3109,17 +3109,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);
|
|
|