excon 0.7.3 → 0.7.4

data/changelog.txt

@@ -1,3 +1,8 @@
+0.7.4 09/30/11
+==============
+
+* rescue write would block from openssl
+
 0.7.3 09/27/11
 ==============
 

data/excon.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'excon'
-  s.version           = '0.7.3'
-  s.date              = '2011-09-27'
+  s.version           = '0.7.4'
+  s.date              = '2011-09-30'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long

data/lib/excon/constants.rb

@@ -1,6 +1,6 @@
 module Excon
   unless const_defined?(:VERSION)
-    VERSION = '0.7.3'
+    VERSION = '0.7.4'
   end
 
   unless const_defined?(:CHUNK_SIZE)

data/lib/excon/socket.rb

@@ -39,7 +39,7 @@ module Excon
     def read(max_length)
       begin
         until @read_buffer.length >= max_length
-          @read_buffer << @socket.read_nonblock([max_length, max_length - @read_buffer.length].min)
+          @read_buffer << @socket.read_nonblock(max_length - @read_buffer.length)
         end
       rescue OpenSSL::SSL::SSLError => error
         if error.message == 'read would block'
@@ -66,6 +66,14 @@ module Excon
           max_length = [@write_buffer.length, Excon::CHUNK_SIZE].min
           written = @socket.write_nonblock(@write_buffer.slice(0, max_length))
           @write_buffer.slice!(0, written)
+        rescue OpenSSL::SSL::SSLError => error
+          if error.message == 'write would block'
+            if IO.select(nil, [@socket], nil, @connection_params[:write_timeout])
+              retry
+            else
+              raise(Excon::Errors::Timeout.new("write timeout reached"))
+            end
+          end
         rescue Errno::EAGAIN, Errno::EWOULDBLOCK
           if IO.select(nil, [@socket], nil, @connection_params[:write_timeout])
             retry

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: excon
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 7
-  - 3
-  version: 0.7.3
+  - 4
+  version: 0.7.4
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-27 00:00:00 Z
+date: 2011-09-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: open4