http 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cf4cc1f50d48b38982e5b7d22cce064944076ca
-  data.tar.gz: c3528a21ae58c9ea4ce9e8ea6c8c29c8160c74e1
+  metadata.gz: 47725ac8f768c31d62281f8c11fe9b4d68d0cfb2
+  data.tar.gz: 09c4bdf669c287c16de5e908ee4030639300111f
 SHA512:
-  metadata.gz: 3fbfc83dc70d26f03ceefba22ffed7ad9a235c4811dc05342c0f51d1c968af020f990bc31d8dc713659a1cd952350169a25f575695e684cc7b1242ab5394f186
-  data.tar.gz: 631b31981f832f3c22bf6c175345cf68d7a9c0fdac2cb8477c28ba0547bffe0e7dac4218dbdf83242132deb54a867d9d7637a1483ec39107569fa0f0af393aec
+  metadata.gz: 00fe6c13bc759adc589452d22cc263d7b3c12ea812fe4eada6a43080f5f06411d4d133ed314e4a71f958c3b1121631c197a15482e54813c469a2300ee7dd640d
+  data.tar.gz: 8ea1c8fbe444a0a0f59bc9dc262d3401dff1c0cb45957d166ab0a382bc4b9aeaaf4c0dcc8855cff5f5fa40efd9bf627d5211c264c7315fc96f56a68b410f4aa9

data/CHANGES.md

@@ -1,3 +1,8 @@
+## 0.9.5 (2015-09-06)
+
+* Fixed infinite hang/timeout when a request contained more than ~16,363 bytes.
+  See #252. (@zanker)
+
 ## 0.9.4 (2015-08-26)
 
 * Fixes regression when body streaming was failing on some URIs.

data/lib/http/request/writer.rb

@@ -12,6 +12,9 @@ module HTTP
       # Chunked transfer encoding
       CHUNKED = "chunked".freeze
 
+      # End of a chunked transfer
+      CHUNKED_END = "#{ZERO}#{CRLF}#{CRLF}".freeze
+
       # Types valid to be used as body source
       VALID_BODY_TYPES = [String, NilClass, Enumerable]
 
@@ -40,7 +43,7 @@ module HTTP
       # Send headers needed to connect through proxy
       def connect_through_proxy
         add_headers
-        @socket << join_headers
+        write(join_headers)
       end
 
       # Adds the headers to the header array for the given request body we are working
@@ -65,24 +68,35 @@ module HTTP
         add_headers
         add_body_type_headers
 
-        @socket << join_headers
+        write(join_headers)
       end
 
       def send_request_body
         if @body.is_a?(String)
-          @socket << @body
+          write(@body)
         elsif @body.is_a?(Enumerable)
           @body.each do |chunk|
-            @socket << chunk.bytesize.to_s(16) << CRLF
-            @socket << chunk << CRLF
+            write(chunk.bytesize.to_s(16) << CRLF)
+            write(chunk << CRLF)
           end
 
-          @socket << ZERO << CRLF << CRLF
+          write(CHUNKED_END)
         end
       end
 
       private
 
+      def write(data)
+        while data.present?
+          length = @socket.write(data)
+          if data.length > length
+            data = data[length..-1]
+          else
+            break
+          end
+        end
+      end
+
       def validate_body_type!
         return if VALID_BODY_TYPES.any? { |type| @body.is_a? type }
         fail RequestError, "body of wrong type: #{@body.class}"

data/lib/http/timeout/global.rb

@@ -61,7 +61,7 @@ module HTTP
           reset_timer
 
           begin
-            socket.write_nonblock(data)
+            return socket.write_nonblock(data)
           rescue IO::WaitWritable
             IO.select(nil, [socket], nil, time_left)
             log_time
@@ -97,7 +97,7 @@ module HTTP
 
           loop do
             result = socket.write_nonblock(data, :exception => false)
-            break unless result == :wait_writable
+            return result unless result == :wait_writable
 
             IO.select(nil, [socket], nil, time_left)
             log_time

data/lib/http/timeout/null.rb

@@ -45,7 +45,7 @@ module HTTP
 
       # Write to the socket
       def write(data)
-        @socket << data
+        @socket.write(data)
       end
       alias_method :<<, :write
 

data/lib/http/timeout/per_operation.rb

