2 files changed, 25 insertions, 10 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 719593c207..0f5604c707 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -987,32 +987,47 @@ module ActionController #:nodoc:
       #   redirect_to "/images/screenshot.jpg"
       #   redirect_to :back
       #
-      # The redirection happens as a "302 Moved" header.
+      # The redirection happens as a "302 Moved" header unless otherwise specified. 
+      #
+      # Examples:
+      #   redirect_to post_url(@post), :status=>:found
+      #   redirect_to :action=>'atom', :status=>:moved_permanently
+      #   redirect_to post_url(@post), :status=>301
+      #   redirect_to :action=>'atom', :status=>302
       #
       # When using <tt>redirect_to :back</tt>, if there is no referrer,
       # RedirectBackError will be raised. You may specify some fallback
       # behavior for this case by rescuing RedirectBackError.
-      def redirect_to(options = {}) #:doc:
+      def redirect_to(options = {}, response_status = {}) #:doc: 
+        
+        if options.is_a?(Hash) && options[:status] 
+          status = options.delete(:status) 
+        elsif response_status[:status] 
+          status = response_status[:status] 
+        else 
+          status = 302 
+        end
+        
         case options
           when %r{^\w+://.*}
             raise DoubleRenderError if performed?
-            logger.info("Redirected to #{options}") if logger
-            response.redirect(options)
+            logger.info("Redirected to #{options}") if logger && logger.info?
+            response.redirect(options, interpret_status(status))
             response.redirected_to = options
             @performed_redirect = true
 
           when String
-            redirect_to(request.protocol + request.host_with_port + options)
+            redirect_to(request.protocol + request.host_with_port + options, :status=>status)
 
           when :back
-            request.env["HTTP_REFERER"] ? redirect_to(request.env["HTTP_REFERER"]) : raise(RedirectBackError)
+            request.env["HTTP_REFERER"] ? redirect_to(request.env["HTTP_REFERER"], :status=>status) : raise(RedirectBackError)
 
           when Hash
-            redirect_to(url_for(options))
+            redirect_to(url_for(options), :status=>status)
             response.redirected_to = options
 
           else
-            redirect_to(url_for(options))
+            redirect_to(url_for(options), :status=>status)
         end
       end
 
diff --git a/actionpack/lib/action_controller/response.rb b/actionpack/lib/action_controller/response.rb
index 84edafd7bf..1d9f6676ba 100755
--- a/actionpack/lib/action_controller/response.rb
+++ b/actionpack/lib/action_controller/response.rb
@@ -28,8 +28,8 @@ module ActionController
       charset.blank? ? nil : charset.strip.split("=")[1]
     end
 
-    def redirect(to_url, permanently = false)
-      self.headers["Status"]   = "302 Found" unless headers["Status"] == "301 Moved Permanently"
+    def redirect(to_url, response_status)
+      self.headers["Status"] = response_status
       self.headers["Location"] = to_url
 
       self.body = "<html><body>You are being <a href=\"#{to_url}\">redirected</a>.</body></html>"