@@ -40,18 +40,18 @@ module Net; module SSH; module Transport def negotiate!(socket) info { "negotiating protocol version" } - catch :DEAD do + loop do + @version = "" loop do - @version = "" - loop do - b = socket.recv(1) - throw :DEAD if b.nil? - @version << b - break if b == "\n" + b = socket.recv(1) + if b.nil? + raise Net::SSH::Disconnect, "connection closed by remote host" end - break if @version.match(/^SSH-/) - @header << @version + @version << b + break if b == "\n" end + break if @version.match(/^SSH-/) + @header << @version end @version.chomp! lib/net/ssh/transport/server_version.rb 70f270bb54fdaa3f33b8ac739db9204f0f71304e Steven Hazel sah@awesame.org http://github.com/jamis/net-ssh/commit/687584d7616fa71198487ad785f0a24aab0be52a 687584d7616fa71198487ad785f0a24aab0be52a 2009-03-07T19:37:41-08:00 2009-03-07T19:37:41-08:00 Raise an exception immediately if the remote host disconnects before sending its version info, rather than letting things go as far as they can. 811f00b27bb87ce41df27dece2db6603bafe7304 Steven Hazel sah@awesame.org