Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HTTPCLIENT-1187: If a revalidation response is deemed too old CachingHttpClient fails to consume its content resulting in a connection leak 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1335726 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2012-05-08 19:54:27 +00:00
parent a8d2e5e5fa
commit 1b063abfa9
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RELEASE_NOTES.txt
View File

@ -1,6 +1,10 @@
Changes since 4.2 BETA1 Changes since 4.2 BETA1
------------------- -------------------
* [HTTPCLIENT-1187] If a revalidation response is deemed too old CachingHttpClient fails to
consume its content resulting in a connection leak.
Contributed by Oleg Kalnichevski <olegk at apache.org>
* [HTTPCLIENT-1186] State of newly created connections in the connection pool is not always * [HTTPCLIENT-1186] State of newly created connections in the connection pool is not always
correctly updated potentially allowing those connections to be leased to users with a different correctly updated potentially allowing those connections to be leased to users with a different
security context. security context.

2
httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java vendored
View File

@ -769,6 +769,7 @@ public class CachingHttpClient implements HttpClient {
HttpCacheEntry matchedEntry = matchingVariant.getEntry(); HttpCacheEntry matchedEntry = matchingVariant.getEntry();
if (revalidationResponseIsTooOld(backendResponse, matchedEntry)) { if (revalidationResponseIsTooOld(backendResponse, matchedEntry)) {
EntityUtils.consume(backendResponse.getEntity());
return retryRequestUnconditionally(target, request, context, return retryRequestUnconditionally(target, request, context,
matchedEntry); matchedEntry);
} }
@ -839,6 +840,7 @@ public class CachingHttpClient implements HttpClient {
Date responseDate = getCurrentDate(); Date responseDate = getCurrentDate();
if (revalidationResponseIsTooOld(backendResponse, cacheEntry)) { if (revalidationResponseIsTooOld(backendResponse, cacheEntry)) {
EntityUtils.consume(backendResponse.getEntity());
HttpRequest unconditional = conditionalRequestBuilder HttpRequest unconditional = conditionalRequestBuilder
.buildUnconditionalRequest(request, cacheEntry); .buildUnconditionalRequest(request, cacheEntry);
requestDate = getCurrentDate(); requestDate = getCurrentDate();