AC::Head now doesn't have an unfulfilled Rendering dependency, and instead works just fine standalone (which means that ConditionalGet also doesn't have a Rendering dependency)

2 files changed, 8 insertions, 11 deletions

diff --git a/actionpack/lib/action_controller/metal/head.rb b/actionpack/lib/action_controller/metal/head.rb
index 68fa0a0402..c82d9cf369 100644
--- a/actionpack/lib/action_controller/metal/head.rb
+++ b/actionpack/lib/action_controller/metal/head.rb
@@ -1,5 +1,7 @@
 module ActionController
   module Head
+    include 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
@@ -21,7 +23,10 @@ module ActionController
         headers[key.to_s.dasherize.split(/-/).map { |v| v.capitalize }.join("-")] = value.to_s
       end
 
-      render :nothing => true, :status => status, :location => location
+      self.status = status
+      self.location = url_for(location) if location
+      self.content_type = Mime[formats.first]
+      self.response_body = " "
     end
   end
 end
\ No newline at end of file
diff --git a/actionpack/lib/action_controller/metal/redirecting.rb b/actionpack/lib/action_controller/metal/redirecting.rb
index d101f920e3..39dc23024c 100644
--- a/actionpack/lib/action_controller/metal/redirecting.rb
+++ b/actionpack/lib/action_controller/metal/redirecting.rb
@@ -62,9 +62,9 @@ module ActionController
     private
       def _extract_redirect_to_status(options, response_status)
         status = if options.is_a?(Hash) && options.key?(:status)
-          _interpret_status(options.delete(:status))
+          ActionDispatch::StatusCodes[options.delete(:status)]
         elsif response_status.key?(:status)
-          _interpret_status(response_status[:status])
+          ActionDispatch::StatusCodes[response_status[:status]]
         else
           302
         end
@@ -86,13 +86,5 @@ module ActionController
           url_for(options)
         end.gsub(/[\r\n]/, '')
       end
-
-      def _interpret_status(status)
-        if status.is_a?(Symbol)
-          (ActionDispatch::StatusCodes::SYMBOL_TO_STATUS_CODE[status] || 500)
-        else
-          status.to_i
-        end
-      end
   end
 end