protocol-http1 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 550b6e9b8f04f40fbba30a9260ead61bc1921130b069f8d4f6d7005077da0e61
-  data.tar.gz: 54a8009f974a0292b1500c21f7e8047d5af4d815e7b844fa46ec0d6f6d356fee
+  metadata.gz: 5883f7878058a83c35d40fe91ea7e673a6abc1895d47e91dfefd57e1849861d5
+  data.tar.gz: f01fbad8aa91e32dddd541fa6a3ab184d8204a5761b6a0b2d5bd7eafd5aab717
 SHA512:
-  metadata.gz: e44973d7e04933d1e6d3e8d50c98dcc57603fc4cd7491a1ab9ed490ef659551bbf1e0eb425222cc2e61f38b9fc5af864198970505a42750dad8c97bdb68331e7
-  data.tar.gz: 6fba9bb8ac29bc13966bbebed00ca72b60d9214ba1943185e44760abb72ad5b1fa8254f4222951e5bf983263fef015a78ecdca6e6c8396c3c0e9548bade51576
+  metadata.gz: de91d508479206879dfded7ef4aca6ec5b211372ae8aa9d938afb97c4cb5d1804e9aefbea42d021979ce3c67ad6cf96c28f661be62e6c191219204f9ba96267e
+  data.tar.gz: 3c556ecfd10f3b20424629898b4684e6f8d56ad7415c94e3fedcac7485d5fb389141fd2fb9a9bbadd67a20d05a51286e338fc656febe145551b491781c052776

data/lib/protocol/http1/body/chunked.rb

@@ -4,7 +4,7 @@
 # Copyright, 2019-2024, by Samuel Williams.
 # Copyright, 2023, by Thomas Morgan.
 
-require 'protocol/http/body/readable'
+require "protocol/http/body/readable"
 
 module Protocol
 	module HTTP1
@@ -26,15 +26,19 @@ module Protocol
 					@stream.nil?
 				end
 				
-				def close(error = nil)
-					if @stream
+				def discard
+					if stream = @stream
+						@stream = nil
+						
 						# We only close the connection if we haven't completed reading the entire body:
 						unless @finished
-							@stream.close_read
+							stream.close_read
 						end
-						
-						@stream = nil
 					end
+				end
+				
+				def close(error = nil)
+					self.discard
 					
 					super
 				end
@@ -67,13 +71,18 @@ module Protocol
 							# Read trailing CRLF:
 							chunk = @stream.read(length + 2)
 							
-							# ...and chomp it off:
-							chunk.chomp!(CRLF)
-							
-							@length += length
-							@count += 1
-							
-							return chunk
+							if chunk.bytesize == length + 2
+								# ...and chomp it off:
+								chunk.chomp!(CRLF)
+								
+								@length += length
+								@count += 1
+								
+								return chunk
+							else
+								# The stream has been closed before we have read the requested length:
+								self.discard
+							end
 						end
 						
 						# If the stream has been closed before we have read the final chunk, raise an error:

data/lib/protocol/http1/body/fixed.rb

@@ -3,7 +3,7 @@
 # Released under the MIT License.
 # Copyright, 2019-2024, by Samuel Williams.
 
-require 'protocol/http/body/readable'
+require "protocol/http/body/readable"
 
 module Protocol
 	module HTTP1
@@ -23,15 +23,18 @@ module Protocol
 					@stream.nil? or @remaining == 0
 				end
 				
-				def close(error = nil)
-					if @stream
-						# If we are closing the body without fully reading it, the underlying connection is now in an undefined state.
+				def discard
+					if stream = @stream
+						@stream = nil
+						
 						if @remaining != 0
-							@stream.close_read
+							stream.close_read
 						end
-						
-						@stream = nil
 					end
+				end
+				
+				def close(error = nil)
+					self.discard
 					
 					super
 				end
@@ -41,11 +44,11 @@ module Protocol
 					if @remaining > 0
 						if @stream
 							# `readpartial` will raise `EOFError` if the stream is finished, or `IOError` if the stream is closed.
