diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-11-18 14:51:59 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-11-18 14:51:59 -0800 |
| commit | 4ec08dd85e9e4584f1bb0cd6110590f367d8b258 (patch) | |
| tree | d76c7a2dc7d79fc7d52a93a907fd56c830d3cf84 /net | |
| parent | 5fbe95affc8eeed93c678b1d271f64dcc4dd919b (diff) | |
| parent | db1b8993439cc1b0f741735e15d72a8cd67a6752 (diff) | |
| download | external_chromium-4ec08dd85e9e4584f1bb0cd6110590f367d8b258.zip external_chromium-4ec08dd85e9e4584f1bb0cd6110590f367d8b258.tar.gz external_chromium-4ec08dd85e9e4584f1bb0cd6110590f367d8b258.tar.bz2 | |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/chromium into mr1-staging
Diffstat (limited to 'net')
| -rw-r--r-- | net/disk_cache/backend_impl.cc | 8 | ||||
| -rw-r--r-- | net/http/http_auth_handler_ntlm_portable.cc | 6 | ||||
| -rw-r--r-- | net/socket/ssl_client_socket_openssl.cc | 4 | ||||
| -rw-r--r-- | net/spdy/spdy_framer.cc | 4 |
4 files changed, 20 insertions, 2 deletions
diff --git a/net/disk_cache/backend_impl.cc b/net/disk_cache/backend_impl.cc index 117f20b..81c44d5 100644 --- a/net/disk_cache/backend_impl.cc +++ b/net/disk_cache/backend_impl.cc @@ -1484,7 +1484,13 @@ void BackendImpl::PrepareForRestart() { new_eviction_ = false; disabled_ = true; - data_->header.crash = 0; +#ifdef ANDROID + if (data_) { +#endif + data_->header.crash = 0; +#ifdef ANDROID + } +#endif index_ = NULL; data_ = NULL; block_files_.CloseFiles(); diff --git a/net/http/http_auth_handler_ntlm_portable.cc b/net/http/http_auth_handler_ntlm_portable.cc index fac37c8..5fa078d 100644 --- a/net/http/http_auth_handler_ntlm_portable.cc +++ b/net/http/http_auth_handler_ntlm_portable.cc @@ -70,9 +70,13 @@ namespace net { * ***** END LICENSE BLOCK ***** */ // Discover the endianness by testing processor architecture. -#if defined(ARCH_CPU_X86) || defined(ARCH_CPU_X86_64) || defined(ARCH_CPU_ARMEL) +#if defined(ARCH_CPU_X86) || defined(ARCH_CPU_X86_64)\ + || defined(ARCH_CPU_ARMEL) || defined(ARCH_CPU_MIPSEL) #define IS_LITTLE_ENDIAN 1 #undef IS_BIG_ENDIAN +#elif defined(ARCH_CPU_MIPSEB) +#undef IS_LITTLE_ENDIAN +#define IS_BIG_ENDIAN 1 #else #error "Unknown endianness" #endif 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; |