diff options
| author | delano <delano@solutious.com> | 2012-01-04 18:40:41 -0500 |
|---|---|---|
| committer | delano <delano@solutious.com> | 2012-01-04 18:40:41 -0500 |
| commit | 097a6b32e9d722d5294c6679e87b861204db6c72 (patch) | |
| tree | 04641c5d71d77d5246bb369527a5b272d3b50681 | |
| parent | e3becb78bc9f7f49f3c05b415c1abe66a36f7559 (diff) | |
| parent | 613e80c9c9c02ca0d367f26727c435d5591c312a (diff) | |
| download | net-ssh-097a6b32e9d722d5294c6679e87b861204db6c72.tar.gz | |
Merge branch 'master' of github.com:net-ssh/net-ssh
| -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? } |