You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2016/12/10 00:28:11 UTC
maven-wagon git commit: [WAGON-469] wagon-http does not enable
Expect-Continue by default
Repository: maven-wagon
Updated Branches:
refs/heads/master e30c31d4b -> 5d600267c
[WAGON-469] wagon-http does not enable Expect-Continue by default
* enable Expect-Continue for PUTs when no configuration is provided
* use correct key for default Expect-Continue configuration parameter
(HTTP.EXPECT_CONTINUE constant is the expectation name, not the parameter key)
This closes #31
Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/5d600267
Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/5d600267
Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/5d600267
Branch: refs/heads/master
Commit: 5d600267c4e8f1a27b32bed91a557e696bd66fc3
Parents: e30c31d
Author: Stuart McCulloch <mc...@gmail.com>
Authored: Fri Dec 9 23:04:25 2016 +0000
Committer: Michael Osipov <mi...@apache.org>
Committed: Sat Dec 10 01:27:26 2016 +0100
----------------------------------------------------------------------
.../maven/wagon/providers/http/AbstractHttpClientWagon.java | 4 ++++
.../org/apache/maven/wagon/providers/http/HttpConfiguration.java | 3 +--
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5d600267/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
index 7b4d4c3..49e69cc 100755
--- a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
+++ b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/AbstractHttpClientWagon.java
@@ -786,6 +786,10 @@ public abstract class AbstractHttpClientWagon
else
{
requestConfigBuilder.setSocketTimeout( getReadTimeout() );
+ if ( httpMethod instanceof HttpPut )
+ {
+ requestConfigBuilder.setExpectContinueEnabled( true );
+ }
}
localContext.setRequestConfig( requestConfigBuilder.build() );
http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/5d600267/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpConfiguration.java
----------------------------------------------------------------------
diff --git a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpConfiguration.java b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpConfiguration.java
index a7e0b23..87c8876 100644
--- a/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpConfiguration.java
+++ b/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpConfiguration.java
@@ -23,7 +23,6 @@ import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpHead;
import org.apache.http.client.methods.HttpPut;
import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.protocol.HTTP;
/**
*
@@ -32,7 +31,7 @@ public class HttpConfiguration
{
private static final HttpMethodConfiguration DEFAULT_PUT =
- new HttpMethodConfiguration().addParam( HTTP.EXPECT_CONTINUE, "%b,true" );
+ new HttpMethodConfiguration().addParam( "http.protocol.expect-continue", "%b,true" );
private HttpMethodConfiguration all;