http 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaab2ce76635211389fd9480ab6bde7e5dff1e3e
-  data.tar.gz: 7a4769b42117b5fcca8163bbfcd59e2bcb0baccb
+  metadata.gz: dbf54512a5beb049b061b0ba6fa9cff6599fdd03
+  data.tar.gz: 27cd308a2ca24d95b09ea54cffc47ede483b7842
 SHA512:
-  metadata.gz: 2caf7623ed59f9d1bc978928e6174cd84f512acc1f50f9b70df78607eb4fca26c12b9a4899c61483fa86f32630c08a5218e5aeef4b669847de8c54d8036c76f4
-  data.tar.gz: e91ae392e1bf3b142567289e536a59742a35fac2c774c0129a22019cd06e1805adc219e2439cfc39b2f4eb33c7899e0a37037b0ec9732cc2fdeff1331f9ed178
+  metadata.gz: 9f51593e3ecef81acc55ca3941b978c63011979ab2933409f57fe3272ae061553a32d72abfa219946ee0ba6d465157159b7e7fddcac29b4e9ebda3d1fa096fff
+  data.tar.gz: fd396a2f0ea79ee4014844c71de5bf97cb40bd60feef0e733b51adf16f76be3dadbbde7a58a09025ba6e641abc0676f5c66887dc649f0a415c54934f9eeabbec

data/CHANGES.md

@@ -1,3 +1,8 @@
+0.6.3 (2014-11-14)
+------------------
+
+* Backported EOF fix from master branch. See #166. (@ixti)
+
 0.6.2 (2014-08-06)
 ------------------
 

data/lib/http/client.rb

@@ -55,11 +55,7 @@ module HTTP
 
       req.stream @socket
 
-      begin
-        read_more BUFFER_SIZE until @parser.headers
-      rescue IOError, Errno::ECONNRESET, Errno::EPIPE => ex
-        raise IOError, "problem making HTTP request: #{ex}"
-      end
+      read_headers!
 
       body = Response::Body.new(self)
       res  = Response.new(@parser.status_code, @parser.http_version, @parser.headers, body, uri)
@@ -73,10 +69,16 @@ module HTTP
     def readpartial(size = BUFFER_SIZE)
       return unless @socket
 
-      read_more size
+      begin
+        read_more size
+        finished = @parser.finished?
+      rescue EOFError
+        finished = true
+      end
+
       chunk = @parser.chunk
 
-      finish_response if @parser.finished?
+      finish_response if finished
 
       chunk.to_s
     end
@@ -95,7 +97,7 @@ module HTTP
 
     # Merges query params if needed
     def make_request_uri(uri, options)
-      uri = URI uri.to_s unless uri.is_a? URI
+      uri = normalize_uri uri
 
       if options.params && !options.params.empty?
         params    = CGI.parse(uri.query.to_s).merge(options.params || {})
@@ -105,6 +107,21 @@ module HTTP
       uri
     end
 
+    # Normalize URI
+    #
+    # @param [#to_s] uri
+    # @return [URI]
+    def normalize_uri(uri)
+      uri = URI uri.to_s
+
+      # Some proxies (seen on WEBRick) fail if URL has
+      # empty path (e.g. `http://example.com`) while it's RFC-complaint:
+      # http://tools.ietf.org/html/rfc1738#section-3.1
+      uri.path = '/' if uri.path.empty?
+
+      uri
+    end
+
     # Create the request body object to send
     def make_request_body(opts, headers)
       if opts.body
@@ -118,6 +135,14 @@ module HTTP
       end
     end
 
+    # Reads data from socket up until headers
+    def read_headers!
+      read_more BUFFER_SIZE until @parser.headers
+    rescue IOError, Errno::ECONNRESET, Errno::EPIPE => ex
+      return if ex.is_a?(EOFError) && @parser.headers
+      raise IOError, "problem making HTTP request: #{ex}"
+    end
+
     # Callback for when we've reached the end of a response
     def finish_response
       @socket.close if @socket && !@socket.closed?
@@ -129,9 +154,6 @@ module HTTP
     # Feeds some more data into parser
     def read_more(size)
       @parser << @socket.readpartial(size) unless @parser.finished?
-      true
-    rescue EOFError
-      false
     end
   end
 end

data/lib/http/version.rb

@@ -1,3 +1,3 @@
 module HTTP
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
 end

