http 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce1cd065ce4c93b81a5a28a949354322222d0d78
-  data.tar.gz: e4b2d331cc30a7780425ec9248c14ba43fcab9ad
+  metadata.gz: 6a554e4ac3df247f5abcf5fc5af7707604576e23
+  data.tar.gz: 04e6c88e86d14fbbfaa6af5db48ba28e83cf02ab
 SHA512:
-  metadata.gz: 7fe63ab93211bb553b5f5ec8b9d62f2a7279c0896dc30ff2ff6dc1afdda0c89efcf1193f4032232aec011f2cf77f613d75a77763dfa3ba656ce07e98b72976e0
-  data.tar.gz: 94cfd48b04617ab0966222097c2cf11c10c6567dcc89e7decea6dd2d927e9f199cb80f8609f759ecdfa38d57ad894def14c440367f27b0d06d3b5d2bb7b3cf98
+  metadata.gz: 064656c4992d84ffe71bebe1cbcb83e1f32b8b33dc350a1d87e3fdc4893288697503bf36f0f27ea95cdbb4d0788aa3dd96cb69f9b3029fa4d99336d78aa12a45
+  data.tar.gz: 920dfb6d29655e9147d22e6f8f0ccad6075c8c77c0cde3ee3bc4ad0d8dcc3120fb387f59909d60c3a142bf6c0744b0138a81c40e2bea9ef105e1583c229f9c3c

data/CHANGES.md

