diff options
| author | Anders Svensson <[email protected]> | 2013-03-19 13:15:01 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2013-03-19 13:15:01 +0100 |
| commit | 37dcd98df7ee567eef6d89b4e77d10628f609029 (patch) | |
| tree | a661d222734f150197926cf224adf7efd8929f72 | |
| parent | e7f320e1f84da88a96c3bc4a76f43a296a738264 (diff) | |
| parent | c35a6917cd61162c6366448d77e96dbe4e515996 (diff) | |
| download | otp-37dcd98df7ee567eef6d89b4e77d10628f609029.tar.gz otp-37dcd98df7ee567eef6d89b4e77d10628f609029.tar.bz2 otp-37dcd98df7ee567eef6d89b4e77d10628f609029.zip | |
Merge branch 'fredrik/ssh/timing_rekey/OTP-10940' into maint-r16
* fredrik/ssh/timing_rekey/OTP-10940:
Removed timing rekeying
| -rw-r--r-- | lib/ssh/src/ssh_connection_manager.erl | 1 |
1 files changed, 0 insertions, 1 deletions
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 = |