diff options
| author | Andreas Sandblad <andreas.sandblad@sonyericsson.com> | 2010-07-30 09:00:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-30 09:00:37 -0700 |
| commit | 3b74bc0ac45043a6b559d44aa913de5803793a56 (patch) | |
| tree | d6f0ffcf7d074ec8d86131bde978c0c76ed6ac64 | |
| parent | 18a021c6d6e877e28ac55ffe2d06b7563605c7a0 (diff) | |
| parent | 301b1df2f0b25ef56a640840742c981623faf20f (diff) | |
| download | external_apache-http-3b74bc0ac45043a6b559d44aa913de5803793a56.zip external_apache-http-3b74bc0ac45043a6b559d44aa913de5803793a56.tar.gz external_apache-http-3b74bc0ac45043a6b559d44aa913de5803793a56.tar.bz2 | |
am 301b1df2: am 9340bb2a: Fixed problem using HTTPS with Apache HTTP Client when using proxy
Merge commit '301b1df2f0b25ef56a640840742c981623faf20f'
* commit '301b1df2f0b25ef56a640840742c981623faf20f':
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); } |