diff options
| author | Niclas Eklund <[email protected]> | 2010-03-22 08:58:30 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-03-22 08:58:30 +0000 |
| commit | 14801bff88836ad47850c91287b3126f132b5d65 (patch) | |
| tree | 473bf02a87af9b61f0dda3027a03595633521140 /lib/ssh/src | |
| parent | bbafff92c639e227d9be204ed956f895d7c364e7 (diff) | |
| download | otp-14801bff88836ad47850c91287b3126f132b5d65.tar.gz otp-14801bff88836ad47850c91287b3126f132b5d65.tar.bz2 otp-14801bff88836ad47850c91287b3126f132b5d65.zip | |
The send operation now accepts infinity as timeout
Diffstat (limited to 'lib/ssh/src')
| -rw-r--r-- | lib/ssh/src/ssh.appup.src | 8 | ||||
| -rw-r--r-- | lib/ssh/src/ssh_connection.erl | 12 |
2 files changed, 13 insertions, 7 deletions
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src index 1a1a4b1b8b..b6004ad54a 100644 --- a/lib/ssh/src/ssh.appup.src +++ b/lib/ssh/src/ssh.appup.src @@ -19,8 +19,10 @@ {"%VSN%", [ - {"1.1.8", [{load_module, ssh_connection_manager, soft_purge, soft_purge, []}]}, + {"1.1.8", [{load_module, ssh_connection_manager, soft_purge, soft_purge, []}, + {load_module, ssh_connection, soft_purge, soft_purge, []}]}, {"1.1.7", [{load_module, ssh_connection_handler, soft_purge, soft_purge, []}, + {load_module, ssh_connection, soft_purge, soft_purge, []}, {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]}, {"1.1.6", [{restart_application, ssh}]}, {"1.1.5", [{restart_application, ssh}]}, @@ -29,8 +31,10 @@ {"1.1.2", [{restart_application, ssh}]} ], [ - {"1.1.8", [{load_module, ssh_connection_manager, soft_purge, soft_purge, []}]}, + {"1.1.8", [{load_module, ssh_connection_manager, soft_purge, soft_purge, []}, + {load_module, ssh_connection, soft_purge, soft_purge, []}]}, {"1.1.7", [{load_module, ssh_connection_handler, soft_purge, soft_purge, []}, + {load_module, ssh_connection, soft_purge, soft_purge, []}, {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]}, {"1.1.6", [{restart_application, ssh}]}, {"1.1.5", [{restart_application, ssh}]}, diff --git a/lib/ssh/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.erl index 0aaf1c18d2..b9827c90ea 100644 --- a/lib/ssh/src/ssh_connection.erl +++ b/lib/ssh/src/ssh_connection.erl @@ -1,19 +1,19 @@ %% %% %CopyrightBegin% -%% -%% Copyright Ericsson AB 2008-2009. All Rights Reserved. -%% +%% +%% 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% %% @@ -123,6 +123,8 @@ send(ConnectionManager, ChannelId, Data) -> send(ConnectionManager, ChannelId, 0, Data, infinity). send(ConnectionManager, ChannelId, Data, TimeOut) when is_integer(TimeOut) -> send(ConnectionManager, ChannelId, 0, Data, TimeOut); +send(ConnectionManager, ChannelId, Data, infinity) -> + send(ConnectionManager, ChannelId, 0, Data, infinity); send(ConnectionManager, ChannelId, Type, Data) -> send(ConnectionManager, ChannelId, Type, Data, infinity). send(ConnectionManager, ChannelId, Type, Data, TimeOut) -> |