diff options
author | Zandra Hird <[email protected]> | 2015-04-10 14:51:04 +0200 |
---|---|---|
committer | Zandra Hird <[email protected]> | 2015-04-10 14:51:04 +0200 |
commit | b5f3973cc50a193be868e672b2ced6dd619427c4 (patch) | |
tree | bfe20ffc467ef3c535fd5580f89cc4c1ab8ca818 /lib/ssh/doc | |
parent | 5c2c2f537e66f1637eb51b364cb962a69a7b0faf (diff) | |
parent | bbac1019905e6e493a2cd3c8463e53a818d0723d (diff) | |
download | otp-b5f3973cc50a193be868e672b2ced6dd619427c4.tar.gz otp-b5f3973cc50a193be868e672b2ced6dd619427c4.tar.bz2 otp-b5f3973cc50a193be868e672b2ced6dd619427c4.zip |
Merge branch 'maint-17'
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib/ssh/doc')
-rw-r--r-- | lib/ssh/doc/src/notes.xml | 22 | ||||
-rw-r--r-- | lib/ssh/doc/src/ssh.xml | 6 |
2 files changed, 28 insertions, 0 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml index f22bca36f4..acbf3124ef 100644 --- a/lib/ssh/doc/src/notes.xml +++ b/lib/ssh/doc/src/notes.xml @@ -29,6 +29,28 @@ <file>notes.xml</file> </header> +<section><title>Ssh 3.2.1</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Ssh crashed if a message was sent on a channel with + packet_size = 0.</p> + <p> + A new option for ssh:daemon is also introduced: + <c>minimal_remote_max_packet_size</c>. This option sets + the least max packet size declaration that the daemon + will accept from a client. The default value is 0 to + maintain compatibility with OpenSSH and the rfc:s.</p> + <p> + Own Id: OTP-12645 Aux Id: seq12816 </p> + </item> + </list> + </section> + +</section> + <section><title>Ssh 3.2</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml index d481a75c9a..0e7e3848ad 100644 --- a/lib/ssh/doc/src/ssh.xml +++ b/lib/ssh/doc/src/ssh.xml @@ -338,6 +338,12 @@ </warning> </item> + <tag><c><![CDATA[{minimal_remote_max_packet_size, non_negative_integer()}]]></c></tag> + <item> + <p>The least maximum packet size that the daemon will accept in channel open requests from the client. The default value is 0. + </p> + </item> + <tag><c><![CDATA[{key_cb, atom()}]]></c></tag> <item> <p>Module implementing the behaviour <seealso marker="ssh_server_key_api">ssh_server_key_api</seealso>. |