0
@@ -1,5 +1,7 @@
0
 *2.2.1 [RC2 or 2.2 final]*
0
 
0
+* Fixed regex in redirect_to to fully support URI schemes #1247 [Seth Fitzsimmons]
0
+
0
 * Fixed bug with asset timestamping when using relative_url_root #1265 [Joe Goldwasser]
0
 
0
 

0
@@ -1053,7 +1053,10 @@ module ActionController #:nodoc:
0
         logger.info("Redirected to #{options}") if logger && logger.info?
0
 
0
         case options
0
-          when %r{^\w+://.*}
0
+          # The scheme name consist of a letter followed by any combination of
0
+          # letters, digits, and the plus ("+"), period ("."), or hyphen ("-")
0
+          # characters; and is terminated by a colon (":").
0
+          when %r{^\w[\w\d+.-]*:.*}
0
             redirect_to_full_url(options, status)
0
           when String
0
             redirect_to_full_url(request.protocol + request.host_with_port + options, status)

0
@@ -73,6 +73,10 @@ class RedirectController < ActionController::Base
0
     redirect_to "http://dev.rubyonrails.org/query?status=new"
0
   end
0
 
0
+  def redirect_to_url_with_complex_scheme
0
+    redirect_to "x-test+scheme.complex:redirect"
0
+  end
0
+
0
   def redirect_to_back
0
     redirect_to :back
0
   end
0
@@ -198,6 +202,12 @@ class RedirectTest < Test::Unit::TestCase
0
     assert_redirected_to "http://dev.rubyonrails.org/query?status=new"
0
   end
0
 
0
+  def test_redirect_to_url_with_complex_scheme
0
+    get :redirect_to_url_with_complex_scheme
0
+    assert_response :redirect
0
+    assert_equal "x-test+scheme.complex:redirect", redirect_to_url
0
+  end
0
+
0
   def test_redirect_to_back
0
     @request.env["HTTP_REFERER"] = "http://www.example.com/coming/from"
0
     get :redirect_to_back