aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG.md
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-12-31 08:08:16 -0800
committerSantiago Pastorino <santiago@wyeworks.com>2012-12-31 08:08:16 -0800
commite48dc194231830f42f179704596b88215f062c23 (patch)
treefd53e7bbfd00af4ff8fbc82be958de539c247d9e /actionpack/CHANGELOG.md
parentd38c8caa48a732d41c7402a5e71deece4e313559 (diff)
parent55a886b6e9bae1986a357626b08522a838aedb3e (diff)
downloadrails-e48dc194231830f42f179704596b88215f062c23.tar.gz
rails-e48dc194231830f42f179704596b88215f062c23.tar.bz2
rails-e48dc194231830f42f179704596b88215f062c23.zip
Merge pull request #8665 from senny/8661_should_not_append_charset_if_already_present
backport #8662, charset should not be appended for `head` responses
Diffstat (limited to 'actionpack/CHANGELOG.md')
-rw-r--r--actionpack/CHANGELOG.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index a681a2dc79..2f4e4c3985 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,12 @@
## Rails 3.2.10 (unreleased) ##
+* Do not append `charset=` parameter when `head` is called with a
+ `:content_type` option.
+ Fix #8661.
+ Backport #8662.
+
+ *Yves Senn*
+
* Clear url helper methods when routes are reloaded by removing the methods
explicitly rather than just clearing the module because it didn't work
properly and could be the source of a memory leak.