aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-12-05 18:23:11 +0100
committerIngela Anderton Andin <[email protected]>2016-12-05 18:23:11 +0100
commitdf2f089ad064f502b8797f53640acdc46187862c (patch)
tree483daece0220613c7d5d6e1c5caa932b00b164e3
parent72e702e079d82a7d6bcf3862e9d5e45e5fbb2545 (diff)
parentf015c1ae35a94ca52e80ceae7a76806fe848a553 (diff)
downloadotp-df2f089ad064f502b8797f53640acdc46187862c.tar.gz
otp-df2f089ad064f502b8797f53640acdc46187862c.tar.bz2
otp-df2f089ad064f502b8797f53640acdc46187862c.zip
Merge branch 'maint'
-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,