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 2018/01/15 09:25:58 UTC

httpcomponents-client git commit: HTTPCLIENT-1690: Avoid merging Content-Encoding headers coming with 304 status to cache entry

Repository: httpcomponents-client
Updated Branches:
  refs/heads/master 1e5fe0e01 -> a3bcad398


HTTPCLIENT-1690: Avoid merging Content-Encoding headers coming with 304 status to cache entry


Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/commit/a3bcad39
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/tree/a3bcad39
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/diff/a3bcad39

Branch: refs/heads/master
Commit: a3bcad3989b0e3af7a742547c602d104fef39e1f
Parents: 1e5fe0e
Author: Sudheera Palihakkara <ca...@gmail.com>
Authored: Sun Jan 14 23:49:50 2018 +0800
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Mon Jan 15 10:16:35 2018 +0100

----------------------------------------------------------------------
 .../http/impl/cache/CacheUpdateHandler.java     |  4 +++
 .../http/impl/cache/TestCacheUpdateHandler.java | 30 ++++++++++++++++++++
 2 files changed, 34 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/a3bcad39/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheUpdateHandler.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheUpdateHandler.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheUpdateHandler.java
index 5ca5225..e285c39 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheUpdateHandler.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheUpdateHandler.java
@@ -145,6 +145,10 @@ class CacheUpdateHandler {
         // Remove cache headers that match response
         for (final Iterator<Header> it = response.headerIterator(); it.hasNext(); ) {
             final Header responseHeader = it.next();
+            // Since we do not expect a content in a 304 response, should retain the original Content-Encoding header
+            if (HttpHeaders.CONTENT_ENCODING.equals(responseHeader.getName())) {
+                continue;
+            }
             headerGroup.removeHeaders(responseHeader.getName());
         }
         // remove cache entry 1xx warnings

http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/a3bcad39/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheUpdateHandler.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheUpdateHandler.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheUpdateHandler.java
index 8170105..0e3d9ad 100644
--- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheUpdateHandler.java
+++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCacheUpdateHandler.java
@@ -246,4 +246,34 @@ public class TestCacheUpdateHandler {
         assertEquals(newVariantCacheKey, resultMap.get(newVariantKey));
     }
 
+    @Test
+    public void testContentEncodingHeaderIsNotUpdatedByMerge() throws IOException {
+        final Header[] headers = {
+                new BasicHeader("Date", DateUtils.formatDate(requestDate)),
+                new BasicHeader("ETag", "\"etag\""),
+                new BasicHeader("Content-Encoding", "identity")};
+
+        entry = HttpTestUtils.makeCacheEntry(headers);
+        response.setHeaders(new BasicHeader("Last-Modified", DateUtils.formatDate(responseDate)),
+                new BasicHeader("Cache-Control", "public"),
+                new BasicHeader("Content-Encoding", "gzip"));
+
+        final HttpCacheEntry updatedEntry = impl.updateCacheEntry(null, entry,
+                new Date(), new Date(), response);
+
+        final Header[] updatedHeaders = updatedEntry.getAllHeaders();
+        headersContain(updatedHeaders, "Content-Encoding", "identity");
+    }
+
+    private void headersContain(final Header[] headers, final String name, final String value) {
+        for (final Header header : headers) {
+            if (header.getName().equals(name)) {
+                if (header.getValue().equals(value)) {
+                    return;
+                }
+            }
+        }
+        fail("Header [" + name + ": " + value + "] not found in headers.");
+    }
+
 }