aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-05-29 06:40:33 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-05-29 06:40:33 +0000
commit8139de2812a316aad41c009d03b2d1e0dfb6770c (patch)
tree5905798cddc85071973aabad2506345bf537e817 /actionpack/lib/action_controller
parentd3017e225fdc2b3be0905ca0d525d190da0edc91 (diff)
downloadrails-8139de2812a316aad41c009d03b2d1e0dfb6770c.tar.gz
rails-8139de2812a316aad41c009d03b2d1e0dfb6770c.tar.bz2
rails-8139de2812a316aad41c009d03b2d1e0dfb6770c.zip
Routing: drop semicolon and comma as route separators.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6888 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/routing.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb
index 34041cc0fc..74f09f815c 100644
--- a/actionpack/lib/action_controller/routing.rb
+++ b/actionpack/lib/action_controller/routing.rb
@@ -247,8 +247,7 @@ module ActionController
# end
#
module Routing
- # TODO: , (comma) should be an allowed path character.
- SEPARATORS = %w( / ; . , ? )
+ SEPARATORS = %w( / . ? )
HTTP_METHODS = [:get, :head, :post, :put, :delete]
@@ -549,8 +548,7 @@ module ActionController
end
class Segment #:nodoc:
- # TODO: , (comma) should be an allowed path character.
- RESERVED_PCHAR = ':@&=+$'
+ RESERVED_PCHAR = ':@&=+$,;'
UNSAFE_PCHAR = Regexp.new("[^#{URI::REGEXP::PATTERN::UNRESERVED}#{RESERVED_PCHAR}]", false, 'N').freeze
attr_accessor :is_optional