@@ -1,10 +1,16 @@
+## 1.0.4 (2016-03-19)
+
+* [#320](https://github.com/httprb/http/pull/320)
+  Fix timeout regression.
+  ([@tarcieri])
+
+
 ## 1.0.3 (2016-03-16)
 
 * [#314](https://github.com/httprb/http/pull/314)
   Validate charset before forcing encoding.
   ([@kylekyle])
 
-
 * [#318](https://github.com/httprb/http/pull/318)
   Remove redundant string allocations upon header names normalization.
   ([@ixti])
@@ -74,6 +80,17 @@
   ([@tarcieri])
 
 
+## 0.9.9 (2016-03-16)
+
+* *BACKPORT* [#318](https://github.com/httprb/http/pull/318)
+  Remove redundant string allocations upon header names normalization.
+  ([@ixti])
+
+* *BACKPORT* [#295](https://github.com/httprb/http/pull/295):
+  Fix redirect following when used with persistent mode.
+  ([@ixti])
+
+
 ## 0.9.8 (2015-09-29)
 
 * [#260](https://github.com/httprb/http/pull/260):

data/lib/http/response/status/reasons.rb

@@ -61,6 +61,7 @@ module HTTP
         428 => "Precondition Required",
         429 => "Too Many Requests",
         431 => "Request Header Fields Too Large",
+        451 => "Unavailable For Legal Reasons",
         500 => "Internal Server Error",
         501 => "Not Implemented",
         502 => "Bad Gateway",

data/lib/http/timeout/global.rb

@@ -32,13 +32,13 @@ module HTTP
         reset_timer
 
         begin
-          @socket.connect_nonblock
+          socket.connect_nonblock
         rescue IO::WaitReadable
-          IO.select([@socket], nil, nil, time_left)
+          IO.select([socket], nil, nil, time_left)
           log_time
           retry
         rescue IO::WaitWritable
-          IO.select(nil, [@socket], nil, time_left)
+          IO.select(nil, [socket], nil, time_left)
           log_time
           retry
         end
@@ -104,32 +104,16 @@ module HTTP
         :eof
       end
 
-      if RUBY_VERSION < "2.0.0"
-        # Wait for a socket to become readable
-        def wait_readable_or_timeout
-          IO.select([@socket], nil, nil, time_left)
-          log_time
-        end
-
-        # Wait for a socket to become writable
-        def wait_writable_or_timeout
-          IO.select(nil, [@socket], nil, time_left)
-          log_time
-        end
-      else
-        require "io/wait"
-
-        # Wait for a socket to become readable
-        def wait_readable_or_timeout
-          @socket.to_io.wait_readable(time_left)
-          log_time
-        end
+      # Wait for a socket to become readable
+      def wait_readable_or_timeout
+        IO.select([@socket], nil, nil, time_left)
+        log_time
+      end
 
-        # Wait for a socket to become writable
-        def wait_writable_or_timeout
-          @socket.to_io.wait_writable(time_left)
-          log_time
-        end
+      # Wait for a socket to become writable
+      def wait_writable_or_timeout
+        IO.select(nil, [@socket], nil, time_left)
+        log_time
       end
 
       # Due to the run/retry nature of nonblocking I/O, it's easier to keep track of time

data/lib/http/timeout/null.rb

@@ -50,45 +50,22 @@ module HTTP
       end
       alias << write
 
-      # These cops can be re-eanbled after we go Ruby 2.0+ only
-      # rubocop:disable Lint/UselessAccessModifier, Metrics/BlockNesting
-
       private
 
-      if RUBY_VERSION < "2.0.0"
-        # Retry reading
-        def rescue_readable
-          yield
-        rescue IO::WaitReadable
-          retry if IO.select([@socket], nil, nil, read_timeout)
-          raise TimeoutError, "Read timed out after #{read_timeout} seconds"
-        end
-
-        # Retry writing
-        def rescue_writable
-          yield
-        rescue IO::WaitWritable
-          retry if IO.select(nil, [@socket], nil, write_timeout)
-          raise TimeoutError, "Write timed out after #{write_timeout} seconds"
-        end
-      else
-        require "io/wait"
-
-        # Retry reading
-        def rescue_readable
-          yield
-        rescue IO::WaitReadable
-          retry if @socket.to_io.wait_readable(read_timeout)
-          raise TimeoutError, "Read timed out after #{read_timeout} seconds"
-        end
+      # Retry reading
+      def rescue_readable
+        yield
+      rescue IO::WaitReadable
+        retry if IO.select([socket], nil, nil, read_timeout)
+        raise TimeoutError, "Read timed out after #{read_timeout} seconds"
+      end
 
-        # Retry writing
-        def rescue_writable
-          yield
-        rescue IO::WaitWritable
-          retry if @socket.to_io.wait_writable(write_timeout)
-          raise TimeoutError, "Write timed out after #{write_timeout} seconds"
-        end
+      # Retry writing
+      def rescue_writable
+        yield
+      rescue IO::WaitWritable
+        retry if IO.select(nil, [socket], nil, write_timeout)
+        raise TimeoutError, "Write timed out after #{write_timeout} seconds"
       end
     end
   end

data/lib/http/timeout/per_operation.rb

@@ -39,7 +39,7 @@ module HTTP
         # Read data from the socket
         def readpartial(size)
           rescue_readable do
-            @socket.read_nonblock(size)
+            socket.read_nonblock(size)
           end
         rescue EOFError
           :eof
@@ -48,7 +48,7 @@ module HTTP
         # Write data to the socket
         def write(data)
           rescue_writable do
-            @socket.write_nonblock(data)
+            socket.write_nonblock(data)
           end
         rescue EOFError
           :eof
@@ -59,14 +59,14 @@ module HTTP
         # Read data from the socket
         def readpartial(size)
           loop do
-            result = @socket.read_nonblock(size, :exception => false)
+            result = socket.read_nonblock(size, :exception => false)
             if result.nil?
               return :eof
             elsif result != :wait_readable
               return result
             end
 
-            unless @socket.to_io.wait_readable(read_timeout)
+            unless IO.select([socket], nil, nil, read_timeout)
               fail TimeoutError, "Read timed out after #{read_timeout} seconds"
             end
           end
@@ -75,11 +75,11 @@ module HTTP
         # Write data to the socket
         def write(data)
           loop do
-            result = @socket.write_nonblock(data, :exception => false)
+            result = socket.write_nonblock(data, :exception => false)
             return result unless result == :wait_writable
 
-            unless @socket.to_io.wait_writable(write_timeout)
-              fail TimeoutError, "Write timed out after #{write_timeout} seconds"
+            unless IO.select(nil, [socket], nil, write_timeout)
+              fail TimeoutError, "Read timed out after #{write_timeout} seconds"
             end
           end
         end

data/lib/http/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module HTTP
-  VERSION = "1.0.3".freeze
+  VERSION = "1.0.4".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Tony Arcieri
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: HTTP should be easy