http 4.4.0 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c303ff626f5b57ed080d5d64d3ba7fd0a9eed5bc9463ff1035b1386dad36a9ab
-  data.tar.gz: 3bc824e2ab723de39556166ec821d8c9a3f14dc5bc8dd542e4ccadf916a2518a
+  metadata.gz: cce9a8685f3b60f994e77174f79c2306f607d62016bf64b74fcebc4f86377ec0
+  data.tar.gz: 353702b62a1b9d3b2ea86ac5ac3ad88e9efa734c77e180128fa06c6c301895d3
 SHA512:
-  metadata.gz: 9e78a6c25816e48f36394d3e4d612d94b47eb45787ca74a1fd5f49372c3df1037e535a401392a3318bfcc7194a1afee361794aadab853ae420054f00015101d0
-  data.tar.gz: 9e1656f514777d0c5c149b273d9276b3c2affb93363c3cbc74a20c1a7fed039148564adad891459eac012415d4d1dee98238bcf3e6a0f3e978fa4263afa4925b
+  metadata.gz: 84ddc4cf98e603d175a9ecb8db03abd32187888070abd96a437c4121750ac2b86b6cada5d00d527b398ff4a403c2b6448d45bed61c45dbd3be8658f4ad38b121
+  data.tar.gz: 750edced9ae715483d750f0b18777f84a4ee24848ec761c67d2c5b89d00ebbc99fbc1e02932d3d30a33eaea43e1d081ba97bcacaf2231f6693e50d218ee24e87

data/CHANGES.md

@@ -1,3 +1,9 @@
+## 4.4.1 (2020-03-29)
+
+* Backport [#590](https://github.com/httprb/http/pull/590)
+  Fix parser failing on some edge cases.
+  ([@ixti])
+
 ## 4.4.0 (2020-03-25)
 
 * Backport [#587](https://github.com/httprb/http/pull/587)

data/lib/http/response/parser.rb

@@ -49,14 +49,17 @@ module HTTP
       #
 
       def on_header_field(_response, field)
-        @field = field
+        append_header if @reading_header_value
+        @field << field
       end
 
       def on_header_value(_response, value)
-        @headers.add(@field, value) if @field
+        @reading_header_value = true
+        @field_value << value
       end
 
       def on_headers_complete(_reposse)
+        append_header if @reading_header_value
         @finished[:headers] = true
       end
 
@@ -89,15 +92,26 @@ module HTTP
       def reset
         @state.reset!
 
-        @finished = Hash.new(false)
-        @headers  = HTTP::Headers.new
-        @field    = nil
-        @chunk    = nil
+        @finished             = Hash.new(false)
+        @headers              = HTTP::Headers.new
+        @reading_header_value = false
+        @field                = +""
+        @field_value          = +""
+        @chunk                = nil
       end
 
       def finished?
         @finished[:message]
       end
+
+      private
+
+      def append_header
+        @headers.add(@field, @field_value)
+        @reading_header_value = false
+        @field_value          = +""
+        @field                = +""
+      end
     end
   end
 end

data/lib/http/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTTP
-  VERSION = "4.4.0"
+  VERSION = "4.4.1"
 end

data/spec/lib/http/response/parser_spec.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+RSpec.describe HTTP::Response::Parser do
+  subject(:parser) { described_class.new }
+  let(:raw_response) do
+    "HTTP/1.1 200 OK\r\nContent-Length: 2\r\nContent-Type: application/json\r\nMy-Header: val\r\nEmpty-Header: \r\n\r\n{}"
+  end
+  let(:expected_headers) do
+    {
+      "Content-Length" => "2",
+      "Content-Type"   => "application/json",
+      "My-Header"      => "val",
+      "Empty-Header"   => ""
+    }
+  end
+  let(:expected_body) { "{}" }
+
+  before do
+    parts.each { |part| subject.add(part) }
+  end
+
+  context "whole response in one part" do
+    let(:parts) { [raw_response] }
+
+    it "parses headers" do
+      expect(subject.headers.to_h).to eq(expected_headers)
+    end
+
+    it "parses body" do
+      expect(subject.read(expected_body.size)).to eq(expected_body)
+    end
+  end
+
+  context "response in many parts" do
+    let(:parts) { raw_response.split(//) }
+
+    it "parses headers" do
+      expect(subject.headers.to_h).to eq(expected_headers)
+    end
+
+    it "parses body" do
+      expect(subject.read(expected_body.size)).to eq(expected_body)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.4.1
 platform: ruby
 authors:
 - Tony Arcieri
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-25 00:00:00.000000000 Z
+date: 2020-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -163,6 +163,7 @@ files:
 - spec/lib/http/request/writer_spec.rb
 - spec/lib/http/request_spec.rb
 - spec/lib/http/response/body_spec.rb
+- spec/lib/http/response/parser_spec.rb
 - spec/lib/http/response/status_spec.rb
 - spec/lib/http/response_spec.rb
 - spec/lib/http/uri_spec.rb
@@ -186,7 +187,7 @@ metadata:
   source_code_uri: https://github.com/httprb/http
   wiki_uri: https://github.com/httprb/http/wiki
   bug_tracker_uri: https://github.com/httprb/http/issues
-  changelog_uri: https://github.com/httprb/http/blob/v4.4.0/CHANGES.md
+  changelog_uri: https://github.com/httprb/http/blob/v4.4.1/CHANGES.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -202,8 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: HTTP should be easy
@@ -231,6 +231,7 @@ test_files:
 - spec/lib/http/request/writer_spec.rb
 - spec/lib/http/request_spec.rb
 - spec/lib/http/response/body_spec.rb
+- spec/lib/http/response/parser_spec.rb
 - spec/lib/http/response/status_spec.rb
 - spec/lib/http/response_spec.rb
 - spec/lib/http/uri_spec.rb