@@ -75,7 +75,7 @@ module HTTP
         def write(data)
           loop do
             result = socket.write_nonblock(data, :exception => false)
-            break unless result == :wait_writable
+            return result unless result == :wait_writable
 
             unless IO.select(nil, [socket], nil, write_timeout)
               fail TimeoutError, "Read timed out after #{write_timeout} seconds"

data/lib/http/version.rb

@@ -1,3 +1,3 @@
 module HTTP
-  VERSION = "0.9.4".freeze
+  VERSION = "0.9.5".freeze
 end

data/spec/lib/http/client_spec.rb

@@ -267,8 +267,8 @@ RSpec.describe HTTP::Client do
 
         allow(socket_spy).to receive(:close) { nil }
         allow(socket_spy).to receive(:closed?) { true }
-        allow(socket_spy).to receive(:readpartial) { chunks.shift }
-        allow(socket_spy).to receive(:<<) { nil }
+        allow(socket_spy).to receive(:readpartial) { chunks[0] }
+        allow(socket_spy).to receive(:write) { chunks[0].length }
 
         allow(TCPSocket).to receive(:open) { socket_spy }
       end

data/spec/lib/http_spec.rb

@@ -44,6 +44,32 @@ RSpec.describe HTTP do
         expect(response.to_s.include?("json")).to be true
       end
     end
+
+    context "with a large request body" do
+      %w(global null per_operation).each do |timeout|
+        context "with a #{timeout} timeout" do
+          [16_000, 16_500, 17_000, 34_000, 68_000].each do |size|
+            [0, rand(0..100), rand(100..1000)].each do |fuzzer|
+              context "with a #{size} body and #{fuzzer} of fuzzing" do
+                let(:client) { HTTP.timeout(timeout, :read => 2, :write => 2, :connect => 2) }
+
+                let(:characters) { ("A".."Z").to_a }
+                let(:request_body) do
+                  (size + fuzzer).times.map { |i| characters[i % characters.length] }.join
+                end
+
+                it "returns a large body" do
+                  response = client.post("#{dummy.endpoint}/echo-body", :body => request_body)
+
+                  expect(response.body.to_s).to eq(request_body)
+                  expect(response.headers["Content-Length"].to_i).to eq(request_body.length)
+                end
+              end
+            end
+          end
+        end
+      end
+    end
   end
 
   describe ".via" do

data/spec/support/dummy_server/servlet.rb

@@ -133,5 +133,10 @@ class DummyServer < WEBrick::HTTPServer
       res["Set-Cookie"] = "foo=bar"
       res.body = req.cookies.map { |c| [c.name, c.value].join ": " }.join("\n")
     end
+
+    post "/echo-body" do |req, res|
+      res.status = 200
+      res.body   = req.body
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Tony Arcieri
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-25 00:00:00.000000000 Z
+date: 2015-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -184,9 +184,40 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: HTTP should be easy
-test_files: []
+test_files:
+- spec/lib/http/client_spec.rb
+- spec/lib/http/content_type_spec.rb
+- spec/lib/http/headers/mixin_spec.rb
+- spec/lib/http/headers_spec.rb
+- spec/lib/http/options/body_spec.rb
+- spec/lib/http/options/form_spec.rb
+- spec/lib/http/options/headers_spec.rb
+- spec/lib/http/options/json_spec.rb
+- spec/lib/http/options/merge_spec.rb
+- spec/lib/http/options/new_spec.rb
+- spec/lib/http/options/proxy_spec.rb
+- spec/lib/http/options_spec.rb
+- spec/lib/http/redirector_spec.rb
+- spec/lib/http/request/writer_spec.rb
+- spec/lib/http/request_spec.rb
+- spec/lib/http/response/body_spec.rb
+- spec/lib/http/response/status_spec.rb
+- spec/lib/http/response_spec.rb
+- spec/lib/http_spec.rb
+- spec/regression_specs.rb
+- spec/spec_helper.rb
+- spec/support/black_hole.rb
+- spec/support/capture_warning.rb
+- spec/support/connection_reuse_shared.rb
+- spec/support/dummy_server.rb
+- spec/support/dummy_server/servlet.rb
+- spec/support/http_handling_shared.rb
+- spec/support/proxy_server.rb
+- spec/support/servers/config.rb
+- spec/support/servers/runner.rb
+- spec/support/ssl_helper.rb
 has_rdoc: