From be5e6cea7380545b0bce29be3fafbff4afcb2be4 Mon Sep 17 00:00:00 2001 From: Jeremy Daer Date: Thu, 1 Oct 2015 18:47:13 -0700 Subject: Don't set a nil Set-Cookie header when there aren't any cookies. Omit the header. --- actionpack/lib/action_dispatch/middleware/cookies.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'actionpack/lib/action_dispatch/middleware/cookies.rb') diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb index 7ed77352ae..2889acaeb8 100644 --- a/actionpack/lib/action_dispatch/middleware/cookies.rb +++ b/actionpack/lib/action_dispatch/middleware/cookies.rb @@ -396,7 +396,9 @@ module ActionDispatch end def write(headers) - headers[HTTP_HEADER] = make_set_cookie_header headers[HTTP_HEADER] + if header = make_set_cookie_header(headers[HTTP_HEADER]) + headers[HTTP_HEADER] = header + end end mattr_accessor :always_write_cookie -- cgit v1.2.3