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 2020/05/17 19:16:25 UTC
[maven-wagon] branch WAGON-593 created (now bb12d4e)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch WAGON-593
in repository https://gitbox.apache.org/repos/asf/maven-wagon.git.
at bb12d4e [WAGON-593] Remove non-existent cache header
This branch includes the following new commits:
new d378806 Add more TODOs and FIXMEs
new bb12d4e [WAGON-593] Remove non-existent cache header
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-wagon] 01/02: Add more TODOs and FIXMEs
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch WAGON-593
in repository https://gitbox.apache.org/repos/asf/maven-wagon.git
commit d378806d60bbc2bb5d90869d01b5072e81eed0de
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon May 11 22:39:39 2020 +0200
Add more TODOs and FIXMEs
---
.../org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java | 1 +
.../java/org/apache/maven/wagon/shared/http/ConfigurationUtils.java | 2 ++
2 files changed, 3 insertions(+)
diff --git a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
index 1d2bf0f..9bedabc 100644
--- a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
+++ b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
@@ -1013,6 +1013,7 @@ public abstract class AbstractHttpClientWagon
{
// TODO: merge with the other headers and have some better defaults, unify with lightweight headers
method.addHeader( "Cache-control", "no-cache" );
+ // FIXME This header does not exist, remove it
method.addHeader( "Cache-store", "no-store" );
method.addHeader( "Pragma", "no-cache" );
}
diff --git a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/ConfigurationUtils.java b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/ConfigurationUtils.java
index 3c82851..36b97f9 100755
--- a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/ConfigurationUtils.java
+++ b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/ConfigurationUtils.java
@@ -54,6 +54,7 @@ public class ConfigurationUtils
private static final String MAX_REDIRECTS = "http.protocol.max-redirects";
private static final String HANDLE_REDIRECTS = "http.protocol.handle-redirects";
private static final String REJECT_RELATIVE_REDIRECT = "http.protocol.reject-relative-redirect";
+ // TODO Add contentCompressionEnabled and normalizeUri
private static final String COERCE_PATTERN = "%(\\w+),(.+)";
@@ -100,6 +101,7 @@ public class ConfigurationUtils
}
else if ( key.equals( DEFAULT_PROXY ) )
{
+ // FIXME This passes host only, ignoring the port
builder.setProxy( new HttpHost( value ) );
}
else if ( key.equals( LOCAL_ADDRESS ) )
[maven-wagon] 02/02: [WAGON-593] Remove non-existent cache header
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch WAGON-593
in repository https://gitbox.apache.org/repos/asf/maven-wagon.git
commit bb12d4ed2467f8deb543fa99d8d9a180e4ab1ea6
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun May 17 21:16:05 2020 +0200
[WAGON-593] Remove non-existent cache header
---
.../apache/maven/wagon/shared/http/AbstractHttpClientWagon.java | 2 --
.../apache/maven/wagon/providers/http/HttpClientWagonTest.java | 9 ---------
.../apache/maven/wagon/providers/webdav/HttpClientWagonTest.java | 9 ---------
3 files changed, 20 deletions(-)
diff --git a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
index 9bedabc..3e9fe91 100644
--- a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
+++ b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
@@ -1013,8 +1013,6 @@ public abstract class AbstractHttpClientWagon
{
// TODO: merge with the other headers and have some better defaults, unify with lightweight headers
method.addHeader( "Cache-control", "no-cache" );
- // FIXME This header does not exist, remove it
- method.addHeader( "Cache-store", "no-store" );
method.addHeader( "Pragma", "no-cache" );
}
diff --git a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpClientWagonTest.java b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpClientWagonTest.java
index 692c00d..30ff6ac 100755
--- a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpClientWagonTest.java
+++ b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HttpClientWagonTest.java
@@ -68,7 +68,6 @@ public class HttpClientWagonTest
// these are the default headers.
// method.addRequestHeader( "Cache-control", "no-cache" );
- // method.addRequestHeader( "Cache-store", "no-store" );
// method.addRequestHeader( "Pragma", "no-cache" );
// "Accept-Encoding" is automatically set by HttpClient at runtime
@@ -76,10 +75,6 @@ public class HttpClientWagonTest
assertNotNull( header );
assertEquals( "no-cache", header.getValue() );
- header = method.getFirstHeader( "Cache-store" );
- assertNotNull( header );
- assertEquals( "no-store", header.getValue() );
-
header = method.getFirstHeader( "Pragma" );
assertNotNull( header );
assertEquals( "no-cache", header.getValue() );
@@ -98,15 +93,11 @@ public class HttpClientWagonTest
// these are the default headers.
// method.addRequestHeader( "Cache-control", "no-cache" );
- // method.addRequestHeader( "Cache-store", "no-store" );
// method.addRequestHeader( "Pragma", "no-cache" );
Header header = method.getFirstHeader( "Cache-control" );
assertNull( header );
- header = method.getFirstHeader( "Cache-store" );
- assertNull( header );
-
header = method.getFirstHeader( "Pragma" );
assertNull( header );
}
diff --git a/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/HttpClientWagonTest.java b/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/HttpClientWagonTest.java
index 687db94..77016ea 100644
--- a/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/HttpClientWagonTest.java
+++ b/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/HttpClientWagonTest.java
@@ -93,7 +93,6 @@ public class HttpClientWagonTest
// these are the default headers.
// method.addRequestHeader( "Cache-control", "no-cache" );
- // method.addRequestHeader( "Cache-store", "no-store" );
// method.addRequestHeader( "Pragma", "no-cache" );
// "Accept-Encoding" is automatically set by HttpClient at runtime
@@ -101,10 +100,6 @@ public class HttpClientWagonTest
assertNotNull( header );
assertEquals( "no-cache", header.getValue() );
- header = method.getFirstHeader( "Cache-store" );
- assertNotNull( header );
- assertEquals( "no-store", header.getValue() );
-
header = method.getFirstHeader( "Pragma" );
assertNotNull( header );
assertEquals( "no-cache", header.getValue() );
@@ -123,15 +118,11 @@ public class HttpClientWagonTest
// these are the default headers.
// method.addRequestHeader( "Cache-control", "no-cache" );
- // method.addRequestHeader( "Cache-store", "no-store" );
// method.addRequestHeader( "Pragma", "no-cache" );
Header header = method.getFirstHeader( "Cache-control" );
assertNull( header );
- header = method.getFirstHeader( "Cache-store" );
- assertNull( header );
-
header = method.getFirstHeader( "Pragma" );
assertNull( header );
}