diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-02-24 11:26:49 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-02-24 11:26:49 +1030 |
| commit | 52bcbde60d101536d531337b9edb83a94604bc74 (patch) | |
| tree | 4b5b82039ba96581e872d035df295c4b2ee54016 /actionpack/lib/action_dispatch | |
| parent | 2c02bc0a47777ad8cf98e1465c08b1a68151803e (diff) | |
| parent | 6edfcdd4aa896dbbf431fcf3992e0d1cd2dac3b2 (diff) | |
| download | rails-52bcbde60d101536d531337b9edb83a94604bc74.tar.gz rails-52bcbde60d101536d531337b9edb83a94604bc74.tar.bz2 rails-52bcbde60d101536d531337b9edb83a94604bc74.zip | |
Merge pull request #23632 from maclover7/fix-23620
Fix `request.ssl?` bug with Action Cable
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]}") |