diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-10-11 12:28:38 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-10-11 12:28:38 +1030 |
| commit | f8c53eff7be9a5670e3c0da5851312977becb308 (patch) | |
| tree | 280b4a0070cbc7a275ca79eaf3bd1bcf298697da /actioncable/lib/action_cable/server | |
| parent | bc9dc418259f1db0f14ed895e8469b7839ef474b (diff) | |
| parent | 268c340b0909bd78259e58b1ed0b53133d924199 (diff) | |
| download | rails-f8c53eff7be9a5670e3c0da5851312977becb308.tar.gz rails-f8c53eff7be9a5670e3c0da5851312977becb308.tar.bz2 rails-f8c53eff7be9a5670e3c0da5851312977becb308.zip | |
Merge pull request #26568 from skateman/cable-sameorigin-as-host
Optionally allow ActionCable requests from the same host as origin
Diffstat (limited to 'actioncable/lib/action_cable/server')
| -rw-r--r-- | actioncable/lib/action_cable/server/configuration.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actioncable/lib/action_cable/server/configuration.rb b/actioncable/lib/action_cable/server/configuration.rb index dc146f07b0..aa8d10b3d4 100644 --- a/actioncable/lib/action_cable/server/configuration.rb +++ b/actioncable/lib/action_cable/server/configuration.rb @@ -5,7 +5,7 @@ module ActionCable class Configuration attr_accessor :logger, :log_tags attr_accessor :connection_class, :worker_pool_size - attr_accessor :disable_request_forgery_protection, :allowed_request_origins + attr_accessor :disable_request_forgery_protection, :allowed_request_origins, :allow_same_origin_as_host attr_accessor :cable, :url, :mount_path def initialize @@ -15,6 +15,7 @@ module ActionCable @worker_pool_size = 4 @disable_request_forgery_protection = false + @allow_same_origin_as_host = false end # Returns constant of subscription adapter specified in config/cable.yml. |