net-ssh 2.0.14 → 2.0.15

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 
 
+=== 2.0.15 / 03 Sep 2009
+
+* Scale back IO#select patch so it mutexes only zero-timeout calls [Daniel Azuma, Will Bryant]
+
+
 === 2.0.14 / 28 Aug 2009
 
 * Fix for IO#select threading bug in Ruby 1.8 (LH-1) [Daniel Azuma]

data/lib/net/ssh/ruby_compat.rb

@@ -14,9 +14,9 @@ module Net; module SSH
   # for different ruby implementations.
   class Compat
     
-    # A workaround for an IO#select threading bug in MRI 1.8.
+    # A workaround for an IO#select threading bug in certain versions of MRI 1.8.
     # See: http://net-ssh.lighthouseapp.com/projects/36253/tickets/1-ioselect-threading-bug-in-ruby-18
-    # Also: http://redmine.ruby-lang.org/issues/show/1993
+    # The root issue is documented here: http://redmine.ruby-lang.org/issues/show/1993
     if RUBY_VERSION >= '1.9' || RUBY_PLATFORM == 'java'
       def self.io_select(*params)
         IO.select(*params)
@@ -24,7 +24,15 @@ module Net; module SSH
     else
       SELECT_MUTEX = Mutex.new
       def self.io_select(*params)
-        SELECT_MUTEX.synchronize do
+        # It should be safe to wrap calls in a mutex when the timeout is 0
+        # (that is, the call is not supposed to block).
+        # We leave blocking calls unprotected to avoid causing deadlocks.
+        # This should still catch the main case for Capistrano users.
+        if params[3] == 0
+          SELECT_MUTEX.synchronize do
+            IO.select(*params)
+          end
+        else
           IO.select(*params)
         end
       end

data/lib/net/ssh/version.rb

@@ -51,7 +51,7 @@ module Net; module SSH
     MINOR = 0
 
     # The tiny component of this version of the Net::SSH library
-    TINY  = 14
+    TINY  = 15
 
     # The current version of the Net::SSH library as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/net-ssh.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "net-ssh"
   s.rubyforge_project = 'net-ssh'
-	s.version = "2.0.14"
+	s.version = "2.0.15"
 	s.summary = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol."
 	s.description = s.summary
 	s.authors = ["Jamis Buck", "Delano Mandelbaum"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: net-ssh
 version: !ruby/object:Gem::Version 
-  version: 2.0.14
+  version: 2.0.15
 platform: ruby
 authors: 
 - Jamis Buck
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-28 00:00:00 -04:00
+date: 2009-09-03 00:00:00 -04:00
 default_executable: 
 dependencies: []