The send operation now accepts infinity as timeout

4 files changed, 19 insertions, 8 deletions

diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index b3484a1e98..6ea7f099b3 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -34,6 +34,10 @@
     <section><title>Improvements and New Features</title>
       <list>
         <item>
+          <p>The ssh_connection:send operation now accepts infinity as timeout.</p>
+          <p>Own Id: OTP-8534 Aux Id:</p>
+        </item>
+        <item>
           <p>The connection handler now include stack traces when a channel 
              message is not handled correctly.</p>
           <p>Own Id: OTP-8524 Aux Id:</p>
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) ->
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 5c6af2e621..5538b950b3 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -3,7 +3,8 @@
 SSH_VSN = 1.1.9
 APP_VSN    = "ssh-$(SSH_VSN)"
 
-TICKETS = OTP-8524
+TICKETS = OTP-8524 \
+	OTP-8534
 
 TICKETS_1.1.8 = OTP-8356 \
 	OTP-8401