refs/tags/android-cts-4.1_r2 - platform/libcore.git

tag	3fa959d6dccd3bf0cfcd29ff44d74f5d654e48a9
tagger	The Android Open Source Project <initial-contribution@android.com>	Tue Mar 05 08:25:32 2013 -0800
object	a0d32add4376f31f35e2a50f59185f16f5cd8ccb

Android 4.1 CTS release 2

commit	a0d32add4376f31f35e2a50f59185f16f5cd8ccb	[log] [tgz]
author	Brian Carlstrom <bdc@google.com>	Wed Aug 29 15:56:56 2012 -0700
committer	Guru Nagarajan <gurunagarajan@google.com>	Mon Nov 26 10:36:44 2012 -0800
tree	c9b7896ede4fbc57e6929e9c0a7137fe8a2df82c
parent	45476092ea0253f9a0c8058f66c4796471fd5bf2 [diff]

DO NOT MERGE

Disable SSL compression

Bug: 7079965

Change-Id: I8e060a827613e212bbcced66507fbf124bb04543

	modified:   luni/src/main/java/libcore/net/http/HttpConnection.java
	modified:   luni/src/main/java/org/apache/harmony/xnet/provider/jsse/NativeCrypto.java
	modified:   luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLServerSocketImpl.java
	modified:   luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSessionImpl.java
	modified:   luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImpl.java
	modified:   luni/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
	modified:   luni/src/test/java/org/apache/harmony/xnet/provider/jsse/NativeCryptoTest.java

7 files changed

tree: c9b7896ede4fbc57e6929e9c0a7137fe8a2df82c