diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index d514c8453..ac50d4cc2 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -1,3 +1,10 @@ +Changes since 4.2 +------------------- + +* [HTTPCLIENT-1193] Fixed regression in the route tracking logic of the default connection manager + causing cross-site redirect failures. + Contributed by Oleg Kalnichevski + Release 4.2 ------------------- diff --git a/httpclient/src/main/java/org/apache/http/impl/conn/BasicClientConnectionManager.java b/httpclient/src/main/java/org/apache/http/impl/conn/BasicClientConnectionManager.java index 9d1eac977..b4d645c1d 100644 --- a/httpclient/src/main/java/org/apache/http/impl/conn/BasicClientConnectionManager.java +++ b/httpclient/src/main/java/org/apache/http/impl/conn/BasicClientConnectionManager.java @@ -162,7 +162,7 @@ public class BasicClientConnectionManager implements ClientConnectionManager { } if (this.poolEntry != null && !this.poolEntry.getPlannedRoute().equals(route)) { this.poolEntry.close(); - this.poolEntry.getTracker().reset(); + this.poolEntry = null; } if (this.poolEntry == null) { String id = Long.toString(COUNTER.getAndIncrement());