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 2018/08/31 18:35:15 UTC
[maven-wagon] branch master updated: [WAGON-530] Drop invalid
header 'Expires'
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-wagon.git
The following commit(s) were added to refs/heads/master by this push:
new 75c74cc [WAGON-530] Drop invalid header 'Expires'
75c74cc is described below
commit 75c74cc66cf718112865b9255f58c460dd08962b
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri Aug 31 20:34:28 2018 +0200
[WAGON-530] Drop invalid header 'Expires'
---
.../apache/maven/wagon/shared/http/AbstractHttpClientWagon.java | 1 -
.../apache/maven/wagon/providers/http/HttpClientWagonTest.java | 9 ---------
.../apache/maven/wagon/providers/webdav/HttpClientWagonTest.java | 9 ---------
3 files changed, 19 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 8387e93..0f85d60 100755
--- 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
@@ -936,7 +936,6 @@ public abstract class AbstractHttpClientWagon
method.addHeader( "Cache-control", "no-cache" );
method.addHeader( "Cache-store", "no-store" );
method.addHeader( "Pragma", "no-cache" );
- method.addHeader( "Expires", "0" );
}
if ( httpHeaders != null )
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 bf15e67..692c00d 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
@@ -70,7 +70,6 @@ public class HttpClientWagonTest
// method.addRequestHeader( "Cache-control", "no-cache" );
// method.addRequestHeader( "Cache-store", "no-store" );
// method.addRequestHeader( "Pragma", "no-cache" );
- // method.addRequestHeader( "Expires", "0" );
// "Accept-Encoding" is automatically set by HttpClient at runtime
Header header = method.getFirstHeader( "Cache-control" );
@@ -84,10 +83,6 @@ public class HttpClientWagonTest
header = method.getFirstHeader( "Pragma" );
assertNotNull( header );
assertEquals( "no-cache", header.getValue() );
-
- header = method.getFirstHeader( "Expires" );
- assertNotNull( header );
- assertEquals( "0", header.getValue() );
}
public void testTurnOffDefaultHeaders()
@@ -105,7 +100,6 @@ public class HttpClientWagonTest
// method.addRequestHeader( "Cache-control", "no-cache" );
// method.addRequestHeader( "Cache-store", "no-store" );
// method.addRequestHeader( "Pragma", "no-cache" );
- // method.addRequestHeader( "Expires", "0" );
Header header = method.getFirstHeader( "Cache-control" );
assertNull( header );
@@ -115,9 +109,6 @@ public class HttpClientWagonTest
header = method.getFirstHeader( "Pragma" );
assertNull( header );
-
- header = method.getFirstHeader( "Expires" );
- assertNull( header );
}
private static final class TestWagon
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 177774b..687db94 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
@@ -95,7 +95,6 @@ public class HttpClientWagonTest
// method.addRequestHeader( "Cache-control", "no-cache" );
// method.addRequestHeader( "Cache-store", "no-store" );
// method.addRequestHeader( "Pragma", "no-cache" );
- // method.addRequestHeader( "Expires", "0" );
// "Accept-Encoding" is automatically set by HttpClient at runtime
Header header = method.getFirstHeader( "Cache-control" );
@@ -109,10 +108,6 @@ public class HttpClientWagonTest
header = method.getFirstHeader( "Pragma" );
assertNotNull( header );
assertEquals( "no-cache", header.getValue() );
-
- header = method.getFirstHeader( "Expires" );
- assertNotNull( header );
- assertEquals( "0", header.getValue() );
}
public void testTurnOffDefaultHeaders()
@@ -130,7 +125,6 @@ public class HttpClientWagonTest
// method.addRequestHeader( "Cache-control", "no-cache" );
// method.addRequestHeader( "Cache-store", "no-store" );
// method.addRequestHeader( "Pragma", "no-cache" );
- // method.addRequestHeader( "Expires", "0" );
Header header = method.getFirstHeader( "Cache-control" );
assertNull( header );
@@ -140,9 +134,6 @@ public class HttpClientWagonTest
header = method.getFirstHeader( "Pragma" );
assertNull( header );
-
- header = method.getFirstHeader( "Expires" );
- assertNull( header );
}
@Ignore("not sure how to test this")