excon 0.7.2 → 0.7.3

data/changelog.txt

@@ -1,3 +1,56 @@
+0.7.3 09/27/11
+==============
+
+* fix nonblocking read to avoid reading past chunk in chunked encoded
+* rescue read would block from openssl
+
+0.7.2 09/24/11
+==============
+
+* fix buffer drain for socket#write. thanks dpiddy
+* rescue/retry timeout errors for idempotent requests. thanks dpiddy
+* timeouts should raise an excon specific error
+
+0.7.1 09/13/11
+==============
+
+* use nonblocking only when available (skip for 1.8.x SSL)
+
+0.7.0 09/12/11
+==============
+
+* change connects and most read/writes to use nonblocking methods
+* provide connect/read/write timeouts
+
+0.6.6 09/06/11
+==============
+
+* cleanup/refactoring. thanks nextmat
+* default to connection close as request delimiter
+
+0.6.5 07/13/11
+==============
+
+* properly stream responses with proc
+* fix mock with block to match real requests
+
+0.6.4 07/05/11
+==============
+
+* add block support to mocks. thanks dmeiz
+* fixes for stub matching. thanks dmeiz
+* don't do post_connection_check if verify mode is off
+* check excon state for verify mode instead of checking OpenSSL constants
+* use RbConfig to find OS. thanks trym
+* fixes for idempotent/retry. thanks lstoll
+
+0.6.3 05/02/11
+==============
+
+* fixes for header parsing to allow whitespace after :. thanks myronmarston
+* get_header optimization. thanks nextmat
+* rewind body on retry. thanks pweldon
+
 0.6.2 04/11/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.2'
-  s.date              = '2011-09-23'
+  s.version           = '0.7.3'
+  s.date              = '2011-09-27'
   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.2'
+    VERSION = '0.7.3'
   end
 
   unless const_defined?(:CHUNK_SIZE)

data/lib/excon/socket.rb

@@ -39,7 +39,15 @@ module Excon
     def read(max_length)
       begin
         until @read_buffer.length >= max_length
-          @read_buffer << @socket.read_nonblock(max_length)
+          @read_buffer << @socket.read_nonblock([max_length, max_length - @read_buffer.length].min)
+        end
+      rescue OpenSSL::SSL::SSLError => error
+        if error.message == 'read would block'
+          if IO.select([@socket], nil, nil, @connection_params[:read_timeout])
+            retry
+          else
+            raise(Excon::Errors::Timeout.new("read timeout reached"))
+          end
         end
       rescue Errno::EAGAIN, Errno::EWOULDBLOCK
         if IO.select([@socket], nil, nil, @connection_params[:read_timeout])

data/lib/excon/ssl_socket.rb

@@ -49,8 +49,8 @@ module Excon
       @socket.sync_close = true
 
       if @proxy
-        @socket << "CONNECT " << @connection_params[:host] << ":" << @connection_params[:port] << HTTP_1_1
-        @socket << "Host: " << @connection_params[:host] << ":" << @connection_params[:port] << CR_NL << CR_NL
+        @socket << "CONNECT " << @connection_params[:host] << ":" << @connection_params[:port] << Excon::Connection::HTTP_1_1
+        @socket << "Host: " << @connection_params[:host] << ":" << @connection_params[:port] << Excon::Connection::CR_NL << Excon::Connection::CR_NL
 
         # eat the proxy's connection response
         while line = @socket.readline.strip
@@ -70,4 +70,4 @@ module Excon
     end
 
   end
-end
+end

metadata

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