Merge commit 'mainstream/master'

3 files changed, 7 insertions, 8 deletions

diff --git a/actionpack/lib/action_controller/new_base/base.rb b/actionpack/lib/action_controller/new_base/base.rb
index 0400ddbf7a..08e7a1a0e7 100644
--- a/actionpack/lib/action_controller/new_base/base.rb
+++ b/actionpack/lib/action_controller/new_base/base.rb
@@ -42,7 +42,6 @@ module ActionController
     
     # :api: plugin
     def response_body=(body)
-      @_response["Content-Length"] = body.length
       @_response.body = body
     end
     
@@ -58,4 +57,4 @@ module ActionController
       response.to_a
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/lib/action_controller/new_base/layouts.rb b/actionpack/lib/action_controller/new_base/layouts.rb
index 149847c968..a8e0809ac6 100644
--- a/actionpack/lib/action_controller/new_base/layouts.rb
+++ b/actionpack/lib/action_controller/new_base/layouts.rb
@@ -9,7 +9,7 @@ module ActionController
       end
     end
     
-    def render_to_string(options)
+    def render_to_body(options)
       # render :text => ..., :layout => ...
       # or
       # render :anything_else
@@ -34,4 +34,4 @@ module ActionController
     end
     
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/lib/action_controller/new_base/renderer.rb b/actionpack/lib/action_controller/new_base/renderer.rb
index 044c15f409..ed34c46aed 100644
--- a/actionpack/lib/action_controller/new_base/renderer.rb
+++ b/actionpack/lib/action_controller/new_base/renderer.rb
@@ -8,7 +8,7 @@ module ActionController
     end
     
     def render(action, options = {})
-      # TODO: Move this into #render_to_string
+      # TODO: Move this into #render_to_body
       if action.is_a?(Hash)
         options, action = action, nil 
       else
@@ -17,10 +17,10 @@ module ActionController
       
       _process_options(options)
       
-      self.response_body = render_to_string(options)
+      self.response_body = render_to_body(options)
     end
 
-    def render_to_string(options)
+    def render_to_body(options)
       unless options.is_a?(Hash)
         options = {:action => options}
       end
@@ -59,4 +59,4 @@ module ActionController
       end
     end
   end
-end
\ No newline at end of file
+end