diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsyncCachingExec.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsyncCachingExec.java index 4eda6d6c7f..cd8301ba12 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsyncCachingExec.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsyncCachingExec.java @@ -753,7 +753,7 @@ public void cancelled() { context.setResponseCacheControl(responseCacheControl); final boolean cacheable = responseCachingPolicy.isResponseCacheable( requestCacheControl, responseCacheControl, request, backendResponse, - isTargetAuthenticated(context, scope.route)); + isTargetAuthenticated(request, scope.route, context)); if (cacheable) { storeRequestIfModifiedSinceFor304Response(request, backendResponse); if (LOG.isDebugEnabled()) { diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java index 9fbc71bcd6..650c5f1e1f 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java @@ -553,7 +553,7 @@ ClassicHttpResponse handleBackendResponse( context.setResponseCacheControl(responseCacheControl); final boolean cacheable = responseCachingPolicy.isResponseCacheable( requestCacheControl, responseCacheControl, request, backendResponse, - isTargetAuthenticated(context, scope.route)); + isTargetAuthenticated(request, scope.route, context)); if (cacheable) { storeRequestIfModifiedSinceFor304Response(request, backendResponse); if (LOG.isDebugEnabled()) { diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExecBase.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExecBase.java index 8dec485f4e..61524ab524 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExecBase.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExecBase.java @@ -129,9 +129,8 @@ public long getCacheUpdates() { * request last sent to the backend. A connection-based scheme does not resend * the header once the exchange has succeeded, so check the exchange state as well. */ - static boolean isTargetAuthenticated(final HttpClientContext context, final HttpRoute route) { - final HttpRequest sentRequest = context.getRequest(); - if (sentRequest != null && sentRequest.containsHeader(HttpHeaders.AUTHORIZATION)) { + static boolean isTargetAuthenticated(final HttpRequest request, final HttpRoute route, final HttpClientContext context) { + if (request.containsHeader(HttpHeaders.AUTHORIZATION)) { return true; } final AuthExchange authExchange = context.getAuthExchanges().get(route.getTargetHost()); diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingH2AsyncClientBuilder.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingH2AsyncClientBuilder.java index 5cd9f33767..7466401f09 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingH2AsyncClientBuilder.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingH2AsyncClientBuilder.java @@ -157,7 +157,7 @@ protected void customizeExecChain(final NamedElementChain httpCache, cacheRevalidator, config); - execChainDefinition.addBefore(ChainElement.PROTOCOL.name(), cachingExec, ChainElement.CACHING.name()); + execChainDefinition.addAfter(ChainElement.PROTOCOL.name(), cachingExec, ChainElement.CACHING.name()); } } diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpAsyncClientBuilder.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpAsyncClientBuilder.java index 2dda48a9a2..2f60457a54 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpAsyncClientBuilder.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpAsyncClientBuilder.java @@ -161,7 +161,7 @@ protected void customizeExecChain(final NamedElementChain httpCache, cacheRevalidator, config); - execChainDefinition.addBefore(ChainElement.PROTOCOL.name(), cachingExec, ChainElement.CACHING.name()); + execChainDefinition.addAfter(ChainElement.PROTOCOL.name(), cachingExec, ChainElement.CACHING.name()); } @Override diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpClientBuilder.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpClientBuilder.java index 303e1f05b6..17aa5d0bf5 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpClientBuilder.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpClientBuilder.java @@ -154,7 +154,7 @@ protected void customizeExecChain(final NamedElementChain exec httpCache, cacheRevalidator, config); - execChainDefinition.addBefore(ChainElement.PROTOCOL.name(), cachingExec, ChainElement.CACHING.name()); + execChainDefinition.addAfter(ChainElement.PROTOCOL.name(), cachingExec, ChainElement.CACHING.name()); } @Override