diff options
| author | Jon Moss <me@jonathanmoss.me> | 2016-02-11 19:41:27 -0500 |
|---|---|---|
| committer | Jon Moss <me@jonathanmoss.me> | 2016-02-23 16:09:44 -0500 |
| commit | 6edfcdd4aa896dbbf431fcf3992e0d1cd2dac3b2 (patch) | |
| tree | 1322bbc98894448517f8b183fd0590cdbd123b28 /actionpack/lib/action_dispatch | |
| parent | e9b96f0d666adfd3484641a4a55feb1c774d3378 (diff) | |
| download | rails-6edfcdd4aa896dbbf431fcf3992e0d1cd2dac3b2.tar.gz rails-6edfcdd4aa896dbbf431fcf3992e0d1cd2dac3b2.tar.bz2 rails-6edfcdd4aa896dbbf431fcf3992e0d1cd2dac3b2.zip | |
Fix `request.ssl?` bug with Action Cable
This bug affects `wss://` requests when running Action Cable in-app.
Fixes #23620.
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/request.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb index 5427425ef7..316a9f08b7 100644 --- a/actionpack/lib/action_dispatch/http/request.rb +++ b/actionpack/lib/action_dispatch/http/request.rb @@ -403,6 +403,10 @@ module ActionDispatch def commit_flash end + def ssl? + super || scheme == 'wss'.freeze + end + private def check_method(name) HTTP_METHOD_LOOKUP[name] || raise(ActionController::UnknownHttpMethod, "#{name}, accepted HTTP methods are #{HTTP_METHODS[0...-1].join(', ')}, and #{HTTP_METHODS[-1]}") |