diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-11-18 10:59:50 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-11-18 10:59:50 +0100 |
| commit | 8658ca4b64f96f9691f0f0a70b02ff479fa50642 (patch) | |
| tree | ee65582543bc07edea1bb07642d47072bd2406bb /lib/inets | |
| parent | 8fc527964d8fee17b9c10ce2516b3eb749332334 (diff) | |
| parent | b53d40ec395c9901229715e5b7964ae59a3b1adf (diff) | |
| download | otp-8658ca4b64f96f9691f0f0a70b02ff479fa50642.tar.gz otp-8658ca4b64f96f9691f0f0a70b02ff479fa50642.tar.bz2 otp-8658ca4b64f96f9691f0f0a70b02ff479fa50642.zip | |
Merge branch 'ingela/httpc/keep-alive-https/OTP-14041' into maint
* ingela/httpc/keep-alive-https/OTP-14041:
inets: httpc - do not send absolute URIs over TLS tunnels
Diffstat (limited to 'lib/inets')
| -rw-r--r-- | lib/inets/src/http_client/httpc_request.erl | 6 |
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 = |