summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Sandblad <andreas.sandblad@sonyericsson.com>2010-07-30 08:59:26 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-30 08:59:26 -0700
commit301b1df2f0b25ef56a640840742c981623faf20f (patch)
tree4d05155531e7849126cb313504b8a9dc20bdc503 /src
parent3cb0a1255c395895fe34ce01c279b88103200ccb (diff)
parent9340bb2a4b5f828b418c0e77492dde148623c938 (diff)
downloadexternal_apache-http-301b1df2f0b25ef56a640840742c981623faf20f.zip
external_apache-http-301b1df2f0b25ef56a640840742c981623faf20f.tar.gz
external_apache-http-301b1df2f0b25ef56a640840742c981623faf20f.tar.bz2
am 9340bb2a: Fixed problem using HTTPS with Apache HTTP Client when using proxy
Merge commit '9340bb2a4b5f828b418c0e77492dde148623c938' into gingerbread-plus-aosp * commit '9340bb2a4b5f828b418c0e77492dde148623c938': Fixed problem using HTTPS with Apache HTTP Client when using proxy
Diffstat (limited to 'src')
-rw-r--r--src/org/apache/http/impl/conn/DefaultClientConnectionOperator.java2
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);
}