diff options
| author | Selim Gurun <sgurun@google.com> | 2012-08-30 12:40:10 -0700 |
|---|---|---|
| committer | Selim Gurun <sgurun@google.com> | 2012-08-30 13:17:29 -0700 |
| commit | de6c9f9aec5e2e7e66cb77140f7418fc29644ef0 (patch) | |
| tree | 7655ced956d451ac75497a16b236d0d8cc4a58fd | |
| parent | d86dab44ce64d82d56d745e7f21d0c8eb4250496 (diff) | |
| download | external_chromium-de6c9f9aec5e2e7e66cb77140f7418fc29644ef0.zip external_chromium-de6c9f9aec5e2e7e66cb77140f7418fc29644ef0.tar.gz external_chromium-de6c9f9aec5e2e7e66cb77140f7418fc29644ef0.tar.bz2 | |
Disable compression.
Bug: 7079965
Change-Id: I6d5ac7d90fc2298b5e8a92cfae1ffb840016b88b
| -rw-r--r-- | net/socket/ssl_client_socket_openssl.cc | 4 | ||||
| -rw-r--r-- | net/spdy/spdy_framer.cc | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc index 30a5f48..5668c8a 100644 --- a/net/socket/ssl_client_socket_openssl.cc +++ b/net/socket/ssl_client_socket_openssl.cc @@ -457,8 +457,12 @@ bool SSLClientSocketOpenSSL::Init() { #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 +#ifdef ANDROID + options.ConfigureFlag(SSL_OP_NO_COMPRESSION, true); +#else options.ConfigureFlag(SSL_OP_NO_COMPRESSION, !ssl_config_.tls1_enabled); #endif +#endif // TODO(joth): Set this conditionally, see http://crbug.com/55410 options.ConfigureFlag(SSL_OP_LEGACY_SERVER_CONNECT, true); diff --git a/net/spdy/spdy_framer.cc b/net/spdy/spdy_framer.cc index 878b199..5f645fc 100644 --- a/net/spdy/spdy_framer.cc +++ b/net/spdy/spdy_framer.cc @@ -27,7 +27,11 @@ namespace { // The following compression setting are based on Brian Olson's analysis. See // https://groups.google.com/group/spdy-dev/browse_thread/thread/dfaf498542fac792 // for more details. +#ifdef ANDROID +const int kCompressorLevel = 0; +#else const int kCompressorLevel = 9; +#endif const int kCompressorWindowSizeInBits = 11; const int kCompressorMemLevel = 1; |