From e106e418efebbdd7c18b37a0025463b3d625513a Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Tue, 15 Mar 2016 10:13:16 +0100
Subject: inets: Mend ipv6_host_with_brackets option
This is a quick fix to make this option work.
We will revisit this and clean up httpc option handling later.
Also adding regression tests.
---
lib/inets/src/http_client/httpc.erl | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
(limited to 'lib')
diff --git a/lib/inets/src/http_client/httpc.erl b/lib/inets/src/http_client/httpc.erl
index e4a6f8f748..d4dfbfbd89 100644
--- a/lib/inets/src/http_client/httpc.erl
+++ b/lib/inets/src/http_client/httpc.erl
@@ -555,7 +555,7 @@ handle_request(Method, Url,
Request = #request{from = Receiver,
scheme = Scheme,
- address = {Host, Port},
+ address = {host_address(Host, BracketedHost), Port},
path = MaybeEscPath,
pquery = MaybeEscQuery,
method = Method,
@@ -1267,3 +1267,7 @@ child_name(Pid, [_ | Children]) ->
%% d(_, _, _) ->
%% ok.
+host_address(Host, false) ->
+ Host;
+host_address(Host, true) ->
+ string:strip(string:strip(Host, right, $]), left, $[).
--
cgit v1.2.3
From 71b4a270160681ff85f24f869e64f05d70e94fed Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Wed, 16 Mar 2016 11:44:11 +0100
Subject: inets: Prepare for release
---
lib/inets/src/inets_app/inets.appup.src | 2 ++
lib/inets/vsn.mk | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
(limited to 'lib')
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index a9fbb1c3f7..fc30a0fc10 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -18,10 +18,12 @@
%% %CopyrightEnd%
{"%VSN%",
[
+ {<<"6.1.1">>, [{load_module, httpc, soft_purge, soft_purge, []}]},
{<<"6\\..*">>,[{restart_application, inets}]},
{<<"5\\..*">>,[{restart_application, inets}]}
],
[
+ {<<"6.1.1">>, [{load_module, httpc, soft_purge, soft_purge, []}]},
{<<"6\\..*">>,[{restart_application, inets}]},
{<<"5\\..*">>,[{restart_application, inets}]}
]
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index ee5f41aaec..1c20627ec3 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -19,6 +19,6 @@
# %CopyrightEnd%
APPLICATION = inets
-INETS_VSN = 6.1.1
+INETS_VSN = 6.1.1.1
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
--
cgit v1.2.3
From 9693fd949ee12db29b2875bdfa1acf274814d35b Mon Sep 17 00:00:00 2001
From: Henrik Nord <henrik@erlang.org>
Date: Thu, 17 Mar 2016 12:27:53 +0100
Subject: Update release notes
---
lib/inets/doc/src/notes.xml | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
(limited to 'lib')
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 44e1ea9abe..259bcc5ff8 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -23,16 +23,25 @@
</legalnotice>
<title>Inets Release Notes</title>
- <prepared></prepared>
- <responsible></responsible>
- <docno></docno>
- <approved></approved>
- <checked></checked>
- <date>2002-02-28</date>
- <rev>A</rev>
<file>notes.xml</file>
</header>
+
+ <section><title>Inets 6.1.1.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Mend ipv6_host_with_brackets option in httpc</p>
+ <p>
+ Own Id: OTP-13417</p>
+ </item>
+ </list>
+ </section>
+
+ </section>
+
<section><title>Inets 6.1.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
--
cgit v1.2.3