aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh
diff options
context:
space:
mode:
authorNiclas Eklund <[email protected]>2010-07-13 12:00:00 +0200
committerBjörn Gustavsson <[email protected]>2010-08-23 14:12:38 +0200
commitab325a413370057ecf142448dffea56d28616f47 (patch)
tree94dc57ba16782030d9cb9bf876b973378ccff972 /lib/ssh
parentcc621c57ce7c41c2b46a103136575bca445aedd0 (diff)
downloadotp-ab325a413370057ecf142448dffea56d28616f47.tar.gz
otp-ab325a413370057ecf142448dffea56d28616f47.tar.bz2
otp-ab325a413370057ecf142448dffea56d28616f47.zip
ssh: Patch 1127
OTP-8735 SSH in some cases generated a crash report when a channel was closed in a normal way.
Diffstat (limited to 'lib/ssh')
-rw-r--r--lib/ssh/doc/src/notes.xml20
-rw-r--r--lib/ssh/src/ssh.appup.src16
-rw-r--r--lib/ssh/src/ssh_connection_manager.erl16
-rw-r--r--lib/ssh/vsn.mk6
4 files changed, 43 insertions, 15 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index dad3239d45..ce18cabfb5 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -13,12 +13,12 @@
compliance with the License. You should have received a copy of the
Erlang Public License along with this software. If not, it can be
retrieved online at http://www.erlang.org/.
-
+
Software distributed under the License is distributed on an "AS IS"
basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
the License for the specific language governing rights and limitations
under the License.
-
+
</legalnotice>
<title>SSH Release Notes</title>
@@ -29,6 +29,22 @@
<file>notes.xml</file>
</header>
+ <section><title>Ssh 1.1.11</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ SSH in some cases generated a crash report when a channel
+ was closed in a normal way.</p>
+ <p>
+ Own Id: OTP-8735 Aux Id: seq11615</p>
+ </item>
+ </list>
+ </section>
+
+ </section>
+
<section><title>Ssh 1.1.10</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 1042355112..82114c9afd 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -1,25 +1,27 @@
%%
%% %CopyrightBegin%
-%%
+%%
%% Copyright Ericsson AB 2004-2010. All Rights Reserved.
-%%
+%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
%% compliance with the License. You should have received a copy of the
%% Erlang Public License along with this software. If not, it can be
%% retrieved online at http://www.erlang.org/.
-%%
+%%
%% Software distributed under the License is distributed on an "AS IS"
%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
%% the License for the specific language governing rights and limitations
%% under the License.
-%%
+%%
%% %CopyrightEnd%
%%
{"%VSN%",
[
- {"1.1.9", [{load_module, ssh_channel, soft_purge, soft_purge, []}]},
+ {"1.1.10", [{load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
+ {"1.1.9", [{load_module, ssh_channel, soft_purge, soft_purge, []},
+ {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
{"1.1.8", [{restart_application, ssh}]},
{"1.1.7", [{restart_application, ssh}]},
{"1.1.6", [{restart_application, ssh}]},
@@ -29,7 +31,9 @@
{"1.1.2", [{restart_application, ssh}]}
],
[
- {"1.1.9", [{load_module, ssh_channel, soft_purge, soft_purge, []}]},
+ {"1.1.10", [{load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
+ {"1.1.9", [{load_module, ssh_channel, soft_purge, soft_purge, []},
+ {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
{"1.1.8", [{restart_application, ssh}]},
{"1.1.7", [{restart_application, ssh}]},
{"1.1.6", [{restart_application, ssh}]},
diff --git a/lib/ssh/src/ssh_connection_manager.erl b/lib/ssh/src/ssh_connection_manager.erl
index cffeade485..9e55312e5f 100644
--- a/lib/ssh/src/ssh_connection_manager.erl
+++ b/lib/ssh/src/ssh_connection_manager.erl
@@ -1,19 +1,19 @@
%%
%% %CopyrightBegin%
-%%
+%%
%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
-%%
+%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
%% compliance with the License. You should have received a copy of the
%% Erlang Public License along with this software. If not, it can be
%% retrieved online at http://www.erlang.org/.
-%%
+%%
%% Software distributed under the License is distributed on an "AS IS"
%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
%% the License for the specific language governing rights and limitations
%% under the License.
-%%
+%%
%% %CopyrightEnd%
%%
%%
@@ -146,6 +146,8 @@ adjust_window(ConnectionManager, Channel, Bytes) ->
close(ConnectionManager, ChannelId) ->
try call(ConnectionManager, {close, ChannelId}) of
ok ->
+ ok;
+ {error,normal} ->
ok
catch
exit:{noproc, _} ->
@@ -155,6 +157,8 @@ close(ConnectionManager, ChannelId) ->
stop(ConnectionManager) ->
try call(ConnectionManager, stop) of
ok ->
+ ok;
+ {error,normal} ->
ok
catch
exit:{noproc, _} ->
@@ -593,7 +597,9 @@ call(Pid, Msg, Timeout) ->
Result
catch
exit:{timeout, _} ->
- {error, timeout}
+ {error, timeout};
+ exit:{normal, _} ->
+ {error, normal}
end.
cast(Pid, Msg) ->
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 55340a2aa4..8e31851a8e 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,9 +1,11 @@
#-*-makefile-*- ; force emacs to enter makefile-mode
-SSH_VSN = 1.1.10
+SSH_VSN = 1.1.11
APP_VSN = "ssh-$(SSH_VSN)"
-TICKETS = OTP-8714
+TICKETS = OTP-8735
+
+TICKETS_1.1.10 = OTP-8714
TICKETS_1.1.9 = OTP-8524 \
OTP-8534 \