Skip to content

Commit cb8fc82

Browse files
authored
Merge pull request rails#42349 from jhawthorn/bump_rack_dependency
Bump rack to remove ssl? override
2 parents 0d18b43 + 14688b5 commit cb8fc82

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ PATH
4545
actionpack (7.0.0.alpha)
4646
actionview (= 7.0.0.alpha)
4747
activesupport (= 7.0.0.alpha)
48-
rack (~> 2.0, >= 2.0.9)
48+
rack (~> 2.0, >= 2.2.0)
4949
rack-test (>= 0.6.3)
5050
rails-dom-testing (~> 2.0)
5151
rails-html-sanitizer (~> 1.0, >= 1.2.0)

actionpack/actionpack.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
3434

3535
s.add_dependency "activesupport", version
3636

37-
s.add_dependency "rack", "~> 2.0", ">= 2.0.9"
37+
s.add_dependency "rack", "~> 2.0", ">= 2.2.0"
3838
s.add_dependency "rack-test", ">= 0.6.3"
3939
s.add_dependency "rails-html-sanitizer", "~> 1.0", ">= 1.2.0"
4040
s.add_dependency "rails-dom-testing", "~> 2.0"

actionpack/lib/action_dispatch/http/request.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -428,10 +428,6 @@ def logger
428428
def commit_flash
429429
end
430430

431-
def ssl?
432-
super || scheme == "wss"
433-
end
434-
435431
def inspect # :nodoc:
436432
"#<#{self.class.name} #{method} #{original_url.dump} for #{remote_ip}>"
437433
end

0 commit comments

Comments
 (0)