diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-27 10:45:33 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-27 11:13:10 -0700 |
| commit | 97d088ebf249c47a79aea419add1007fa24c1489 (patch) | |
| tree | 27b1611e9491f4342a659d187c01de8c3ae1ca79 | |
| parent | a62a164850f70e08970e04894d186d086bd43c50 (diff) | |
| download | rails-97d088ebf249c47a79aea419add1007fa24c1489.tar.gz rails-97d088ebf249c47a79aea419add1007fa24c1489.tar.bz2 rails-97d088ebf249c47a79aea419add1007fa24c1489.zip | |
use the non-hash dependent Rack utils API
eventually we will refactor this to not know about header hashes
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/http/response.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 4d9f39c3e7..289b915a58 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,7 +27,7 @@ GIT GIT remote: git://github.com/rack/rack.git - revision: c94e22401d4719b4d78378c7b63362cd692f9005 + revision: fd20c3fa80128b19341ba8a0e0fae3bdc7c4c483 specs: rack (2.0.0.alpha) json diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb index d860e00217..0987efc474 100644 --- a/actionpack/lib/action_dispatch/http/response.rb +++ b/actionpack/lib/action_dispatch/http/response.rb @@ -257,11 +257,11 @@ module ActionDispatch # :nodoc: end def set_cookie(key, value) - ::Rack::Utils.set_cookie_header!(header, key, value) + header[SET_COOKIE] = ::Rack::Utils.add_cookie_to_header(header[SET_COOKIE], key, value) end def delete_cookie(key, value={}) - ::Rack::Utils.delete_cookie_header!(header, key, value) + header[SET_COOKIE] = ::Rack::Utils.add_remove_cookie_to_header(header[SET_COOKIE], key, value) end # The location header we'll be responding with. |