data/spec/http/client_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe HTTP::Client do
+  let(:test_endpoint) { "http://127.0.0.1:#{ExampleService::PORT}" }
+
   StubbedClient = Class.new(HTTP::Client) do
     def perform(request, options)
       stubs.fetch(request.uri.to_s) { super(request, options) }
@@ -148,23 +150,80 @@ describe HTTP::Client do
     it 'calls finish_response before actual performance' do
       TCPSocket.stub(:open) { throw :halt }
       expect(client).to receive(:finish_response)
-      catch(:halt) { client.head "http://127.0.0.1:#{ExampleService::PORT}/" }
+      catch(:halt) { client.head test_endpoint }
     end
 
     it 'calls finish_response once body was fully flushed' do
       expect(client).to receive(:finish_response).twice.and_call_original
-      client.get("http://127.0.0.1:#{ExampleService::PORT}/").to_s
+      client.get(test_endpoint).to_s
     end
 
     context 'with HEAD request' do
       it 'does not iterates through body' do
         expect(client).to_not receive(:readpartial)
-        client.head("http://127.0.0.1:#{ExampleService::PORT}/")
+        client.head(test_endpoint)
       end
 
       it 'finishes response after headers were received' do
         expect(client).to receive(:finish_response).twice.and_call_original
-        client.head("http://127.0.0.1:#{ExampleService::PORT}/")
+        client.head(test_endpoint)
+      end
+    end
+
+    context 'when server closes connection unexpectedly' do
+      before do
+        socket_spy = double
+
+        allow(socket_spy).to receive(:close) { nil }
+        allow(socket_spy).to receive(:closed?) { true }
+        allow(socket_spy).to receive(:readpartial) { chunks.shift.call }
+        allow(socket_spy).to receive(:<<) { nil }
+
+        allow(TCPSocket).to receive(:open) { socket_spy }
+      end
+
+      context 'during headers reading' do
+        let :chunks do
+          [
+            proc { "HTTP/1.1 200 OK\r\n" },
+            proc { "Content-Type: text/html\r" },
+            proc { fail EOFError }
+          ]
+        end
+
+        it 'raises IOError' do
+          expect { client.get test_endpoint }.to raise_error IOError
+        end
+      end
+
+      context 'after headers were flushed' do
+        let :chunks do
+          [
+            proc { "HTTP/1.1 200 OK\r\n" },
+            proc { "Content-Type: text/html\r\n\r\n" },
+            proc { 'unexpected end of f' },
+            proc { fail EOFError }
+          ]
+        end
+
+        it 'reads partially arrived body' do
+          res = client.get(test_endpoint).to_s
+          expect(res).to eq 'unexpected end of f'
+        end
+      end
+
+      context 'when body and headers were flushed in one chunk' do
+        let :chunks do
+          [
+            proc { "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\nunexpected end of f" },
+            proc { fail EOFError }
+          ]
+        end
+
+        it 'reads partially arrived body' do
+          res = client.get(test_endpoint).to_s
+          expect(res).to eq 'unexpected end of f'
+        end
       end
     end
 
@@ -194,7 +253,7 @@ describe HTTP::Client do
       end
 
       it 'properly reads body' do
-        body = client.get("http://127.0.0.1:#{ExampleService::PORT}/").to_s
+        body = client.get(test_endpoint).to_s
         expect(body).to eq '<!doctype html>'
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Tony
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
@@ -135,31 +135,5 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: HTTP should be easy
-test_files:
-- spec/http/authorization_header/basic_auth_spec.rb
-- spec/http/authorization_header/bearer_token_spec.rb
-- spec/http/authorization_header_spec.rb
-- spec/http/backports/base64_spec.rb
-- spec/http/backports/uri_spec.rb
-- spec/http/client_spec.rb
-- spec/http/content_type_spec.rb
-- spec/http/headers/mixin_spec.rb
-- spec/http/headers_spec.rb
-- spec/http/options/body_spec.rb
-- spec/http/options/form_spec.rb
-- spec/http/options/headers_spec.rb
-- spec/http/options/json_spec.rb
-- spec/http/options/merge_spec.rb
-- spec/http/options/new_spec.rb
-- spec/http/options/proxy_spec.rb
-- spec/http/options_spec.rb
-- spec/http/redirector_spec.rb
-- spec/http/request/writer_spec.rb
-- spec/http/request_spec.rb
-- spec/http/response/body_spec.rb
-- spec/http/response_spec.rb
-- spec/http_spec.rb
-- spec/spec_helper.rb
-- spec/support/example_server.rb
-- spec/support/proxy_server.rb
+test_files: []
 has_rdoc: