aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2013-07-05 07:05:31 -0700
committerSteve Klabnik <steve@steveklabnik.com>2013-07-05 07:05:31 -0700
commit5ade0ddfe0cb963e7d41a6b5d50e28ee9df3bc00 (patch)
tree41a8de88be05aa9d93c03280d26d8f763d9bc16f /actionpack/lib
parent19f842b5fac1070849800042f8e429d3645b1828 (diff)
parentce89251bb2ff36d32e31944efed5f633eb3f7560 (diff)
downloadrails-5ade0ddfe0cb963e7d41a6b5d50e28ee9df3bc00.tar.gz
rails-5ade0ddfe0cb963e7d41a6b5d50e28ee9df3bc00.tar.bz2
rails-5ade0ddfe0cb963e7d41a6b5d50e28ee9df3bc00.zip
Merge pull request #11131 from ykzts/fix/actiondispatch-ssl-not-required-space
Space is not required for Set-Cookie header
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/middleware/ssl.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/ssl.rb b/actionpack/lib/action_dispatch/middleware/ssl.rb
index 8d5ab19f60..999c022535 100644
--- a/actionpack/lib/action_dispatch/middleware/ssl.rb
+++ b/actionpack/lib/action_dispatch/middleware/ssl.rb
@@ -57,7 +57,7 @@ module ActionDispatch
cookies = cookies.split("\n")
headers['Set-Cookie'] = cookies.map { |cookie|
- if cookie !~ /;\s+secure(;|$)/i
+ if cookie !~ /;\s*secure\s*(;|$)/i
"#{cookie}; secure"
else
cookie