Move etagging down to response, so renders with layouts dont screw it up [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6165 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 0 insertions, 22 deletions

diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb
index 2af1654eec..aa4cba1066 100644
--- a/actionpack/lib/action_controller/cgi_process.rb
+++ b/actionpack/lib/action_controller/cgi_process.rb
@@ -184,9 +184,6 @@ end_msg
     end
 
     def out(output = $stdout)
-      convert_content_type!
-      set_content_length!
-
       output.binmode      if output.respond_to?(:binmode)
       output.sync = false if output.respond_to?(:sync=)
 
@@ -209,24 +206,5 @@ end_msg
         # lost connection to parent process, ignore output
       end
     end
-
-    private
-      def convert_content_type!
-        if content_type = @headers.delete("Content-Type")
-          @headers["type"] = content_type
-        end
-        if content_type = @headers.delete("Content-type")
-          @headers["type"] = content_type
-        end
-        if content_type = @headers.delete("content-type")
-          @headers["type"] = content_type
-        end
-      end
-      
-      # Don't set the Content-Length for block-based bodies as that would mean reading it all into memory. Not nice
-      # for, say, a 2GB streaming file.
-      def set_content_length!
-        @headers["Content-Length"] = @body.size unless @body.respond_to?(:call)
-      end
   end
 end