From 14688b5578cb8e86687d0f504db7bb0771dcfa15 Mon Sep 17 00:00:00 2001
From: John Hawthorn <john@hawthorn.email>
Date: Mon, 24 May 2021 18:36:35 -0700
Subject: [PATCH] Bump rack to remove ssl? override

Rack 2.2+ already understands "wss" as being "ssl", so bumping the
requirement lets us remove this override and call to super.
---
 Gemfile.lock                                   | 2 +-
 actionpack/actionpack.gemspec                  | 2 +-
 actionpack/lib/action_dispatch/http/request.rb | 4 ----
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 479058aaa9..5863985e4b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,7 +45,7 @@ PATH
     actionpack (7.0.0.alpha)
       actionview (= 7.0.0.alpha)
       activesupport (= 7.0.0.alpha)
-      rack (~> 2.0, >= 2.0.9)
+      rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index 4d283a6b8b..f6abfbeb54 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "activesupport", version
 
-  s.add_dependency "rack",      "~> 2.0", ">= 2.0.9"
+  s.add_dependency "rack",      "~> 2.0", ">= 2.2.0"
   s.add_dependency "rack-test", ">= 0.6.3"
   s.add_dependency "rails-html-sanitizer", "~> 1.0", ">= 1.2.0"
   s.add_dependency "rails-dom-testing", "~> 2.0"
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 082fc50cc7..360b556eb1 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -428,10 +428,6 @@ module ActionDispatch
     def commit_flash
     end
 
-    def ssl?
-      super || scheme == "wss"
-    end
-
     def inspect # :nodoc:
       "#<#{self.class.name} #{method} #{original_url.dump} for #{remote_ip}>"
     end