From a7cca4eaa50945a3836099b070a06144dc0b6351 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Thu, 14 Jul 2005 07:07:51 +0000
Subject: Cleared conflict

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1829 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionpack/CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'actionpack/CHANGELOG')

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 46ef1d4212..69c968af6e 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,7 +1,10 @@
 *SVN*
 
+* Worked around a Safari bug where it wouldn't pass headers through if the response was zero length by having render :nothing return ' ' instead of ''
+
 * Fixed Request#subdomains to handle "foo.foo.com" correctly
 
+
 *1.9.1* (11 July, 2005)
 
 * Fixed that auto_complete_for didn't force the input string to lower case even as the db comparison was
-- 
cgit v1.2.3