http-protocol 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 242ba5105135ba4ed2bff4ccef1e1a77fb416788fbf527eb6221de8eb0026225
-  data.tar.gz: 9bbcd87adf08d36f38b44d581a82243494a68adf66d6e63fb6e559de60bb6ac6
+  metadata.gz: 9327c9adf284058c58e7e426b736ff72e3752fecd81197fe6b924a1c6df5c283
+  data.tar.gz: a34c59791a0aaa73fa92ac2414142ce3b0fc8fcb0eeaffc681b470dd81a239ee
 SHA512:
-  metadata.gz: 9a57f0e967f1d74a52c04112eb8d617b974f836f5c898ced1846e29ead3e4fb3a82f503bf7926f8948920637de895ccd9aef7c54066410b2ba9e801cc962352d
-  data.tar.gz: 8bd4615ca2b519412ec0c164639af7dd99e005aaf3cae3f0b7aa8bfb64ba99d57fa12ff3adda731878017b4d2424fae4af0dab51873d9422b101c0aa4c36a1f5
+  metadata.gz: eaac214ab838e2e1a96a86ccd4756af6a7213b79157f738c43cbdaf2754e36b2dd08e04da675d49cd3f1d199db5bcfa9e468381e48ac8155508b920ef48e3e88
+  data.tar.gz: 8f1dc78539df7034795ba5d407213d3905f354878bf3758e4261b0ac7cbc61b88c6338c924ac4abd23462266e2d8e94e56b5fe26b6cb93d0dbbcd1fa97db6b03

data/lib/http/protocol/{http11 → http1}/connection.rb

@@ -22,32 +22,54 @@ require_relative '../error'
 
 module HTTP
 	module Protocol
-		module HTTP11
+		module HTTP1
 			class Connection
 				CRLF = "\r\n".freeze
-				VERSION = "HTTP/1.1".freeze
+				HTTP10 = "HTTP/1.0".freeze
+				HTTP11 = "HTTP/1.1".freeze
 				
-				def initialize(stream, persistent = true)
+				def initialize(stream, version = HTTP11, persistent = true)
 					@stream = stream
 					
+					@version = version
 					@persistent = persistent
 					
 					@count = 0
 				end
 				
 				attr :stream
+				
+				# The default HTTP version to use (if none specified).
+				attr :version
+				
+				# Whether the connection is persistent.
 				attr :persistent
+				
+				# The number of requests processed.
 				attr :count
 				
-				def version
-					VERSION
+				def persistent?(version, headers)
+					if version == HTTP10
+						if connection = headers[CONNECTION]
+							return connection.include?(KEEP_ALIVE)
+						else
+							return false
+						end
+					else
+						if connection = headers[CONNECTION]
+							return !connection.include?(CLOSE)
+						else
+							return true
+						end
+					end
 				end
 				
-				def persistent?(headers)
-					if connection = headers[CONNECTION]
-						return !connection.include?(CLOSE)
+				# Write the appropriate header for connection persistence.
+				def write_persistent_header(version)
+					if version == HTTP10
+						@stream.write("connection: keep-alive\r\n") if @persistent
 					else
-						return true
+						@stream.write("connection: close\r\n") unless @persistent
 					end
 				end
 				
@@ -61,11 +83,6 @@ module HTTP
 					return @stream
 				end
 				
-				# Write the appropriate header for connection persistence.
-				def write_persistent_header
-					@stream.write("connection: keep-alive\r\n") if @persistent
-				end
-				
 				# Close the connection and underlying stream.
 				def close
 					@stream.close
@@ -76,18 +93,21 @@ module HTTP
 					@stream.write("host: #{authority}\r\n")
 					
 					write_headers(headers)
+					write_persistent_header(version)
 					
 					@stream.flush
 				end
 				
 				def write_response(version, status, headers, body = nil, head = false)
 					@stream.write("#{version} #{status}\r\n")
+					
 					write_headers(headers)
+					write_persistent_header(version)
 					
 					if head
 						write_body_head(body)
 					else
-						write_body(body)
+						write_body(body, version == HTTP11)
 					end
 					
 					@stream.flush
@@ -119,7 +139,7 @@ module HTTP
 					method, path, version = read_line.split(/\s+/, 3)
 					headers = read_headers
 					
-					@persistent = persistent?(headers)
+					@persistent = persistent?(version, headers)
 					
 					body = read_request_body(headers)
 					
@@ -134,7 +154,7 @@ module HTTP
 					
 					headers = read_headers
 					
-					@persistent = persistent?(headers)
+					@persistent = persistent?(version, headers)
 					
 					body = read_response_body(method, status, headers)
 					
@@ -187,8 +207,6 @@ module HTTP
 				end
 				
 				def write_empty_body(body)
-					# Write empty body:
-					write_persistent_header
 					@stream.write("content-length: 0\r\n\r\n")
 					
 					body.read if body
@@ -197,7 +215,6 @@ module HTTP
 				end
 				
 				def write_fixed_length_body(body, length)
-					write_persistent_header
 					@stream.write("content-length: #{length}\r\n\r\n")
 					
 					chunk_length = 0
@@ -219,7 +236,6 @@ module HTTP
 				end
 				
 				def write_chunked_body(body)
-					write_persistent_header
 					@stream.write("transfer-encoding: chunked\r\n\r\n")
 					
 					body.each do |chunk|
@@ -238,7 +254,6 @@ module HTTP
 				def write_body_and_close(body)
 					# We can't be persistent because we don't know the data length:
 					@persistent = false
-					write_persistent_header
 					
 					@stream.write("\r\n")
 					
@@ -263,8 +278,6 @@ module HTTP
 				end
 				
 				def write_body_head(body)
-					write_persistent_header
-					
 					if body.nil? or body.empty?
 						@stream.write("content-length: 0\r\n\r\n")
 					elsif length = body.length

data/lib/http/protocol/version.rb

@@ -20,6 +20,6 @@
 
 module HTTP
 	module Protocol
-		VERSION = "0.5.0"
+		VERSION = "0.6.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http-protocol
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-30 00:00:00.000000000 Z
+date: 2018-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-hpack
@@ -83,8 +83,7 @@ files:
 - lib/http/protocol.rb
 - lib/http/protocol/error.rb
 - lib/http/protocol/headers.rb
-- lib/http/protocol/http10/connection.rb
-- lib/http/protocol/http11/connection.rb
+- lib/http/protocol/http1/connection.rb
 - lib/http/protocol/http2/client.rb
 - lib/http/protocol/http2/connection.rb
 - lib/http/protocol/http2/continuation_frame.rb

data/lib/http/protocol/http10/connection.rb

@@ -1,52 +0,0 @@
-# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-require_relative '../http11/connection'
-
-module HTTP
-	module Protocol
-		module HTTP10
-			class Connection < HTTP11::Connection
-				VERSION = "HTTP/1.0".freeze
-				
-				def version
-					VERSION
-				end
-				
-				def persistent?(headers)
-					if connection = headers[CONNECTION]
-						return connection.include?(KEEP_ALIVE)
-					else
-						return false
-					end
-				end
-				
-				def write_persistent_header
-					@stream.write("connection: keep-alive\r\n") if @persistent
-				end
-				
-				def write_body(body, chunked = false)
-					# We don't support chunked encoding by default.
-					super(body, chunked)
-				end
-			end
-		end
-	end
-end