1 files changed, 3 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/metal/head.rb b/actionpack/lib/action_controller/metal/head.rb
index a5c9910d68..8abcad55a2 100644
--- a/actionpack/lib/action_controller/metal/head.rb
+++ b/actionpack/lib/action_controller/metal/head.rb
@@ -2,8 +2,6 @@ module ActionController
   module Head
     extend ActiveSupport::Concern
 
-    include ActionController::UrlFor
-
     # Return a response that has no content (merely headers). The options
     # argument is interpreted to be a hash of header names and values.
     # This allows you to easily return a response that consists only of
@@ -22,13 +20,13 @@ module ActionController
       location = options.delete(:location)
 
       options.each do |key, value|
-        headers[key.to_s.dasherize.split(/-/).map { |v| v.capitalize }.join("-")] = value.to_s
+        headers[key.to_s.dasherize.split('-').each { |v| v[0] = v[0].chr.upcase }.join('-')] = value.to_s
       end
 
       self.status = status
       self.location = url_for(location) if location
-      self.content_type = Mime[formats.first]
+      self.content_type = Mime[formats.first] if formats
       self.response_body = " "
     end
   end
-end
-\ No newline at end of file
+end