-							if chunk = @stream.readpartial(@remaining)
-								@remaining -= chunk.bytesize
-								
-								return chunk
-							end
+							chunk = @stream.readpartial(@remaining)
+							
+							@remaining -= chunk.bytesize
+							
+							return chunk
 						end
 						
 						# If the stream has been closed before we have read the expected length, raise an error:

data/lib/protocol/http1/body/remainder.rb

@@ -3,7 +3,7 @@
 # Released under the MIT License.
 # Copyright, 2019-2024, by Samuel Williams.
 
-require 'protocol/http/body/readable'
+require "protocol/http/body/readable"
 
 module Protocol
 	module HTTP1
@@ -21,12 +21,15 @@ module Protocol
 					@stream.nil?
 				end
 				
-				def close(error = nil)
-					if @stream
-						# We can't really do anything in this case except close the connection.
-						@stream.close_read
+				def discard
+					if stream = @stream
 						@stream = nil
+						stream.close_read
 					end
+				end
+				
+				def close(error = nil)
+					self.discard
 					
 					super
 				end

data/lib/protocol/http1/connection.rb

@@ -7,31 +7,31 @@
 # Copyright, 2023-2024, by Thomas Morgan.
 # Copyright, 2024, by Anton Zhuravsky.
 
-require 'protocol/http/headers'
+require "protocol/http/headers"
 
-require_relative 'reason'
-require_relative 'error'
+require_relative "reason"
+require_relative "error"
 
-require_relative 'body/chunked'
-require_relative 'body/fixed'
-require_relative 'body/remainder'
-require 'protocol/http/body/head'
+require_relative "body/chunked"
+require_relative "body/fixed"
+require_relative "body/remainder"
+require "protocol/http/body/head"
 
-require 'protocol/http/methods'
+require "protocol/http/methods"
 
 module Protocol
 	module HTTP1
-		CONTENT_LENGTH = 'content-length'
+		CONTENT_LENGTH = "content-length"
 		
-		TRANSFER_ENCODING = 'transfer-encoding'
-		CHUNKED = 'chunked'
+		TRANSFER_ENCODING = "transfer-encoding"
+		CHUNKED = "chunked"
 		
-		CONNECTION = 'connection'
-		CLOSE = 'close'
-		KEEP_ALIVE = 'keep-alive'
+		CONNECTION = "connection"
+		CLOSE = "close"
+		KEEP_ALIVE = "keep-alive"
 		
-		HOST = 'host'
-		UPGRADE = 'upgrade'
+		HOST = "host"
+		UPGRADE = "upgrade"
 		
 		# HTTP/1.x request line parser:
 		TOKEN = /[!#$%&'*+\-\.\^_`|~0-9a-zA-Z]+/.freeze

data/lib/protocol/http1/error.rb

@@ -3,7 +3,7 @@
 # Released under the MIT License.
 # Copyright, 2019-2024, by Samuel Williams.
 
-require 'protocol/http/error'
+require "protocol/http/error"
 
 module Protocol
 	module HTTP1

data/lib/protocol/http1/reason.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2022, by Samuel Williams.
+# Copyright, 2019-2024, by Samuel Williams.
 
-require 'protocol/http/error'
+require "protocol/http/error"
 
 module Protocol
 	module HTTP1

data/lib/protocol/http1/version.rb

@@ -5,6 +5,6 @@
 
 module Protocol
 	module HTTP1
-		VERSION = "0.22.0"
+		VERSION = "0.23.0"
 	end
 end

data/lib/protocol/http1.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2022, by Samuel Williams.
+# Copyright, 2019-2024, by Samuel Williams.
 
-require_relative 'http1/version'
-require_relative 'http1/connection'
+require_relative "http1/version"
+require_relative "http1/connection"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-http1
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -42,7 +42,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-09-05 00:00:00.000000000 Z
+date: 2024-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protocol-http