diff options
| -rw-r--r-- | Android.mk | 5 | ||||
| -rw-r--r-- | net/socket/ssl_client_socket_openssl.cc | 4 | ||||
| -rw-r--r-- | net/spdy/spdy_framer.cc | 4 |
3 files changed, 13 insertions, 0 deletions
@@ -487,4 +487,9 @@ LOCAL_PRELINK_MODULE := false # Including this will modify the include path include external/stlport/libstlport.mk +ifneq ($(strip $(WITH_ADDRESS_SANITIZER)),) + LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/asan + LOCAL_ADDRESS_SANITIZER := true +endif + include $(BUILD_SHARED_LIBRARY) 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; |