excon 0.15.4 → 0.15.5

data/README.md

@@ -199,7 +199,7 @@ If you don't want to add activesupport to your application, simply define a clas
 
 The #instrument method will be called for each HTTP request, response, retry, and error.
 
-For debugging purposes you can also use Excon::StandardInstrumentor to output all events to stderr. This can also be specified by setting the `EXCON_STANDARD_INSTRUMENTOR` ENV var.
+For debugging purposes you can also use Excon::StandardInstrumentor to output all events to stderr. This can also be specified by setting the `EXCON_DEBUG` ENV var.
 
 See [the documentation for ActiveSupport::Notifications](http://api.rubyonrails.org/classes/ActiveSupport/Notifications.html) for more detail on using the subscription interface.  See excon's instrumentation_test.rb for more examples of instrumenting excon.
 

data/changelog.txt

@@ -1,3 +1,17 @@
+0.15.5 08/01/2012
+=================
+
+consolidate proxy handling
+proxy settings should pull from connection instead of params (allows
+Excon.defaults[:proxy])
+properly raise connect timeout errors
+change recommended standard instrumentor ENV to EXCON_DEBUG
+remove readline nonblock protections (they didn't fix the windows issue)
+don't swallow non-nonblock SSL exceptions
+consistency fixes for ssl nonblock error handling
+do SNI in ssl_socket setup
+use Excon::Response#parse to read https proxy response
+
 0.15.4 07/16/12
 ===============
 

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.15.4'
-  s.date              = '2012-07-18'
+  s.version           = '0.15.5'
+  s.date              = '2012-08-01'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long

data/lib/excon/connection.rb

@@ -30,16 +30,12 @@ module Excon
 
       @proxy = nil
 
-      # use proxy from the environment if present
-      if (ENV.has_key?('http_proxy') || ENV.has_key?('HTTP_PROXY'))
-        @proxy = setup_proxy(ENV['http_proxy'] || ENV['HTTP_PROXY'])
-      elsif params.has_key?(:proxy)
-        @proxy = setup_proxy(params[:proxy])
-      end
-
-      # use https_proxy if that has been specified
       if @connection[:scheme] == HTTPS && (ENV.has_key?('https_proxy') || ENV.has_key?('HTTPS_PROXY'))
         @proxy = setup_proxy(ENV['https_proxy'] || ENV['HTTPS_PROXY'])
+      elsif (ENV.has_key?('http_proxy') || ENV.has_key?('HTTP_PROXY'))
+        @proxy = setup_proxy(ENV['http_proxy'] || ENV['HTTP_PROXY'])
+      elsif @connection.has_key?(:proxy)
+        @proxy = setup_proxy(@connection[:proxy])
       end
 
       if @proxy
@@ -51,7 +47,7 @@ module Excon
         end
       end
 
-      if ENV.has_key?('EXCON_STANDARD_INSTRUMENTOR')
+      if ENV.has_key?('EXCON_DEBUG') || ENV.has_key?('EXCON_STANDARD_INSTRUMENTOR')
         @connection[:instrumentor] = Excon::StandardInstrumentor
       end
 

data/lib/excon/constants.rb

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

data/lib/excon/socket.rb

@@ -33,17 +33,14 @@ module Excon
 
           socket = ::Socket.new(a_family, s_type, 0)
 
-          #secs = Integer(timeout)
-          #usecs = Integer((timeout - secs) * 1_000_000)
-          #optval = [secs, usecs].pack("l_2")
-          #sock.setsockopt Socket::SOL_SOCKET, Socket::SO_RCVTIMEO, optval
-
           socket.connect_nonblock(sockaddr)
 
           @socket = socket
           break
         rescue Errno::EINPROGRESS
-          IO.select(nil, [socket], nil, @params[:connect_timeout])
+          unless IO.select(nil, [socket], nil, @params[:connect_timeout])
+            raise(Excon::Errors::Timeout.new("connect timeout reached"))
+          end
           begin
             socket.connect_nonblock(sockaddr)
 
@@ -88,6 +85,8 @@ module Excon
           else
             raise(Excon::Errors::Timeout.new("read timeout reached"))
           end
+        else
+          raise(error)
         end
       rescue Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable
         if IO.select([@socket], nil, nil, @params[:read_timeout])
@@ -106,31 +105,6 @@ module Excon
       end
     end
 
-    def readline
-      return nil if @eof
-
-      begin
-        @socket.readline
-      rescue OpenSSL::SSL::SSLError => error
-        if error.message == 'read would block'
-          if IO.select([@socket], nil, nil, @params[:read_timeout])
-            retry
-          else
-            raise(Excon::Errors::Timeout.new("read timeout reached"))
-          end
-        end
-      rescue Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable
-        if IO.select([@socket], nil, nil, @params[:read_timeout])
-          retry
-        else
-          raise(Excon::Errors::Timeout.new("read timeout reached"))
-        end
-      rescue EOFError
-        @eof = true
-        nil
-      end
-    end
-
     def write(data)
       # We normally return from the return in the else block below, but
       # we guard that data is still something in case we get weird
@@ -148,11 +122,9 @@ module Excon
             else
               raise(Excon::Errors::Timeout.new("write timeout reached"))
             end
+          else
+            raise(error)
           end
-
-          # If there is an unknown OpenSSL error, don't just swallow
-          # it, raise it out.
-          raise Excon::Errors::SocketError.new(error)
         rescue Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitWritable
           if IO.select(nil, [@socket], nil, @params[:write_timeout])
             retry

data/lib/excon/ssl_socket.rb

@@ -75,14 +75,17 @@ module Excon
         @socket.write(request)
 
         # eat the proxy's connection response
-        while line = @socket.readline.strip
-          break if line.empty?
-        end
+        Excon::Response.parse(@socket, {})
       end
 
       # connect the new OpenSSL::SSL::SSLSocket
       @socket.connect
 
+      # Server Name Indication (SNI) RFC 3546
+      if @socket.respond_to?(:hostname=)
+        @socket.hostname = @params[:host]
+      end
+
       # verify connection
       if params[:ssl_verify_peer]
         @socket.post_connection_check(@params[:host])

data/tests/rackups/timeout.ru

@@ -2,7 +2,7 @@ require 'sinatra'
 
 class App < Sinatra::Base
   get('/timeout') do
-    sleep(1)
+    sleep(2)
   end
 end
 

data/tests/timeout_tests.rb

@@ -3,7 +3,7 @@ with_rackup('timeout.ru') do
     connection = Excon.new('http://127.0.0.1:9292')
 
     tests('hits read_timeout').raises(Excon::Errors::Timeout) do
-      connection.request(:method => :get, :path => '/timeout', :read_timeout => 0)
+      connection.request(:method => :get, :path => '/timeout', :read_timeout => 1)
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.15.4
+  version: 0.15.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70201249148480 !ruby/object:Gem::Requirement
+  requirement: &70157967898360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201249148480
+  version_requirements: *70157967898360
 - !ruby/object:Gem::Dependency
   name: delorean
-  requirement: &70201249147600 !ruby/object:Gem::Requirement
+  requirement: &70157967894540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201249147600
+  version_requirements: *70157967894540
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70201249145740 !ruby/object:Gem::Requirement
+  requirement: &70157967906920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201249145740
+  version_requirements: *70157967906920
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70201249137360 !ruby/object:Gem::Requirement
+  requirement: &70157967905100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201249137360
+  version_requirements: *70157967905100
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70201249128100 !ruby/object:Gem::Requirement
+  requirement: &70157967902880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201249128100
+  version_requirements: *70157967902880
 - !ruby/object:Gem::Dependency
   name: shindo
-  requirement: &70201249123000 !ruby/object:Gem::Requirement
+  requirement: &70157967902120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201249123000
+  version_requirements: *70157967902120
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70201249117960 !ruby/object:Gem::Requirement
+  requirement: &70157967917600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,7 +89,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201249117960
+  version_requirements: *70157967917600
 description: EXtended http(s) CONnections
 email: geemus@gmail.com
 executables: []
@@ -168,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3281686677193752386
+      hash: 3311072793664556069
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: