1 files changed, 20 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/head.rb b/actionpack/lib/action_controller/metal/head.rb
index a618533d09..802c44cc73 100644
--- a/actionpack/lib/action_controller/metal/head.rb
+++ b/actionpack/lib/action_controller/metal/head.rb
@@ -27,8 +27,27 @@ module ActionController
 
       self.status = status
       self.location = url_for(location) if location
-      self.content_type = Mime[formats.first] if formats
+
+      if include_content_type?(self.status)
+        self.content_type = Mime[formats.first] if formats
+      else
+        headers.delete('Content-Type')
+      end
+
       self.response_body = " "
     end
+
+    private
+    # :nodoc:
+    def include_content_type?(status)
+      case status
+      when 100..199
+        false
+      when 204, 205, 304
+        false
+      else
+        true
+      end
+    end
   end
 end