From af5c56d18c8e1e32552c7d31a2f365b506c28e59 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 28 Apr 2010 15:41:16 -0700 Subject: RFC2616 says it's "100-continue", not "100-Continue". Bug: http://code.google.com/p/android/issues/detail?id=7208 Change-Id: I66dd64fb068fc920ed47e0b3efdac5e70e603027 --- src/org/apache/http/params/CoreProtocolPNames.java | 4 ++-- src/org/apache/http/protocol/HTTP.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/apache/http/params/CoreProtocolPNames.java b/src/org/apache/http/params/CoreProtocolPNames.java index a42c5de..a0a726d 100644 --- a/src/org/apache/http/params/CoreProtocolPNames.java +++ b/src/org/apache/http/params/CoreProtocolPNames.java @@ -94,8 +94,8 @@ public interface CoreProtocolPNames { /** *

- * Activates 'Expect: 100-Continue' handshake for the - * entity enclosing methods. The purpose of the 'Expect: 100-Continue' + * Activates 'Expect: 100-continue' handshake for the + * entity enclosing methods. The purpose of the 'Expect: 100-continue' * handshake to allow a client that is sending a request message with * a request body to determine if the origin server is willing to * accept the request (based on the request headers) before the client diff --git a/src/org/apache/http/protocol/HTTP.java b/src/org/apache/http/protocol/HTTP.java index de76ca6..9223955 100644 --- a/src/org/apache/http/protocol/HTTP.java +++ b/src/org/apache/http/protocol/HTTP.java @@ -60,7 +60,7 @@ public final class HTTP { public static final String SERVER_HEADER = "Server"; /** HTTP expectations */ - public static final String EXPECT_CONTINUE = "100-Continue"; + public static final String EXPECT_CONTINUE = "100-continue"; /** HTTP connection control */ public static final String CONN_CLOSE = "Close"; -- cgit v1.1 From ffdb17578754105930c12cf7989a06914b96190f Mon Sep 17 00:00:00 2001 From: Jesse Wilson Date: Thu, 6 May 2010 14:42:10 -0700 Subject: Turning off expect-continue by default in Apache HTTP client. Change-Id: I24d9950e23596770c4b2835f3f3c23ced9cb7651 http://b/2471595 --- src/org/apache/http/impl/client/DefaultHttpClient.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/org/apache/http/impl/client/DefaultHttpClient.java b/src/org/apache/http/impl/client/DefaultHttpClient.java index f0b694e..7dcb2a2 100644 --- a/src/org/apache/http/impl/client/DefaultHttpClient.java +++ b/src/org/apache/http/impl/client/DefaultHttpClient.java @@ -131,8 +131,15 @@ public class DefaultHttpClient extends AbstractHttpClient { HttpVersion.HTTP_1_1); HttpProtocolParams.setContentCharset(params, HTTP.DEFAULT_CONTENT_CHARSET); + + /* + * Android note: Send each request body without first asking the server + * whether it will be accepted. Asking first slows down the common case + * and results in "417 expectation failed" errors when a HTTP/1.0 server + * is behind a proxy. http://b/2471595 + */ HttpProtocolParams.setUseExpectContinue(params, - true); + false); // android-changed // determine the release version from packaged version info final VersionInfo vi = VersionInfo.loadVersionInfo -- cgit v1.1 From 3af52d9f93fd383c8fefb118d1b255e1880315cb Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Fri, 16 Jul 2010 11:41:34 -0700 Subject: add meta-files about 3rd party projects Change-Id: Idadf71f9935d34f95e7df68a3ffb59e0d8f154b8 --- ThirdPartyProject.prop | 9 +++++++++ src/org/apache/commons/codec/ThirdPartyProject.prop | 10 ++++++++++ src/org/apache/commons/logging/ThirdPartyProject.prop | 10 ++++++++++ 3 files changed, 29 insertions(+) create mode 100644 ThirdPartyProject.prop create mode 100644 src/org/apache/commons/codec/ThirdPartyProject.prop create mode 100644 src/org/apache/commons/logging/ThirdPartyProject.prop diff --git a/ThirdPartyProject.prop b/ThirdPartyProject.prop new file mode 100644 index 0000000..53360a3 --- /dev/null +++ b/ThirdPartyProject.prop @@ -0,0 +1,9 @@ +# Copyright 2010 Google Inc. All Rights Reserved. +#Fri Jul 16 10:03:08 PDT 2010 +currentVersion=4 +version=16/07/2008 +isNative=false +name=apache_commons_httpcomponents +keywords=apache commons httpcomponents +onDevice=true +homepage=http\://www.apache.org/dist/httpcomponents/httpclient/ diff --git a/src/org/apache/commons/codec/ThirdPartyProject.prop b/src/org/apache/commons/codec/ThirdPartyProject.prop new file mode 100644 index 0000000..036945c --- /dev/null +++ b/src/org/apache/commons/codec/ThirdPartyProject.prop @@ -0,0 +1,10 @@ +# Copyright 2010 Google Inc. All Rights Reserved. +#Fri Jul 16 10:03:08 PDT 2010 +currentVersion=1.4 +version=1.3 +isNative=false +feedurl=http\://commons.apache.org/codec/changes-report.html +name=apache_commons_codec +keywords=apache commons codec +onDevice=true +homepage=http\://commons.apache.org/codec/ diff --git a/src/org/apache/commons/logging/ThirdPartyProject.prop b/src/org/apache/commons/logging/ThirdPartyProject.prop new file mode 100644 index 0000000..988c487 --- /dev/null +++ b/src/org/apache/commons/logging/ThirdPartyProject.prop @@ -0,0 +1,10 @@ +# Copyright 2010 Google Inc. All Rights Reserved. +#Fri Jul 16 10:03:08 PDT 2010 +currentVersion=1.1.1 +version=1.1.1 +isNative=false +feedurl=http\://commons.apache.org/logging/RELEASE-NOTES.txt +name=apache_commons_logging +keywords=apache commons logging +onDevice=true +homepage=http\://commons.apache.org/logging/ -- cgit v1.1 From 177cd647c9fa02329fb9800f71282b233170f986 Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Mon, 14 Mar 2011 11:39:08 -0700 Subject: Backport hostname verification correctness fix From libcore's commit with sha 6767bdbe6bb1d4542c97868d8df1f71d2414fc62 The only behavior change should be a bug fix. There was a check "cn.lastIndexOf('.') >= 0" that was always true. This has been fixed to match the comment "require two dots". Change-Id: I680cad56a1f86150128e587f8c8e19be6ef27bc3 --- src/org/apache/http/conn/ssl/AbstractVerifier.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/apache/http/conn/ssl/AbstractVerifier.java b/src/org/apache/http/conn/ssl/AbstractVerifier.java index e409db9..723d806 100644 --- a/src/org/apache/http/conn/ssl/AbstractVerifier.java +++ b/src/org/apache/http/conn/ssl/AbstractVerifier.java @@ -163,7 +163,7 @@ public abstract class AbstractVerifier implements X509HostnameVerifier { // action. It also can't be [*.co.uk] or [*.co.jp] or // [*.org.uk], etc... boolean doWildcard = cn.startsWith("*.") && - cn.lastIndexOf('.') >= 0 && + cn.indexOf('.', 2) != -1 && acceptableCountryWildcard(cn) && !InetAddressUtils.isIPv4Address(host); -- cgit v1.1