Fix bug when url_for changes controller.

2 files changed, 11 insertions, 2 deletions

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 667094c469..966f5bf157 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -476,11 +476,11 @@ module ActionDispatch
 
           if options[:controller]
             options[:action]     ||= 'index'
-            options[:controller]   = options[:controller].to_s
+            options[:controller]   = options[:controller].to_s.dup
           end
 
           if options[:action]
-            options[:action] = options[:action].to_s
+            options[:action] = options[:action].to_s.dup
           end
         end
 
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index e61b4e2d8f..91ca058a5d 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -887,6 +887,15 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     assert_equal original_options, options
   end
 
+  # checks that url_for doesn't change controller and action
+  def test_url_for_with_no_side_effects_on_strings
+    # freeze controller and action to be sure they are not changed
+    # we'll get RuntimeError if somebody tries to modify them
+    options = {:controller => '/projects'.freeze, :action => 'status'.freeze}
+
+    url_for options
+  end
+
   # tests the arguments modification free version of define_hash_access
   def test_named_route_with_no_side_effects
     original_options = { :host => 'test.host' }