aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/routing.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-09-23 21:58:02 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-09-23 21:58:02 +0000
commit6580b3ab003e7140918eb7984d618e5d6c472b1a (patch)
treec997d51af5a0416afb64f244d085046b67f7871b /actionpack/lib/action_controller/routing.rb
parent7d9fe04b1d87b9f346649c9385a3c95121132653 (diff)
downloadrails-6580b3ab003e7140918eb7984d618e5d6c472b1a.tar.gz
rails-6580b3ab003e7140918eb7984d618e5d6c472b1a.tar.bz2
rails-6580b3ab003e7140918eb7984d618e5d6c472b1a.zip
Remove , and ; (comma and semicolon) from routing separators again. References #8558.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7599 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/routing.rb')
-rw-r--r--actionpack/lib/action_controller/routing.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb
index 0d78641b15..8cb2706543 100644
--- a/actionpack/lib/action_controller/routing.rb
+++ b/actionpack/lib/action_controller/routing.rb
@@ -248,7 +248,7 @@ module ActionController
# end
#
module Routing
- SEPARATORS = %w( / ; . , ? )
+ SEPARATORS = %w( / . ? )
HTTP_METHODS = [:get, :head, :post, :put, :delete]
@@ -567,7 +567,7 @@ module ActionController
end
class Segment #:nodoc:
- RESERVED_PCHAR = ':@&=+$'
+ RESERVED_PCHAR = ':@&=+$,;'
UNSAFE_PCHAR = Regexp.new("[^#{URI::REGEXP::PATTERN::UNRESERVED}#{RESERVED_PCHAR}]", false, 'N').freeze
attr_accessor :is_optional