hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1486894 - in /httpcomponents/httpclient/branches/4.2.x: RELEASE_NOTES.txt httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
Date Tue, 28 May 2013 12:01:21 GMT
Author: olegk
Date: Tue May 28 12:01:21 2013
New Revision: 1486894

URL: http://svn.apache.org/r1486894
Log:
HTTPCLIENT-1357: Connection upgrade operation does not resolve default port (-1) to a scheme
default value which can lead to a InvalidArgumentException on some platforms

Modified:
    httpcomponents/httpclient/branches/4.2.x/RELEASE_NOTES.txt
    httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java

Modified: httpcomponents/httpclient/branches/4.2.x/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.2.x/RELEASE_NOTES.txt?rev=1486894&r1=1486893&r2=1486894&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.2.x/RELEASE_NOTES.txt (original)
+++ httpcomponents/httpclient/branches/4.2.x/RELEASE_NOTES.txt Tue May 28 12:01:21 2013
@@ -1,6 +1,10 @@
 Changes since Release 4.2.5
 -------------------
 
+* [HTTPCLIENT-1357] Connection upgrade operation does not resolve default port (-1) to a
scheme 
+  default value which can lead to a InvalidArgumentException on some platforms. 
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
 * [HTTPCLIENT-1349] SSLSocketFactory incorrectly identifies key passed with keystore as 
   the keystore password.
   Contributed by David Graff <djgraff209 at gmail.com>

Modified: httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java?rev=1486894&r1=1486893&r2=1486894&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
(original)
+++ httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
Tue May 28 12:01:21 2013
@@ -230,7 +230,7 @@ public class DefaultClientConnectionOper
         Socket sock;
         try {
             sock = lsf.createLayeredSocket(
-                    conn.getSocket(), target.getHostName(), target.getPort(), params);
+                    conn.getSocket(), target.getHostName(), schm.resolvePort(target.getPort()),
params);
         } catch (ConnectException ex) {
             throw new HttpHostConnectException(target, ex);
         }



Mime
View raw message