diff options
| author | Anders Svensson <[email protected]> | 2013-03-19 13:35:54 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2013-03-19 13:35:54 +0100 |
| commit | f285ee66678ae8761dc82b5ba0c023dd759091fc (patch) | |
| tree | 8f191915385a3ff600b6b130dd38bcb164bbfad6 /lib/ssh | |
| parent | 692fa53631d5c977cc5e7635ce1df4e39d224116 (diff) | |
| parent | e173bc1b28453f0edb4863677f3c730b3d7a9f91 (diff) | |
| download | otp-f285ee66678ae8761dc82b5ba0c023dd759091fc.tar.gz otp-f285ee66678ae8761dc82b5ba0c023dd759091fc.tar.bz2 otp-f285ee66678ae8761dc82b5ba0c023dd759091fc.zip | |
Merge branch 'maint-r16' into maint
Diffstat (limited to 'lib/ssh')
| -rw-r--r-- | lib/ssh/doc/src/notes.xml | 15 | ||||
| -rw-r--r-- | lib/ssh/src/ssh_connection_manager.erl | 1 | ||||
| -rw-r--r-- | lib/ssh/vsn.mk | 2 |
3 files changed, 16 insertions, 2 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml index dead764700..f65b66a7c5 100644 --- a/lib/ssh/doc/src/notes.xml +++ b/lib/ssh/doc/src/notes.xml @@ -29,6 +29,21 @@ <file>notes.xml</file> </header> +<section><title>Ssh 2.1.6</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Fixed timing rekeying bug.</p> + <p> + Own Id: OTP-10940</p> + </item> + </list> + </section> + +</section> + <section><title>Ssh 2.1.5</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/ssh/src/ssh_connection_manager.erl b/lib/ssh/src/ssh_connection_manager.erl index 79a11c4b20..99a0b6a7c8 100644 --- a/lib/ssh/src/ssh_connection_manager.erl +++ b/lib/ssh/src/ssh_connection_manager.erl @@ -560,7 +560,6 @@ handle_info({start_connection, server, Exec = proplists:get_value(exec, Options), CliSpec = proplists:get_value(ssh_cli, Options, {ssh_cli, [Shell]}), ssh_connection_handler:send_event(Connection, socket_control), - erlang:send_after(3600000, self(), rekey), erlang:send_after(60000, self(), rekey_data), {noreply, State#state{connection = Connection, connection_state = diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk index 8f6aac1f5d..d5ca1cb3fe 100644 --- a/lib/ssh/vsn.mk +++ b/lib/ssh/vsn.mk @@ -1,5 +1,5 @@ #-*-makefile-*- ; force emacs to enter makefile-mode -SSH_VSN = 2.1.5 +SSH_VSN = 2.1.6 APP_VSN = "ssh-$(SSH_VSN)" |