aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-11-18 11:00:37 +0100
committerIngela Anderton Andin <[email protected]>2016-11-18 11:00:37 +0100
commit041217c80f4880cb9ee3b626cc0339b5eb726b6e (patch)
tree1f3e9cd750eed60be10a462c6fcd6fa1e9a5c0df
parent0c84589f2b32018445ab7c1ee995c89e4ec1e836 (diff)
parent8658ca4b64f96f9691f0f0a70b02ff479fa50642 (diff)
downloadotp-041217c80f4880cb9ee3b626cc0339b5eb726b6e.tar.gz
otp-041217c80f4880cb9ee3b626cc0339b5eb726b6e.tar.bz2
otp-041217c80f4880cb9ee3b626cc0339b5eb726b6e.zip
Merge branch 'maint'
-rw-r--r--lib/inets/src/http_client/httpc_request.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/inets/src/http_client/httpc_request.erl b/lib/inets/src/http_client/httpc_request.erl
index e8d020c165..89872a3831 100644
--- a/lib/inets/src/http_client/httpc_request.erl
+++ b/lib/inets/src/http_client/httpc_request.erl
@@ -88,9 +88,11 @@ send(SendAddr, Socket, SocketType,
case Address of
SendAddr ->
{TmpHdrs2, Path ++ Query};
- _Proxy ->
+ _Proxy when SocketType == ip_comm ->
TmpHdrs3 = handle_proxy(HttpOptions, TmpHdrs2),
- {TmpHdrs3, AbsUri}
+ {TmpHdrs3, AbsUri};
+ _ ->
+ {TmpHdrs2, Path ++ Query}
end,
FinalHeaders =