You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2010/09/22 17:06:54 UTC
svn commit: r1000023 - in
/httpcomponents/httpclient/trunk/httpclient-cache/src:
main/java/org/apache/http/impl/client/cache/
test/java/org/apache/http/impl/client/cache/
Author: olegk
Date: Wed Sep 22 15:06:53 2010
New Revision: 1000023
URL: http://svn.apache.org/viewvc?rev=1000023&view=rev
Log:
HTTPCLIENT-998: cache should use both Last-Modified and ETag for validations when available
Contributed by Jonathan Moore <jonathan_moore at comcast.com>
Modified:
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ConditionalRequestBuilder.java
httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestConditionalRequestBuilder.java
httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRecommendations.java
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ConditionalRequestBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ConditionalRequestBuilder.java?rev=1000023&r1=1000022&r2=1000023&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ConditionalRequestBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ConditionalRequestBuilder.java Wed Sep 22 15:06:53 2010
@@ -58,8 +58,9 @@ class ConditionalRequestBuilder {
Header eTag = cacheEntry.getFirstHeader(HeaderConstants.ETAG);
if (eTag != null) {
wrapperRequest.setHeader(HeaderConstants.IF_NONE_MATCH, eTag.getValue());
- } else {
- Header lastModified = cacheEntry.getFirstHeader(HeaderConstants.LAST_MODIFIED);
+ }
+ Header lastModified = cacheEntry.getFirstHeader(HeaderConstants.LAST_MODIFIED);
+ if (lastModified != null) {
wrapperRequest.setHeader(HeaderConstants.IF_MODIFIED_SINCE, lastModified.getValue());
}
boolean mustRevalidate = false;
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestConditionalRequestBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestConditionalRequestBuilder.java?rev=1000023&r1=1000022&r2=1000023&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestConditionalRequestBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestConditionalRequestBuilder.java Wed Sep 22 15:06:53 2010
@@ -86,6 +86,28 @@ public class TestConditionalRequestBuild
}
@Test
+ public void testConditionalRequestForEntryWithLastModifiedAndEtagIncludesBothAsValidators()
+ throws Exception {
+ Date now = new Date();
+ Date tenSecondsAgo = new Date(now.getTime() - 10 * 1000L);
+ Date twentySecondsAgo = new Date(now.getTime() - 20 * 1000L);
+ final String lmDate = DateUtils.formatDate(twentySecondsAgo);
+ final String etag = "\"etag\"";
+ Header[] headers = {
+ new BasicHeader("Date", DateUtils.formatDate(tenSecondsAgo)),
+ new BasicHeader("Last-Modified", lmDate),
+ new BasicHeader("ETag", etag)
+ };
+ HttpRequest request = new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1);
+ HttpCacheEntry entry = HttpTestUtils.makeCacheEntry(headers);
+ HttpRequest result = impl.buildConditionalRequest(request, entry);
+ Assert.assertEquals(lmDate,
+ result.getFirstHeader("If-Modified-Since").getValue());
+ Assert.assertEquals(etag,
+ result.getFirstHeader("If-None-Match").getValue());
+ }
+
+ @Test
public void testBuildConditionalRequestWithETag() throws ProtocolException {
String theMethod = "GET";
String theUri = "/theuri";
@@ -110,7 +132,7 @@ public class TestConditionalRequestBuild
Assert.assertEquals(request.getRequestLine().getProtocolVersion(), newRequest
.getRequestLine().getProtocolVersion());
- Assert.assertEquals(2, newRequest.getAllHeaders().length);
+ Assert.assertEquals(3, newRequest.getAllHeaders().length);
Assert.assertEquals("Accept-Encoding", newRequest.getAllHeaders()[0].getName());
Assert.assertEquals("gzip", newRequest.getAllHeaders()[0].getValue());
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRecommendations.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRecommendations.java?rev=1000023&r1=1000022&r2=1000023&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRecommendations.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestProtocolRecommendations.java Wed Sep 22 15:06:53 2010
@@ -44,6 +44,7 @@ import org.apache.http.message.BasicHttp
import org.apache.http.message.BasicHttpResponse;
import org.apache.http.protocol.HttpContext;
import org.easymock.Capture;
+import org.easymock.EasyMock;
import org.junit.Test;
/*
@@ -306,6 +307,100 @@ public class TestProtocolRecommendations
}
/*
+ * "[HTTP/1.1 clients], If only a Last-Modified value has been provided
+ * by the origin server, SHOULD use that value in non-subrange cache-
+ * conditional requests (using If-Modified-Since)."
+ *
+ * http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.3.4
+ */
+ @Test
+ public void testUsesLastModifiedDateForCacheConditionalRequests()
+ throws Exception {
+ Date now = new Date();
+ Date tenSecondsAgo = new Date(now.getTime() - 10 * 1000L);
+ Date twentySecondsAgo = new Date(now.getTime() - 20 * 1000L);
+ final String lmDate = DateUtils.formatDate(twentySecondsAgo);
+
+ HttpRequest req1 =
+ new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1);
+ HttpResponse resp1 = HttpTestUtils.make200Response();
+ resp1.setHeader("Date", DateUtils.formatDate(tenSecondsAgo));
+ resp1.setHeader("Last-Modified", lmDate);
+ resp1.setHeader("Cache-Control","max-age=5");
+
+ backendExpectsAnyRequest().andReturn(resp1);
+
+ Capture<HttpRequest> cap = new Capture<HttpRequest>();
+ HttpRequest req2 =
+ new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1);
+ HttpResponse resp2 = HttpTestUtils.make200Response();
+
+ EasyMock.expect(mockBackend.execute(EasyMock.same(host),
+ EasyMock.capture(cap), (HttpContext)EasyMock.isNull()))
+ .andReturn(resp2);
+
+ replayMocks();
+ impl.execute(host, req1);
+ impl.execute(host, req2);
+ verifyMocks();
+
+ HttpRequest captured = cap.getValue();
+ Header ifModifiedSince =
+ captured.getFirstHeader("If-Modified-Since");
+ assertEquals(lmDate, ifModifiedSince.getValue());
+ }
+
+ /*
+ * "[HTTP/1.1 clients], if both an entity tag and a Last-Modified value
+ * have been provided by the origin server, SHOULD use both validators
+ * in cache-conditional requests. This allows both HTTP/1.0 and
+ * HTTP/1.1 caches to respond appropriately."
+ *
+ * http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html#sec13.3.4
+ */
+ @Test
+ public void testUsesBothLastModifiedAndETagForConditionalRequestsIfAvailable()
+ throws Exception {
+ Date now = new Date();
+ Date tenSecondsAgo = new Date(now.getTime() - 10 * 1000L);
+ Date twentySecondsAgo = new Date(now.getTime() - 20 * 1000L);
+ final String lmDate = DateUtils.formatDate(twentySecondsAgo);
+ final String etag = "\"etag\"";
+
+ HttpRequest req1 =
+ new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1);
+ HttpResponse resp1 = HttpTestUtils.make200Response();
+ resp1.setHeader("Date", DateUtils.formatDate(tenSecondsAgo));
+ resp1.setHeader("Last-Modified", lmDate);
+ resp1.setHeader("Cache-Control","max-age=5");
+ resp1.setHeader("ETag", etag);
+
+ backendExpectsAnyRequest().andReturn(resp1);
+
+ Capture<HttpRequest> cap = new Capture<HttpRequest>();
+ HttpRequest req2 =
+ new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1);
+ HttpResponse resp2 = HttpTestUtils.make200Response();
+
+ EasyMock.expect(mockBackend.execute(EasyMock.same(host),
+ EasyMock.capture(cap), (HttpContext)EasyMock.isNull()))
+ .andReturn(resp2);
+
+ replayMocks();
+ impl.execute(host, req1);
+ impl.execute(host, req2);
+ verifyMocks();
+
+ HttpRequest captured = cap.getValue();
+ Header ifModifiedSince =
+ captured.getFirstHeader("If-Modified-Since");
+ assertEquals(lmDate, ifModifiedSince.getValue());
+ Header ifNoneMatch =
+ captured.getFirstHeader("If-None-Match");
+ assertEquals(etag, ifNoneMatch.getValue());
+ }
+
+ /*
* "If an origin server wishes to force a semantically transparent cache
* to validate every request, it MAY assign an explicit expiration time
* in the past. This means that the response is always stale, and so the