diff options
| author | Abdelkader Boudih <terminale@gmail.com> | 2014-11-27 18:21:43 +0000 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-11-27 16:26:02 -0200 |
| commit | 2e4c9c2ee53c29602d3b5c6bc83403d3b48b3f13 (patch) | |
| tree | 015e8cb7ccefb5fe98361a0ff501d4719aec2d2b /actionpack/lib | |
| parent | dd4203cfaf8ef8f006b26542aa329b5b721701de (diff) | |
| download | rails-2e4c9c2ee53c29602d3b5c6bc83403d3b48b3f13.tar.gz rails-2e4c9c2ee53c29602d3b5c6bc83403d3b48b3f13.tar.bz2 rails-2e4c9c2ee53c29602d3b5c6bc83403d3b48b3f13.zip | |
Merge pull request #17803 from sadfuzzy/patch-2
Update cookies.rb
Conflicts:
actionpack/lib/action_dispatch/middleware/cookies.rb
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/cookies.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb index 9037bf0e0a..c9fff081d6 100644 --- a/actionpack/lib/action_dispatch/middleware/cookies.rb +++ b/actionpack/lib/action_dispatch/middleware/cookies.rb @@ -71,11 +71,13 @@ module ActionDispatch # restrict to the domain level. If you use a schema like www.example.com # and want to share session with user.example.com set <tt>:domain</tt> # to <tt>:all</tt>. Make sure to specify the <tt>:domain</tt> option with - # <tt>:all</tt> again when deleting cookies. + # <tt>:all</tt> or <tt>Array</tt> again when deleting cookies. # # domain: nil # Does not sets cookie domain. (default) # domain: :all # Allow the cookie for the top most level # # domain and subdomains. + # domain: %w(.example.com .example.org) # Allow the cookie + # # for concrete domain names. # # * <tt>:expires</tt> - The time at which this cookie expires, as a \Time object. # * <tt>:secure</tt> - Whether this cookie is only transmitted to HTTPS servers. |