diff options
author | Niclas Eklund <[email protected]> | 2010-05-28 12:00:00 +0200 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2010-08-20 08:55:16 +0200 |
commit | d5fa5e53b882cd9849034399ac769d2b7e7d3179 (patch) | |
tree | 9df0a6c0b516b182112aa1d4dcf466617060e19e /lib/ssh/doc/src/ssh.xml | |
parent | 8c78ac1382f089167afbf8d794cb9eff834577bd (diff) | |
download | otp-d5fa5e53b882cd9849034399ac769d2b7e7d3179.tar.gz otp-d5fa5e53b882cd9849034399ac769d2b7e7d3179.tar.bz2 otp-d5fa5e53b882cd9849034399ac769d2b7e7d3179.zip |
ssh: Patch 1119
OTP-8550 The function ssh:connect/4 was not exported.
OTP-8644 Aligned error message with used version (SSH_FX_FAILURE
vs SSH_FX_NOT_A_DIRECTORY, the latter introduced in version
6).
OTP-8645 Resolved race condition when another connection is started
before a channel is opened in the first connection.
OTP-8535 The configuration parameter ip_v6_disabled is now available,
which makes it possible for the user to alter the IP version
SSH shall use.
OTP-8534 The ssh_connection:send operation now accepts infinity as
timeout.
OTP-8524 The connection handler now include stack traces when a channel
message is not handled correctly.
Diffstat (limited to 'lib/ssh/doc/src/ssh.xml')
-rw-r--r-- | lib/ssh/doc/src/ssh.xml | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml index aca5c9cdc4..71e6b2cd3d 100644 --- a/lib/ssh/doc/src/ssh.xml +++ b/lib/ssh/doc/src/ssh.xml @@ -4,7 +4,7 @@ <erlref> <header> <copyright> - <year>2004</year><year>2009</year> + <year>2004</year><year>2010</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -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</title> @@ -159,6 +159,9 @@ <item> <p>Allow an existing file-descriptor to be used (simply passed on to the transport protocol).</p></item> + <tag><c><![CDATA[{ip_v6_disabled, boolean()}]]></c></tag> + <item> + <p>Determines if SSH shall use IPv6 or not.</p></item> </taglist> </desc> </func> @@ -198,8 +201,8 @@ <item> Provides specifications for handling of subsystems. The "sftp" subsystem-spec can be retrieved by calling - ssh_sftd:subsystem_spec/1. If the subsystems option in not present - the value of <c>[ssh_sftd:subsystem_spec([])]</c> will be used. + ssh_sftpd:subsystem_spec/1. If the subsystems option in not present + the value of <c>[ssh_sftpd:subsystem_spec([])]</c> will be used. It is of course possible to set the option to the empty list if you do not want the daemon to run any subsystems at all. </item> @@ -252,6 +255,10 @@ <item> <p>Allow an existing file-descriptor to be used (simply passed on to the transport protocol).</p></item> + <tag><c><![CDATA[{ip_v6_disabled, boolean()}]]></c></tag> + <item> + <p>Determines if SSH shall use IPv6 or not (only used when + HostAddress is set to any).</p></item> </taglist> </desc> </func> |