excon 1.9.1 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92c10c40bd4ae5913caef9236145d027dc83f7ae9bf3942a91590f8b57024788
-  data.tar.gz: fa4d2d738e0cad415c7857773df9e8bfdaef62c13c13169f576037f602b3d9ff
+  metadata.gz: a8f339eac15303582618d7c092e0c31facc11e717477d11676ddf1cece1f4df8
+  data.tar.gz: f1225a0e544fb64eed9411d5f0c5028103a853e07acfa5df5b9c8d1057101297
 SHA512:
-  metadata.gz: '048afa1b1b171dc7f39c0423030b4ebe3b02fdc8ad321e10c42ee13b51937b66122252ccd8aa9172c3562a9c0344937c4a8031f511f55bc160d188c360e0b061'
-  data.tar.gz: 82949f5756c66d7f027f417d78b71bbaa7941954e71f6fee9925d4eccaa6f64f3e2939f7b6273cf76556c9172a2d8fcbaddbb4aca1b4a9211f110f51f9a46f83
+  metadata.gz: 37951c154ffa841570e55ec4bd9bd6894ccd4617cbf51f03e2606d341defde41e114d85b78af7cb67ffc9f46ba4fb8ca59398dcd219f4aeb0267ee79f5a20649
+  data.tar.gz: bf5f8bb104fcdcc6fe87d8f9a221775214af61b81df535f603ff1c1c47b44b5bfd441aef1bb35ede8761cdb2badd5ff52be93ecd2a3639a4809cf0fc3371f383

data/lib/excon/connection.rb

@@ -234,6 +234,12 @@ module Excon
     # @option params [String] :path appears after 'scheme://host:port/'
     # @option params [Hash]   :query appended to the 'scheme://host:port/path/' in the form of '?key=value'
     def request(params={}, &block)
+      # Set once the socket is left fit for the next request. Leaving early
+      # without passing through the rescue below (Timeout.timeout,
+      # Thread#raise, Thread#kill, Interrupt, throw) can leave a request
+      # half-written or a response unread on it, so ensure then resets it.
+      socket_reusable = false
+
       # @data has defaults, merge in new params to override
       datum = @data.merge(params)
 
@@ -295,11 +301,6 @@ module Excon
 
       datum[:connection] = self
 
-      # cleanup data left behind on persistent connection after interrupt
-      if datum[:persistent] && !@persistent_socket_reusable
-        reset
-      end
-
       datum[:stack] = datum[:middlewares].map do |middleware|
         lambda {|stack| middleware.new(stack)}
       end.reverse.inject(self) do |middlewares, middleware|
@@ -308,9 +309,7 @@ module Excon
       datum = datum[:stack].request_call(datum)
 
       unless datum[:pipeline]
-        @persistent_socket_reusable = false
         datum = response(datum)
-        @persistent_socket_reusable = true
 
         if datum[:persistent]
           if (key = datum[:response][:headers].keys.detect {|k| k.casecmp?('Connection') })
@@ -322,12 +321,16 @@ module Excon
           reset
         end
 
+        socket_reusable = true
         Excon::Response.new(datum[:response])
       else
+        # the response is read later, by #requests
+        socket_reusable = true
         datum
       end
     rescue => error
       reset
+      socket_reusable = true
 
       # If we didn't get far enough to initialize datum and the middleware stack, just raise
       raise error if !datum
@@ -338,11 +341,16 @@ module Excon
       else
         raise error
       end
+    ensure
+      reset unless socket_reusable
     end
 
     # Sends the supplied requests to the destination host using pipelining.
     # @param pipeline_params [Array<Hash>] An array of one or more optional params, override defaults set in Connection.new, see #request for details
     def requests(pipeline_params)
+      # as in #request: reset unless every response was read
+      socket_reusable = false
+
       pipeline_params.each {|params| params.merge!(:pipeline => true, :persistent => true) }
       pipeline_params.last[:persistent] = @data[:persistent]
 
@@ -362,7 +370,10 @@ module Excon
         reset
       end
 
+      socket_reusable = true
       responses
+    ensure
+      reset unless socket_reusable
     end
 
     # Sends the supplied requests to the destination host using pipelining in
@@ -384,7 +395,6 @@ module Excon
       if (old_socket = sockets.delete(@socket_key))
         old_socket.close rescue nil
       end
-      @persistent_socket_reusable = true
     end
 
     # Generate HTTP request verb methods

data/lib/excon/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Excon
-  VERSION = "1.9.1"
+  VERSION = "1.10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.10.0
 platform: ruby
 authors:
 - dpiddy (Dan Peterson)