From 9d55b80d47655317393d1e3242e2dc5e59548c95 Mon Sep 17 00:00:00 2001 From: Oleg Kalnichevski Date: Tue, 24 Nov 2009 20:52:31 +0000 Subject: [PATCH] HTTPCLIENT-889: 'expect: continue' handshake disabled per default git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@883868 13f79535-47bb-0310-9956-ffa450edef68 --- RELEASE_NOTES.txt | 3 +++ .../java/org/apache/http/impl/client/DefaultHttpClient.java | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index 66d171fc1..f9e2fade0 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -1,6 +1,9 @@ Changes since 4.0 ------------------- +* [HTTPCLIENT-889] 'expect: continue' handshake disabled per default. + Contributed by Oleg Kalnichevski + * [HTTPCLIENT-862] Extended client's redirect handling interface to allow control of the content of the redirect. Contributed by Oleg Kalnichevski diff --git a/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java b/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java index 4679ce04f..09b9eae18 100644 --- a/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java +++ b/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java @@ -194,8 +194,6 @@ public class DefaultHttpClient extends AbstractHttpClient { HttpVersion.HTTP_1_1); HttpProtocolParams.setContentCharset(params, HTTP.DEFAULT_CONTENT_CHARSET); - HttpProtocolParams.setUseExpectContinue(params, - true); HttpConnectionParams.setTcpNoDelay(params, true); HttpConnectionParams.setSocketBufferSize(params,