Fix implementation of rack.hijack. (#10)

socketry · Dec 11, 2023 · 2023f79 · 2023f79
1 parent 3a9ff0e
commit 2023f79
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/lib/protocol/rack/adapter/generic.rb b/lib/protocol/rack/adapter/generic.rb
@@ -73,10 +73,6 @@ def unwrap_request(request, env)
 						env[CGI::HTTP_UPGRADE] = Array(protocol).join(",")
 					end
 
-					if request.respond_to?(:hijack?) and request.hijack?
-						env[RACK_HIJACK] = proc{request.hijack!.io.dup}
-					end
-
 					# HTTP/2 prefers `:authority` over `host`, so we do this for backwards compatibility.
 					env[CGI::HTTP_HOST] ||= request.authority
 

diff --git a/lib/protocol/rack/adapter/rack2.rb b/lib/protocol/rack/adapter/rack2.rb
@@ -17,9 +17,6 @@ class Rack2	< Generic
 				RACK_MULTIPROCESS = 'rack.multiprocess'
 				RACK_RUN_ONCE = 'rack.run_once'
 
-				RACK_IS_HIJACK = 'rack.hijack?'
-				RACK_HIJACK = 'rack.hijack'
-
 				def self.wrap(app)
 					Rewindable.new(self.new(app))
 				end

diff --git a/lib/protocol/rack/adapter/rack3.rb b/lib/protocol/rack/adapter/rack3.rb
@@ -59,6 +59,10 @@ def make_environment(request)
 
 					self.unwrap_request(request, env)
 
+					if request.respond_to?(:hijack?) and request.hijack?
+						env[RACK_HIJACK] = proc{request.hijack!.io.dup}
+					end
+
 					return env
 				end
 

diff --git a/lib/protocol/rack/constants.rb b/lib/protocol/rack/constants.rb
@@ -36,5 +36,9 @@ module CGI
 		RACK_URL_SCHEME = 'rack.url_scheme'
 		RACK_PROTOCOL = 'rack.protocol'
 		RACK_RESPONSE_FINISHED = 'rack.response_finished'
+
+		# Rack hijack support:
+		RACK_IS_HIJACK = 'rack.hijack?'
+		RACK_HIJACK = 'rack.hijack'
 	end
 end