diff options
author | Delano Mandelbaum <delano.mandelbaum@gmail.com> | 2012-01-04 15:39:27 -0800 |
---|---|---|
committer | Delano Mandelbaum <delano.mandelbaum@gmail.com> | 2012-01-04 15:39:27 -0800 |
commit | 613e80c9c9c02ca0d367f26727c435d5591c312a (patch) | |
tree | 11a2c0fd8851fc136bd63bb919f211fa78396e21 | |
parent | 613a7e1b55614b0f38535da6596796be9361f50b (diff) | |
parent | db7271d4e811a1accf5299cafad9621e131f6437 (diff) | |
download | net-ssh-613e80c9c9c02ca0d367f26727c435d5591c312a.tar.gz |
Merge pull request #28 from muffl0n/patch-1
Applied Patch described in https://github.com/net-ssh/net-ssh/issues/21
Thanks for the fix!
-rw-r--r-- | lib/net/ssh/transport/session.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/net/ssh/transport/session.rb b/lib/net/ssh/transport/session.rb index b3232f7..d31f899 100644 --- a/lib/net/ssh/transport/session.rb +++ b/lib/net/ssh/transport/session.rb @@ -73,7 +73,8 @@ module Net; module SSH; module Transport @host_key_verifier = select_host_key_verifier(options[:paranoid]) - @server_version = ServerVersion.new(socket, logger) + + @server_version = timeout(options[:timeout] || 0) { ServerVersion.new(socket, logger) } @algorithms = Algorithms.new(self, options) wait { algorithms.initialized? } |