diff options
| author | Erlang/OTP <[email protected]> | 2013-06-28 10:49:59 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2013-06-28 10:49:59 +0200 |
| commit | a2e2e18a2ee5164d1fe16f524acaa11f73d2e025 (patch) | |
| tree | 74ef042cca6bb3bc9dad2b35c69d4465c9ede4b4 | |
| parent | 48c0c1699cff4ebd7e6750af4f1085ed9a48d005 (diff) | |
| parent | dd7fc6e5b92dd85a70e6300bba60469222a04629 (diff) | |
| download | otp-a2e2e18a2ee5164d1fe16f524acaa11f73d2e025.tar.gz otp-a2e2e18a2ee5164d1fe16f524acaa11f73d2e025.tar.bz2 otp-a2e2e18a2ee5164d1fe16f524acaa11f73d2e025.zip | |
Merge branch 'fredrik/inets/httpd_manager_reports/OTP-11185' into maint-r15
* fredrik/inets/httpd_manager_reports/OTP-11185:
inets: version updates
inets: removed obsolete code
| -rw-r--r-- | lib/inets/src/http_server/httpd_manager.erl | 33 | ||||
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 10 | ||||
| -rw-r--r-- | lib/inets/vsn.mk | 2 |
3 files changed, 13 insertions, 32 deletions
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)}. %% ------------------------------------------------------------------------- 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)" |