From b005a1c038504e6df71866306d024ff768ab5555 Mon Sep 17 00:00:00 2001 From: Jesse Storimer Date: Tue, 1 Jun 2010 08:35:25 -0400 Subject: [PATCH] CookieStore should expect the Set-Cookie header to be an Array [#4743 state:resolved] --- .../lib/action_controller/session/cookie_store.rb | 2 +- .../test/controller/session/cookie_store_test.rb | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/actionpack/lib/action_controller/session/cookie_store.rb b/actionpack/lib/action_controller/session/cookie_store.rb index 3d21e81..a5727e7 100644 --- a/actionpack/lib/action_controller/session/cookie_store.rb +++ b/actionpack/lib/action_controller/session/cookie_store.rb @@ -115,7 +115,7 @@ module ActionController cookie = build_cookie(@key, cookie.merge(options)) unless headers[HTTP_SET_COOKIE].blank? - headers[HTTP_SET_COOKIE] << "\n#{cookie}" + headers[HTTP_SET_COOKIE] << "#{cookie}" else headers[HTTP_SET_COOKIE] = cookie end diff --git a/actionpack/test/controller/session/cookie_store_test.rb b/actionpack/test/controller/session/cookie_store_test.rb index 5ef8eec..6759d93 100644 --- a/actionpack/test/controller/session/cookie_store_test.rb +++ b/actionpack/test/controller/session/cookie_store_test.rb @@ -44,6 +44,12 @@ class CookieStoreTest < ActionController::IntegrationTest head :ok end + def set_session_value_and_cookie + cookies["foo"] = "bar" + session[:foo] = "bar" + render :text => Rack::Utils.escape(Verifier.generate(session.to_hash)) + end + def rescue_action(e) raise end end @@ -193,6 +199,14 @@ class CookieStoreTest < ActionController::IntegrationTest end end + def test_setting_session_value_and_cookie + with_test_route_set do + get '/set_session_value_and_cookie' + assert_response :success + assert_equal({"_myapp_session" => response.body, "foo" => "bar"}, cookies) + end + end + private def with_test_route_set with_routing do |set| -- 1.7.1