diff options
| author | brainopia <brainopia@evilmartians.com> | 2011-01-21 14:58:33 +0300 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-01-21 13:13:43 +0100 |
| commit | 91a4193ee002d20e1b9bd637a5f14ac6213c8f39 (patch) | |
| tree | 9e34dee9386a9fb4760527f234b87cbc5b2242d9 /actionpack/lib/action_dispatch | |
| parent | 02319b7982fa7e55aecf79ede8bf0cb6961e0206 (diff) | |
| download | rails-91a4193ee002d20e1b9bd637a5f14ac6213c8f39.tar.gz rails-91a4193ee002d20e1b9bd637a5f14ac6213c8f39.tar.bz2 rails-91a4193ee002d20e1b9bd637a5f14ac6213c8f39.zip | |
Support list of possible domains for cookies
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/cookies.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb index f369d2d3c2..0a230fed2c 100644 --- a/actionpack/lib/action_dispatch/middleware/cookies.rb +++ b/actionpack/lib/action_dispatch/middleware/cookies.rb @@ -136,6 +136,9 @@ module ActionDispatch options[:domain] = if (@host !~ /^[\d.]+$/) && (@host =~ DOMAIN_REGEXP) ".#{$1}.#{$2}" end + elsif options[:domain].is_a? Array + # if host matches one of the supplied domains without a dot in front of it + options[:domain] = options[:domain].find {|domain| @host.include? domain[/^\.?(.*)$/, 1] } end end |