From 14da05e194839842d516320e2ce9ca747e7c34b4 Mon Sep 17 00:00:00 2001
From: Fredrik Gustafsson <fredrik@erlang.org>
Date: Thu, 27 Jun 2013 14:44:40 +0200
Subject: inets: removed obsolete code
---
lib/inets/src/http_server/httpd_manager.erl | 33 ++---------------------------
1 file changed, 2 insertions(+), 31 deletions(-)
(limited to 'lib/inets')
diff --git a/lib/inets/src/http_server/httpd_manager.erl b/lib/inets/src/http_server/httpd_manager.erl
index b44bc77c41..7bafc3f7f3 100644
--- a/lib/inets/src/http_server/httpd_manager.erl
+++ b/lib/inets/src/http_server/httpd_manager.erl
@@ -505,37 +505,8 @@ code_change(_FromVsn, State, _Extra) ->
check_connections(#state{connections = []} = State, _Pid, _Reason) ->
State;
-check_connections(#state{admin_state = shutting_down,
- connections = Connections} = State, Pid, Reason) ->
- %% Could be a crashing request handler
- case lists:delete(Pid, Connections) of
- [] -> % Crashing request handler => block complete
- String =
- lists:flatten(
- io_lib:format("request handler (~p) crashed:"
- "~n ~p", [Pid, Reason])),
- report_error(State, String),
- demonitor_blocker(State#state.blocker_ref),
- {Tmr,From,Ref} = State#state.blocking_tmr,
- stop_block_tmr(Tmr),
- From ! {block_reply,ok,Ref},
- State#state{admin_state = blocked, connections = [],
- blocker_ref = undefined};
- Connections1 ->
- State#state{connections = Connections1}
- end;
-check_connections(#state{connections = Connections} = State, Pid, Reason) ->
- case lists:delete(Pid, Connections) of
- Connections -> % Not a request handler, so ignore
- State;
- NewConnections ->
- String =
- lists:flatten(
- io_lib:format("request handler (~p) crashed:"
- "~n ~p", [Pid, Reason])),
- report_error(State, String),
- State#state{connections = NewConnections}
- end.
+check_connections(#state{connections = Connections} = State, Pid, _Reason) ->
+ State#state{connections = lists:delete(Pid, Connections)}.
%% -------------------------------------------------------------------------
--
cgit v1.2.3
From dd7fc6e5b92dd85a70e6300bba60469222a04629 Mon Sep 17 00:00:00 2001
From: Fredrik Gustafsson <fredrik@erlang.org>
Date: Fri, 28 Jun 2013 10:47:20 +0200
Subject: inets: version updates
---
lib/inets/src/inets_app/inets.appup.src | 10 ++++++++++
lib/inets/vsn.mk | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
(limited to 'lib/inets')
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index ffd0ed622f..2995a2f712 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -18,6 +18,11 @@
{"%VSN%",
[
+ {"5.9.2",
+ [
+ {load_module, httpd_manager, soft_purge, soft_purge, []}
+ ]
+ },
{"5.9.1",
[
{load_module, httpd_request_handler, soft_purge, soft_purge, []}
@@ -71,6 +76,11 @@
}
],
[
+ {"5.9.2",
+ [
+ {load_module, httpd_manager, soft_purge, soft_purge, []}
+ ]
+ },
{"5.9.1",
[
{load_module, httpd_request_handler, soft_purge, soft_purge, []}
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index 0c7cb5e7c2..525d3847e6 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -18,7 +18,7 @@
# %CopyrightEnd%
APPLICATION = inets
-INETS_VSN = 5.9.2
+INETS_VSN = 5.9.2.1
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
--
cgit v1.2.3
From 90f6229822c720d7616f9a11d1ca51e522586564 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Fri, 28 Jun 2013 10:51:27 +0200
Subject: Update release notes
---
lib/inets/doc/src/notes.xml | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
(limited to 'lib/inets')
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index e0d6ae3454..2fd50417a3 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,7 +33,22 @@
</header>
- <section><title>Inets 5.9.2</title>
+ <section><title>Inets 5.9.2.1</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Fixed obsolete error report in inets.</p>
+ <p>
+ Own Id: OTP-11185 Aux Id: seq12357 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Inets 5.9.2</title>
<section><title>Improvements and New Features</title>
<list>
--
cgit v1.2.3