aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-12-05 18:22:49 +0100
committerIngela Anderton Andin <[email protected]>2016-12-05 18:22:49 +0100
commitf015c1ae35a94ca52e80ceae7a76806fe848a553 (patch)
treee861702527d60cc65df1d7a194efa43fd997b5a8
parente82b03e0d9384d210a271e43634e7b4c3d3d0fe9 (diff)
parent740287d0899a137efa5635bdb7d228f4abf0aeb8 (diff)
downloadotp-f015c1ae35a94ca52e80ceae7a76806fe848a553.tar.gz
otp-f015c1ae35a94ca52e80ceae7a76806fe848a553.tar.bz2
otp-f015c1ae35a94ca52e80ceae7a76806fe848a553.zip
Merge branch 'emj/report-tunnel-errors/PR-1254' into maint
* emj/report-tunnel-errors/PR-1254: Report errors from TLS tunnel request to correct process
-rw-r--r--lib/inets/src/http_client/httpc_handler.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl
index 59cb1299e9..a09019f6ad 100644
--- a/lib/inets/src/http_client/httpc_handler.erl
+++ b/lib/inets/src/http_client/httpc_handler.erl
@@ -1749,14 +1749,16 @@ tls_tunnel(Address, Request, #state{session = #session{socket = Socket,
tls_tunnel_request(#request{headers = Headers,
settings = Options,
+ id = RequestId,
+ from = From,
address = {Host, Port}= Adress,
ipv6_host_with_brackets = IPV6}) ->
URI = Host ++":" ++ integer_to_list(Port),
#request{
- id = make_ref(),
- from = self(),
+ id = RequestId,
+ from = From,
scheme = http, %% Use tcp-first and then upgrade!
address = Adress,
path = URI,