From 94921293dbdbdf7fe49023fe7ed8908e05d3615f Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 7 Dec 2004 10:50:26 +0000 Subject: Added indifference to whether @headers["Content-Type"], @headers["Content-type"], or @headers["content-type"] is used. Added proper handling of HEAD requests, so that content isnt returned (Request#head? added as well) #277 [Eric Hodel] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@57 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/cgi_process.rb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'actionpack/lib/action_controller/cgi_process.rb') diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb index 8610f60854..abc743246f 100644 --- a/actionpack/lib/action_controller/cgi_process.rb +++ b/actionpack/lib/action_controller/cgi_process.rb @@ -107,7 +107,10 @@ module ActionController #:nodoc: $stdout.binmode if $stdout.respond_to?(:binmode) $stdout.sync = false print @cgi.header(@headers) - if @body.respond_to?(:call) + + if @cgi.head? + return + elsif @body.respond_to?(:call) @body.call(self) else print @body @@ -116,9 +119,11 @@ module ActionController #:nodoc: private def convert_content_type!(headers) - if headers["Content-Type"] - headers["type"] = headers["Content-Type"] - headers.delete "Content-Type" + %w( Content-Type Content-type content-type ).each do |ct| + if headers[ct] + headers["type"] = headers[ct] + headers.delete(ct) + end end end end -- cgit v1.2.3