From 640a6cd4f9cdc145afa26809834034ec4e3d2f94 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin
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 85663b5ded..4554881d79 100644
--- a/lib/inets/src/http_client/httpc.erl
+++ b/lib/inets/src/http_client/httpc.erl
@@ -556,7 +556,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,
@@ -1268,3 +1268,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 18128ff4e9ff7bd1fcb960edf084f8db839bdd8d Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson
Date: Thu, 17 Mar 2016 10:23:41 +0100
Subject: mnesia: Send mnesia_down messages to waiting transactions
Mnesia didn't forward mnesia_down to transactions which where already
decided to be aborted, but that could lead to hanging transactions
still waiting for messages from the node which had stopped.
---
lib/mnesia/src/mnesia_tm.erl | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
(limited to 'lib')
diff --git a/lib/mnesia/src/mnesia_tm.erl b/lib/mnesia/src/mnesia_tm.erl
index e7ee938312..1d3eb87036 100644
--- a/lib/mnesia/src/mnesia_tm.erl
+++ b/lib/mnesia/src/mnesia_tm.erl
@@ -1692,13 +1692,10 @@ commit_participant(Coord, Tid, Bin, C0, DiscNs, _RamNs) ->
?eval_debug_fun({?MODULE, commit_participant, undo_prepare},
[{tid, Tid}]);
- {'EXIT', _, _} ->
+ {'EXIT', _MnesiaTM, Reason} ->
+ reply(Coord, {do_abort, Tid, self(), {bad_commit,Reason}}),
mnesia_recover:log_decision(D#decision{outcome = aborted}),
- ?eval_debug_fun({?MODULE, commit_participant, exit_log_abort},
- [{tid, Tid}]),
- mnesia_schema:undo_prepare_commit(Tid, C0),
- ?eval_debug_fun({?MODULE, commit_participant, exit_undo_prepare},
- [{tid, Tid}]);
+ mnesia_schema:undo_prepare_commit(Tid, C0);
Msg ->
verbose("** ERROR ** commit_participant ~p, got unexpected msg: ~p~n",
@@ -2210,8 +2207,6 @@ reconfigure_coordinators(N, [{Tid, [Store | _]} | Coordinators]) ->
true ->
send_mnesia_down(Tid, Store, N)
end;
- aborted ->
- ignore; % avoid spurious mnesia_down messages
_ ->
%% Tell the coordinator about the mnesia_down
send_mnesia_down(Tid, Store, N)
--
cgit v1.2.3
From b9c0ace0ca8a7ef8f6abe3acaf479716f9ea0f62 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin
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..6baecfe7a4 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.2">>, [{load_module, httpc, soft_purge, soft_purge, []}]},
{<<"6\\..*">>,[{restart_application, inets}]},
{<<"5\\..*">>,[{restart_application, inets}]}
],
[
+ {<<"6.2">>, [{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 3d25b328af..df2359e012 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -19,6 +19,6 @@
# %CopyrightEnd%
APPLICATION = inets
-INETS_VSN = 6.2
+INETS_VSN = 6.2.1
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
--
cgit v1.2.3
From 7765727317721d5de5949a5f39e0211f3b920da7 Mon Sep 17 00:00:00 2001
From: Erlang/OTP
Date: Fri, 1 Apr 2016 20:19:12 +0200
Subject: Prepare release
---
lib/inets/doc/src/notes.xml | 17 ++++++++++++++++-
lib/mnesia/doc/src/notes.xml | 18 +++++++++++++++++-
lib/mnesia/vsn.mk | 2 +-
3 files changed, 34 insertions(+), 3 deletions(-)
(limited to 'lib')
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 25b427a036..2ff8554afd 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,7 +33,22 @@
notes.xml
- Inets 6.2
+ Inets 6.2.1
+
+ Fixed Bugs and Malfunctions
+
+ -
+
+ Mend ipv6_host_with_brackets option in httpc
+
+ Own Id: OTP-13417
+
+
+
+
+
+
+Inets 6.2
Fixed Bugs and Malfunctions
diff --git a/lib/mnesia/doc/src/notes.xml b/lib/mnesia/doc/src/notes.xml
index 149cd69559..18bb110104 100644
--- a/lib/mnesia/doc/src/notes.xml
+++ b/lib/mnesia/doc/src/notes.xml
@@ -39,7 +39,23 @@
thus constitutes one section in this document. The title of each
section is the version number of Mnesia.
- Mnesia 4.13.3
+ Mnesia 4.13.4
+
+ Fixed Bugs and Malfunctions
+
+ -
+
+ Mnesia transactions could hang while waiting on a
+ response from a node who had stopped.
+
+ Own Id: OTP-13423
+
+
+
+
+
+
+Mnesia 4.13.3
Fixed Bugs and Malfunctions
diff --git a/lib/mnesia/vsn.mk b/lib/mnesia/vsn.mk
index 843d9d18d4..194bc439a0 100644
--- a/lib/mnesia/vsn.mk
+++ b/lib/mnesia/vsn.mk
@@ -1 +1 @@
-MNESIA_VSN = 4.13.3
+MNESIA_VSN = 4.13.4
--
cgit v1.2.3