mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
John Hawthorn 2021-05-24 18:36:35 -07:00
parent 43a0e55c92
commit 14688b5578
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.lock
View File

@ -45,7 +45,7 @@ PATH
actionpack (7.0.0.alpha) actionpack (7.0.0.alpha)
actionview (= 7.0.0.alpha) actionview (= 7.0.0.alpha)
activesupport (= 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) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0)

2
actionpack/actionpack.gemspec
View File

@ -34,7 +34,7 @@ Gem::Specification.new do |s|
s.add_dependency "activesupport", version 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 "rack-test", ">= 0.6.3"
s.add_dependency "rails-html-sanitizer", "~> 1.0", ">= 1.2.0" s.add_dependency "rails-html-sanitizer", "~> 1.0", ">= 1.2.0"
s.add_dependency "rails-dom-testing", "~> 2.0" s.add_dependency "rails-dom-testing", "~> 2.0"

4
actionpack/lib/action_dispatch/http/request.rb
View File

@ -428,10 +428,6 @@ module ActionDispatch
def commit_flash def commit_flash
end end
def ssl?
super || scheme == "wss"
end
def inspect # :nodoc: def inspect # :nodoc:
"#<#{self.class.name} #{method} #{original_url.dump} for #{remote_ip}>" "#<#{self.class.name} #{method} #{original_url.dump} for #{remote_ip}>"
end end