android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2026-01-24 04:02:07 +03:00
Code Releases Activity

Merge pull request #315 from aahlenst/fix-issue-298

Browse Source 
Bug fixed that caused gzipped responses to be returned from cache after ...
This commit is contained in:
Jesse Wilson
2013-09-28 12:46:11 -07:00
parent d45b067b46 357f77221c
commit 43a7c604c9
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
okhttp/src/main/java/com/squareup/okhttp/internal/http/HttpEngine.java
View File

@@ -649,10 +649,17 @@ public class HttpEngine {
if (cachedResponseHeaders.validate(responseHeaders)) {
release(false);
ResponseHeaders combinedHeaders = cachedResponseHeaders.combine(responseHeaders);
setResponse(combinedHeaders, cachedResponseBody);
this.responseHeaders = combinedHeaders;
// Update the cache after applying the combined headers but before initializing the content
// stream, otherwise the Content-Encoding header (if present) will be stripped from the
// combined headers and not end up in the cache file if transparent gzip compression is
// turned on.
OkResponseCache responseCache = client.getOkResponseCache();
responseCache.trackConditionalCacheHit();
responseCache.update(cacheResponse, policy.getHttpConnectionToCache());
initContentStream(cachedResponseBody);
return;
} else {
Util.closeQuietly(cachedResponseBody);

6
okhttp/src/test/java/com/squareup/okhttp/internal/http/HttpResponseCacheTest.java
View File

@@ -946,8 +946,14 @@ public final class HttpResponseCacheTest {
server.enqueue(
response.setBody(gzip("ABCABCABC".getBytes("UTF-8"))).addHeader("Content-Encoding: gzip"));
server.enqueue(new MockResponse().setResponseCode(HttpURLConnection.HTTP_NOT_MODIFIED));
server.enqueue(new MockResponse().setResponseCode(HttpURLConnection.HTTP_NOT_MODIFIED));
server.play();
// At least three request/response pairs are required because after the first request is cached
// a different execution path might be taken. Thus modifications to the cache applied during
// the second request might not be visible until another request is performed.
assertEquals("ABCABCABC", readAscii(openConnection(server.getUrl("/"))));
assertEquals("ABCABCABC", readAscii(openConnection(server.getUrl("/"))));
assertEquals("ABCABCABC", readAscii(openConnection(server.getUrl("/"))));
}