diff options
| author | Andreas Sandblad <andreas.sandblad@sonyericsson.com> | 2010-07-30 09:06:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-30 09:06:02 -0700 |
| commit | 0c8300bccd4d1dfdf6b746d8d89ac526733f0181 (patch) | |
| tree | 7b75c46004b807f9a00d6bd39a35f03add671a49 | |
| parent | a0e668a50c1146a302cfdfad2d345c40ece31705 (diff) | |
| parent | 3b74bc0ac45043a6b559d44aa913de5803793a56 (diff) | |
| download | external_apache-http-0c8300bccd4d1dfdf6b746d8d89ac526733f0181.zip external_apache-http-0c8300bccd4d1dfdf6b746d8d89ac526733f0181.tar.gz external_apache-http-0c8300bccd4d1dfdf6b746d8d89ac526733f0181.tar.bz2 | |
am 3b74bc0a: am 301b1df2: am 9340bb2a: Fixed problem using HTTPS with Apache HTTP Client when using proxy
Merge commit '3b74bc0ac45043a6b559d44aa913de5803793a56' into dalvik-dev
* commit '3b74bc0ac45043a6b559d44aa913de5803793a56':
Fixed problem using HTTPS with Apache HTTP Client when using proxy
| -rw-r--r-- | src/org/apache/http/impl/conn/DefaultClientConnectionOperator.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/org/apache/http/impl/conn/DefaultClientConnectionOperator.java b/src/org/apache/http/impl/conn/DefaultClientConnectionOperator.java index 67e6bb0..fbc762d 100644 --- a/src/org/apache/http/impl/conn/DefaultClientConnectionOperator.java +++ b/src/org/apache/http/impl/conn/DefaultClientConnectionOperator.java @@ -223,7 +223,7 @@ public class DefaultClientConnectionOperator final Socket sock; try { sock = lsf.createSocket - (conn.getSocket(), target.getHostName(), target.getPort(), true); + (conn.getSocket(), target.getHostName(), schm.resolvePort(target.getPort()), true); } catch (ConnectException ex) { throw new HttpHostConnectException(target, ex); } |