aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-07-01 16:34:52 +0200
committerFredrik Gustafsson <[email protected]>2013-07-01 16:34:52 +0200
commitb869f69e056c1e9d8850c51bb51fca03aa7d5962 (patch)
tree34e526bf2f1d2362903cf88712328f51ce471c73 /lib/inets/src
parentcc6e4b6ce7c2c82fb3039a9e6d46a2c90fd45cf2 (diff)
parentadc8b048e72ad774a431b32088b4df8b47d509f8 (diff)
downloadotp-b869f69e056c1e9d8850c51bb51fca03aa7d5962.tar.gz
otp-b869f69e056c1e9d8850c51bb51fca03aa7d5962.tar.bz2
otp-b869f69e056c1e9d8850c51bb51fca03aa7d5962.zip
Merge branch 'maint-r16' into maint
Diffstat (limited to 'lib/inets/src')
-rw-r--r--lib/inets/src/http_server/httpd_manager.erl33
1 files changed, 2 insertions, 31 deletions
diff --git a/lib/inets/src/http_server/httpd_manager.erl b/lib/inets/src/http_server/httpd_manager.erl
index c83d06a158..00384fa108 100644
--- a/lib/inets/src/http_server/httpd_manager.erl
+++ b/lib/inets/src/http_server/httpd_manager.erl
@@ -507,37 +507,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)}.
%% -------------------------------------------------------------------------