hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r829807 - in /httpcomponents/httpclient/branches/4.0.x: RELEASE_NOTES.txt httpclient/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java
Date Mon, 26 Oct 2009 14:08:11 GMT
Author: olegk
Date: Mon Oct 26 14:08:11 2009
New Revision: 829807

URL: http://svn.apache.org/viewvc?rev=829807&view=rev
Log:
HTTPCLIENT-883: SO_TIMEOUT is not reset on persistent (re-used) connections

Modified:
    httpcomponents/httpclient/branches/4.0.x/RELEASE_NOTES.txt
    httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java

Modified: httpcomponents/httpclient/branches/4.0.x/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.0.x/RELEASE_NOTES.txt?rev=829807&r1=829806&r2=829807&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.0.x/RELEASE_NOTES.txt (original)
+++ httpcomponents/httpclient/branches/4.0.x/RELEASE_NOTES.txt Mon Oct 26 14:08:11 2009
@@ -2,6 +2,9 @@
 Changes since 4.0
 -------------------
 
+* [HTTPCLIENT-883] SO_TIMEOUT is not reset on persistent (re-used) connections.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
 * [HTTPCLIENT-882] Auth state is not correctly updated if a successful NTLM 
   authentication results in a redirect. This is a minor bug as HttpClient manages
   to recover from the problem automatically.

Modified: httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java?rev=829807&r1=829806&r2=829807&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java
(original)
+++ httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java
Mon Oct 26 14:08:11 2009
@@ -379,7 +379,9 @@
                 // Reopen connection if needed
                 if (!managedConn.isOpen()) {
                     managedConn.open(route, context, params);
-                } 
+                } else {
+                    managedConn.setSocketTimeout(HttpConnectionParams.getSoTimeout(params));
+                }
                 
                 try {
                     establishRoute(route, context);



Mime
View raw message