2 files changed, 13 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb
index 8673412401..1a50eb488d 100644
--- a/actionpack/lib/action_controller/routing.rb
+++ b/actionpack/lib/action_controller/routing.rb
@@ -210,7 +210,7 @@ module ActionController
           mod_name = controller_name = segment = nil
       
           while index < length
-            return nil unless /^[a-z][a-z\d_]*$/ =~ (segment = segments[index])
+            return nil unless /^[A-Za-z][A-Za-z\d_]*$/ =~ (segment = segments[index])
             index += 1
         
             mod_name = segment.camelize
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 38b995dc6e..93d16c6f65 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -109,6 +109,9 @@ module Object::Controllers
     
     class UserController
     end
+
+    class NewsFeedController
+    end
   end
 end
 
@@ -718,6 +721,15 @@ class RouteSetTests < Test::Unit::TestCase
   def test_action_expiry
     assert_equal ['/content', {}], rs.generate({:controller => 'content'}, {:controller => 'content', :action => 'show'})
   end
+
+  def test_recognition_with_uppercase_controller_name
+    assert_equal({'controller' => ::Controllers::ContentController, 'action' => 'index'}, rs.recognize_path(%w(Content)))
+    assert_equal({'controller' => ::Controllers::ContentController, 'action' => 'list'}, rs.recognize_path(%w(Content list)))
+    assert_equal({'controller' => ::Controllers::ContentController, 'action' => 'show', 'id' => '10'}, rs.recognize_path(%w(Content show 10)))
+
+    assert_equal({'controller' => ::Controllers::Admin::NewsFeedController, 'action' => 'index'}, rs.recognize_path(%w(Admin NewsFeed)))
+    assert_equal({'controller' => ::Controllers::Admin::NewsFeedController, 'action' => 'index'}, rs.recognize_path(%w(Admin News_Feed)))
+  end
 end
 
 end