fix trailing line breaks in Set-Cookie leading to empty Set-Cookie headers

Author: kratob

actionpack/lib/action_controller/response.rb

@@ -231,7 +231,7 @@ def convert_language!
 
       def convert_cookies!
         set_cookie = headers['Set-Cookie']
-        cookies = set_cookie.is_a?(String) ? set_cookie.lines.to_a : Array(set_cookie)
+        cookies = set_cookie.is_a?(String) ? set_cookie.split("\n") : Array(set_cookie)
         cookies.compact!
         headers['Set-Cookie'] = cookies unless cookies.empty?
       end

actionpack/test/controller/cookie_test.rb

@@ -58,6 +58,11 @@ def set_permanent_signed_cookie
       cookies.permanent.signed[:remember_me] = 100
     end
 
+    def set_cookies_manually
+      headers['Set-Cookie'] = "foo=bar; path=/\nbar=baz; path=/"
+      cookies['user-name'] = "david"
+    end
+
     def rescue_action(e)
       raise unless ActionView::MissingTemplate # No templates here, and we don't care about the output
     end
@@ -123,7 +128,7 @@ def test_not_setting_cookie_with_secure
   def test_multiple_cookies
     get :set_multiple_cookies
     assert_equal 2, @response.cookies.size
-    assert_equal "user_name=david; path=/; expires=Mon, 10-Oct-2005 05:00:00 GMT\n", @response.headers["Set-Cookie"][0]
+    assert_equal "user_name=david; path=/; expires=Mon, 10-Oct-2005 05:00:00 GMT", @response.headers["Set-Cookie"][0]
     assert_equal "login=XJ-122; path=/", @response.headers["Set-Cookie"][1]
     assert_equal({"login" => "XJ-122", "user_name" => "david"}, @response.cookies)
   end
@@ -193,6 +198,11 @@ def test_permanent_signed_cookie
     assert_equal 100, @controller.send(:cookies).signed[:remember_me]
   end
 
+  def test_manual_cookie_header_is_merged
+    get :set_cookies_manually
+    assert_equal ["foo=bar; path=/", "bar=baz; path=/", "user-name=david; path=/"], @response.headers["Set-Cookie"]
+  end
+
   private
     def with_environment(enviroment)
       old_rails = Object.const_get(:Rails) rescue nil