diff options
author | Ingela Anderton Andin <[email protected]> | 2012-10-04 15:11:12 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2012-10-04 15:11:12 +0200 |
commit | a24c49aec663f19092cf0d2062af19523666d291 (patch) | |
tree | 54efc5788839a01e86a79987396f31c99aa03bb7 /lib/ssh/doc/src/ssh_connection.xml | |
parent | 8bac6930f5611a4def1306504715723303517948 (diff) | |
parent | 9e7e31c9011e1a63957b48b794b0c72669c081ae (diff) | |
download | otp-a24c49aec663f19092cf0d2062af19523666d291.tar.gz otp-a24c49aec663f19092cf0d2062af19523666d291.tar.bz2 otp-a24c49aec663f19092cf0d2062af19523666d291.zip |
Merge branch 'ia/ssh/sending-large-data-and-eof/OTP-10467'
* ia/ssh/sending-large-data-and-eof/OTP-10467:
ssh: Make test case platform independant
ssh: ssh_connection:channel_data() and send_eof() now return {error, closed} for closed or invalid channels.
ssh: Ensure that all data is sent before ssh:send returns.
ssh: add test suite for testing channel send/receive behavior.
Diffstat (limited to 'lib/ssh/doc/src/ssh_connection.xml')
-rw-r--r-- | lib/ssh/doc/src/ssh_connection.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssh/doc/src/ssh_connection.xml b/lib/ssh/doc/src/ssh_connection.xml index 9942306b93..a9ae13d556 100644 --- a/lib/ssh/doc/src/ssh_connection.xml +++ b/lib/ssh/doc/src/ssh_connection.xml @@ -196,7 +196,7 @@ <name>send(ConnectionRef, ChannelId, Data, Timeout) -></name> <name>send(ConnectionRef, ChannelId, Type, Data) -></name> <name>send(ConnectionRef, ChannelId, Type, Data, TimeOut) -> - ok | {error, timeout}</name> + ok | {error, timeout} | {error, closed}</name> <fsummary>Sends channel data </fsummary> <type> <v> ConnectionRef = ssh_connection_ref() </v> @@ -212,7 +212,7 @@ </func> <func> - <name>send_eof(ConnectionRef, ChannelId) -> ok </name> + <name>send_eof(ConnectionRef, ChannelId) -> ok | {error, closed}</name> <fsummary>Sends eof on the channel <c>ChannelId</c>. </fsummary> <type> <v> ConnectionRef = ssh_connection_ref() </v> |