aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-10-20 15:20:34 +0200
committerIngela Anderton Andin <[email protected]>2016-10-20 15:20:34 +0200
commitb53d40ec395c9901229715e5b7964ae59a3b1adf (patch)
tree803c9183f98b2f742f365bdbc68d9e3d9a0e3548 /lib/inets/src
parent8cddd5600870c64f27f555144804a1ff4104f7e6 (diff)
downloadotp-b53d40ec395c9901229715e5b7964ae59a3b1adf.tar.gz
otp-b53d40ec395c9901229715e5b7964ae59a3b1adf.tar.bz2
otp-b53d40ec395c9901229715e5b7964ae59a3b1adf.zip
inets: httpc - do not send absolute URIs over TLS tunnels
Proxies want absolut URIs, but once a TLS tunnel is set up it is like talking direct to the server.
Diffstat (limited to 'lib/inets/src')
-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 =