aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/http/response.rb
diff options
context:
space:
mode:
authoreileencodes <eileencodes@gmail.com>2015-12-06 16:28:45 -0500
committereileencodes <eileencodes@gmail.com>2015-12-06 16:28:45 -0500
commitff891616ac8a5c41f1fa2aba6c747d81f0782198 (patch)
tree22130a86785c32b4922f164bdfc4170029556bd8 /actionpack/lib/action_dispatch/http/response.rb
parent8350925bec434168f56b4fae22b5298cb4a83c41 (diff)
downloadrails-ff891616ac8a5c41f1fa2aba6c747d81f0782198.tar.gz
rails-ff891616ac8a5c41f1fa2aba6c747d81f0782198.tar.bz2
rails-ff891616ac8a5c41f1fa2aba6c747d81f0782198.zip
Only commit the cookie jar if it hasn't been committed
We don't want to commit the cookie jar more than once because then we will be attempting to modify a frozen hash. Fixes Railties test failure caused by 492b134.
Diffstat (limited to 'actionpack/lib/action_dispatch/http/response.rb')
-rw-r--r--actionpack/lib/action_dispatch/http/response.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index 9a10dc73d9..9b11111a67 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -413,7 +413,7 @@ module ActionDispatch # :nodoc:
def before_sending
headers.freeze
- request.commit_cookie_jar!
+ request.commit_cookie_jar! unless committed?
end
def build_buffer(response, body)