protocol-http1 0.15.1 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 628996f62e649fce9998463a3147bba9690074ccd422d8973b56840f169ddbef
-  data.tar.gz: 368fd3265a87abe2f0300741f568194d5f479121fd49ccf51e0fdce6725dd080
+  metadata.gz: f969e504112849ed6eccb047bd8e240fc79dc92efd2835f8676469064fe2656c
+  data.tar.gz: 25ffd9feeede23158051a130c5047f80a1f6f72b5c438e9adbc7fc1296add536
 SHA512:
-  metadata.gz: c3b589a20fb9395b6245ace8b113b7c57f541e9077562cece7673e8ba3577c0825bc71ed229902447e7abc735e126e6d2cd7a2b4a5b9385e24b5e5fb7c3596da
-  data.tar.gz: 15ff254cb06790546e76b00de892c10e712eb42ca30629b9c527d90034c252993c9de71be6d6b9f3f0cb26745ab554cf71e75e63e18a8b847c510d2bad16d45c
+  metadata.gz: 0b40ee03ea89a7daf74e3e93a441b2ff2f1933657bb95440682d9eacf85487523a38a7fe1ef5aed251a2d784f0fd8b5cb87d674561a579b1f928ef104b7ef5d7
+  data.tar.gz: 7063c346d1de2461b0ad5ee40aaa9b3992f0eb37f5930ba62869bc1b01df0d3c91b268e65a757bb98026b740036796a3e42a85add7bd7421a2e098bdd79a4fd0

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

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2022, by Samuel Williams.
+# Copyright, 2019-2023, by Samuel Williams.
+# Copyright, 2023, by Thomas Morgan.
 
 require 'protocol/http/body/readable'
 
@@ -41,7 +42,7 @@ module Protocol
 				def read
 					return nil if @finished
 					
-					length, extensions = read_line.split(";", 2)
+					length, _extensions = read_line.split(";", 2)
 					
 					unless length =~ VALID_CHUNK_LENGTH
 						raise BadRequest, "Invalid chunk length: #{length.dump}"

data/lib/protocol/http1/connection.rb

@@ -4,6 +4,7 @@
 # Copyright, 2019-2023, by Samuel Williams.
 # Copyright, 2019, by Brian Morearty.
 # Copyright, 2020, by Bruno Sutic.
+# Copyright, 2023, by Thomas Morgan.
 
 require 'protocol/http/headers'
 
@@ -59,7 +60,14 @@ module Protocol
 			attr :stream
 			
 			# Whether the connection is persistent.
-			attr :persistent
+			# This determines what connection headers are sent in the response and whether
+			# the connection can be reused after the response is sent.
+			# This setting is automatically managed according to the nature of the request
+			# and response.
+			# Changing to false is safe.
+			# Changing to true from outside this class should generally be avoided and,
+			# depending on the response semantics, may be reset to false anyway.
+			attr_accessor :persistent
 			
 			# The number of requests processed.
 			attr :count
@@ -128,6 +136,15 @@ module Protocol
 				write_headers(headers)
 			end
 			
+			def write_interim_response(version, status, headers, reason = Reason::DESCRIPTIONS[status])
+				@stream.write("#{version} #{status} #{reason}\r\n")
+				
+				write_headers(headers)
+				
+				@stream.write("\r\n")
+				@stream.flush
+			end
+			
 			def write_headers(headers)
 				headers.each do |name, value|
 					# Convert it to a string:
@@ -156,7 +173,7 @@ module Protocol
 				read_line? or raise EOFError
 			end
 			
-			def read_request
+			def read_request_line
 				return unless line = read_line?
 				
 				if match = line.match(REQUEST_LINE)
@@ -165,6 +182,13 @@ module Protocol
 					raise InvalidRequest, line.inspect
 				end
 				
+				return method, path, version
+			end
+			
+			def read_request
+				method, path, version = read_request_line
+				return unless method
+				
 				headers = read_headers
 				
 				@persistent = persistent?(version, method, headers)
@@ -176,11 +200,17 @@ module Protocol
 				return headers.delete(HOST), method, path, version, headers, body
 			end
 			
-			def read_response(method)
+			def read_response_line
 				version, status, reason = read_line.split(/\s+/, 3)
 				
 				status = Integer(status)
 				
+				return version, status, reason
+			end
+			
+			def read_response(method)
+				version, status, reason = read_response_line
+				
 				headers = read_headers
 				
 				@persistent = persistent?(version, method, headers)
@@ -405,7 +435,7 @@ module Protocol
 					if content_length =~ VALID_CONTENT_LENGTH
 						yield Integer(content_length, 10)
 					else
-						raise BadRequest, "Invalid content length: #{content_length}"
+						raise BadRequest, "Invalid content length: #{content_length.dump}"
 					end
 				end
 			end

data/lib/protocol/http1/version.rb

@@ -5,6 +5,6 @@
 
 module Protocol
 	module HTTP1
-		VERSION = "0.15.1"
+		VERSION = "0.16.1"
 	end
 end

data/license.md

@@ -4,6 +4,7 @@ Copyright, 2019-2023, by Samuel Williams.
 Copyright, 2019, by Brian Morearty.  
 Copyright, 2020, by Olle Jonsson.  
 Copyright, 2020, by Bruno Sutic.  
+Copyright, 2023, by Thomas Morgan.  
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/readme.md

@@ -75,4 +75,4 @@ This project uses the [Developer Certificate of Origin](https://developercertifi
 
 ### Contributor Covenant
 
-This project is governed by [Contributor Covenant](https://www.contributor-covenant.org/). All contributors and participants agree to abide by its terms.
+This project is governed by the [Contributor Covenant](https://www.contributor-covenant.org/). All contributors and participants agree to abide by its terms.

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: protocol-http1
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.1
 platform: ruby
 authors:
 - Samuel Williams
+- Thomas Morgan
 - Brian Morearty
 - Bruno Sutic
 - Olle Jonsson
@@ -40,7 +41,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2023-07-30 00:00:00.000000000 Z
+date: 2023-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protocol-http
@@ -84,7 +85,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.6b
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="