protocol-http1 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62f627bcb79ea69ffb6e8c4aef117cb467a248e30de49fc71ecbde19a9ea7efc
-  data.tar.gz: 0f989b969a3242abe794e8ade640d65cdc1c08730e8f04e40bdf073cda02139f
+  metadata.gz: 2dfc82795dbd903f87734cbb81c3606a77c0805798d12c1175d7ead652df3fca
+  data.tar.gz: 6ac2c382cdf141214fc27b07c3c7e19b47759dc373a4d08a81895d2a027a57ef
 SHA512:
-  metadata.gz: 19ed83781ae2acf812f07182a16581067e929f5faa9bccaa5265a265919c02c30efcaecd97ece717b11b4a370fd948720ea20ef82fd27dae4d57683266507b8e
-  data.tar.gz: 5ef114c31372b9058f4daae3962286d4afd60188736c0fa2726fb73d420c54cb54992ea1d3a8637d05c939f8da8229371a44a8068549f2cf37d02aad2cdfe746
+  metadata.gz: 2d9eb50902a3e8865a00fcb2658fa2d639ac41ce1e91e57868099822a8b4205fe177de0cae438d933e7bfbd38fda2fa4aa4de4427ae8bd21601151a98cb61519
+  data.tar.gz: 477a532d2b52e92c94022733d02d8c77bab86de01f7eda6bb65f447a3414c8f8f8a6253dc70b6adfcb4771b611bc2f826a42248d6e83bb6c89f8a6b466578350

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

@@ -24,23 +24,29 @@ module Protocol
 	module HTTP1
 		module Body
 			class Remainder < HTTP::Body::Readable
+				BLOCK_SIZE = 1024 * 64
+				
+				# block_size may be removed in the future. It is better managed by stream.
 				def initialize(stream)
 					@stream = stream
 				end
 				
 				def empty?
-					@stream.closed?
+					@stream.eof? or @stream.closed?
 				end
 				
 				def close(error = nil)
 					# We can't really do anything in this case except close the connection.
 					@stream.close
-				
+					
 					super
 				end
 				
+				# TODO this is a bit less efficient in order to maintain compatibility with `IO`.
 				def read
-					@stream.read_partial
+					@stream.readpartial(BLOCK_SIZE)
+				rescue EOFError
+					return nil
 				end
 				
 				def call(stream)
@@ -52,7 +58,7 @@ module Protocol
 				end
 				
 				def join
-					read
+					@stream.read
 				end
 				
 				def inspect

data/lib/protocol/http1/connection.rb

@@ -74,7 +74,11 @@ module Protocol
 				end
 			end
 			
-			def persistent?(version, headers)
+			def persistent?(version, method, headers)
+				if method == HTTP::Methods::CONNECT
+					return false
+				end
+				
 				if version == HTTP10
 					if connection = headers[CONNECTION]
 						return connection.include?(KEEP_ALIVE)
@@ -159,9 +163,9 @@ module Protocol
 				
 				headers = read_headers
 				
-				@persistent = persistent?(version, headers)
+				@persistent = persistent?(version, method, headers)
 				
-				body = read_request_body(headers)
+				body = read_request_body(method, headers)
 				
 				@count += 1
 				
@@ -175,7 +179,7 @@ module Protocol
 				
 				headers = read_headers
 				
-				@persistent = persistent?(version, headers)
+				@persistent = persistent?(version, method, headers)
 				
 				body = read_response_body(method, status, headers)
 				
@@ -208,9 +212,33 @@ module Protocol
 				@stream.write("\r\n")
 				@stream.flush # Don't remove me!
 				
-				body&.each do |chunk|
-					@stream.write(chunk)
-					@stream.flush
+				if body
+					body.each do |chunk|
+						@stream.write(chunk)
+						@stream.flush
+					end
+					
+					@stream.close_write
+				end
+				
+				return @stream
+			end
+			
+			def write_tunnel_body(version, body = nil)
+				@persistent = false
+				
+				write_connection_header(version)
+				
+				@stream.write("\r\n")
+				@stream.flush # Don't remove me!
+				
+				if body
+					body.each do |chunk|
+						@stream.write(chunk)
+						@stream.flush
+					end
+					
+					@stream.close_write
 				end
 				
 				return @stream
@@ -341,7 +369,7 @@ module Protocol
 				# code is always terminated by the first empty line after the
 				# header fields, regardless of the header fields present in the
 				# message, and thus cannot contain a message body.
-				if method == "HEAD" or (status >= 100 and status < 200) or status == 204 or status == 304
+				if method == HTTP::Methods::HEAD or (status >= 100 and status < 200) or status == 204 or status == 304
 					return nil
 				end
 				
@@ -350,14 +378,23 @@ module Protocol
 				# line that concludes the header fields.  A client MUST ignore any
 				# Content-Length or Transfer-Encoding header fields received in
 				# such a message.
-				if method == "CONNECT" and status == 200
+				if method == HTTP::Methods::CONNECT and status == 200
 					return read_tunnel_body
 				end
 				
 				return read_body(headers, true)
 			end
 			
-			def read_request_body(headers)
+			def read_request_body(method, headers)
+				# 2.  Any 2xx (Successful) response to a CONNECT request implies that
+				# the connection will become a tunnel immediately after the empty
+				# line that concludes the header fields.  A client MUST ignore any
+				# Content-Length or Transfer-Encoding header fields received in
+				# such a message.
+				if method == HTTP::Methods::CONNECT
+					return read_tunnel_body
+				end
+				
 				# 6.  If this is a request message and none of the above are true, then
 				# the message body length is zero (no message body is present).
 				return read_body(headers)

data/lib/protocol/http1/version.rb

@@ -20,6 +20,6 @@
 
 module Protocol
 	module HTTP1
-		VERSION = "0.8.3"
+		VERSION = "0.9.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protocol-http1
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-10 00:00:00.000000000 Z
+date: 2019-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protocol-http