From 14da05e194839842d516320e2ce9ca747e7c34b4 Mon Sep 17 00:00:00 2001 From: Fredrik Gustafsson 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(-) 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 dc5e0ede0f692000afc60c64ec428ea81ce67040 Mon Sep 17 00:00:00 2001 From: Fredrik Gustafsson Date: Thu, 27 Jun 2013 18:49:07 +0200 Subject: ssh: fixed bad match failure when disconnect msg --- lib/ssh/src/ssh_connection_handler.erl | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl index d8950a7b67..0ec0424f74 100644 --- a/lib/ssh/src/ssh_connection_handler.erl +++ b/lib/ssh/src/ssh_connection_handler.erl @@ -419,10 +419,16 @@ userauth(#ssh_msg_userauth_failure{authentications = Methodes}, #state{ssh_params = #ssh{role = client, userauth_methods = none} = Ssh0} = State) -> AuthMethods = string:tokens(Methodes, ","), - {Msg, Ssh} = ssh_auth:userauth_request_msg( - Ssh0#ssh{userauth_methods = AuthMethods}), - send_msg(Msg, State), - {next_state, userauth, next_packet(State#state{ssh_params = Ssh})}; + case ssh_auth:userauth_request_msg( + Ssh0#ssh{userauth_methods = AuthMethods}) of + {disconnect, DisconnectMsg,{Msg, Ssh}} -> + send_msg(Msg, State), + handle_disconnect(DisconnectMsg, State#state{ssh_params = Ssh}); + {Msg, Ssh} -> + send_msg(Msg, State), + {next_state, userauth, next_packet(State#state{ssh_params = Ssh})} + end; + %% The prefered authentication method failed try next method userauth(#ssh_msg_userauth_failure{}, -- cgit v1.2.3 From 8f5992f826b86e5a4f28a8feae10a6a678f07065 Mon Sep 17 00:00:00 2001 From: Fredrik Gustafsson Date: Fri, 28 Jun 2013 10:36:08 +0200 Subject: ssh: version updates --- lib/ssh/src/ssh.appup.src | 2 ++ lib/ssh/vsn.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src index d99931c746..08851dc445 100644 --- a/lib/ssh/src/ssh.appup.src +++ b/lib/ssh/src/ssh.appup.src @@ -19,12 +19,14 @@ {"%VSN%", [ + {<<"2.1.2">>, [{restart_application, ssh}]}, {<<"2.1.1">>, [{restart_application, ssh}]}, {<<"2.1">>, [{restart_application, ssh}]}, {<<"2.0\\.*">>, [{restart_application, ssh}]}, {<<"1\\.*">>, [{restart_application, ssh}]} ], [ + {<<"2.1.2">>, [{restart_application, ssh}]}, {<<"2.1.1">>, [{restart_application, ssh}]}, {<<"2.1">>,[{restart_application, ssh}]}, {<<"2.0\\.*">>, [{restart_application, ssh}]}, diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk index 921ec2206a..37353707c2 100644 --- a/lib/ssh/vsn.mk +++ b/lib/ssh/vsn.mk @@ -1,5 +1,5 @@ #-*-makefile-*- ; force emacs to enter makefile-mode -SSH_VSN = 2.1.2 +SSH_VSN = 2.1.2.1 APP_VSN = "ssh-$(SSH_VSN)" -- cgit v1.2.3 From dd7fc6e5b92dd85a70e6300bba60469222a04629 Mon Sep 17 00:00:00 2001 From: Fredrik Gustafsson 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(-) 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 Date: Fri, 28 Jun 2013 10:51:27 +0200 Subject: Update release notes --- lib/inets/doc/src/notes.xml | 17 ++++++++++++++++- lib/ssh/doc/src/notes.xml | 16 ++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) 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 @@ -
Inets 5.9.2 +
Inets 5.9.2.1 + +
Improvements and New Features + + +

+ Fixed obsolete error report in inets.

+

+ Own Id: OTP-11185 Aux Id: seq12357

+ + +
+ +
+ +
Inets 5.9.2
Improvements and New Features diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml index d4acb2ef1a..6e7d76c137 100644 --- a/lib/ssh/doc/src/notes.xml +++ b/lib/ssh/doc/src/notes.xml @@ -29,6 +29,22 @@ notes.xml +
Ssh 2.1.2.1 + +
Improvements and New Features + + +

+ Removed error report in ssh_connection_handler triggered + by badmatch failure.

+

+ Own Id: OTP-11188

+ + +
+ +
+
Ssh 2.1.2
Fixed Bugs and Malfunctions -- cgit v1.2.3