Skip to content
Browse files

Remove , and ; (comma and semicolon) from routing separators again. R…

…eferences #8558.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7599 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 7d9fe04 commit 6580b3ab003e7140918eb7984d618e5d6c472b1a @jeremy jeremy committed Sep 23, 2007
Showing with 3 additions and 3 deletions.
  1. +2 −2 actionpack/lib/action_controller/routing.rb
  2. +1 −1 actionpack/test/controller/routing_test.rb
View
4 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 @@ def requirement_for(key)
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
View
2 actionpack/test/controller/routing_test.rb
@@ -22,7 +22,7 @@ def setup
map.connect ':controller/:action/:variable'
end
- safe, unsafe = %w(: @ & = + $), %w(^ / ? # [ ] , ;)
+ safe, unsafe = %w(: @ & = + $ , ;), %w(^ / ? # [ ])
hex = unsafe.map { |char| '%' + char.unpack('H2').first.upcase }
@segment = "#{safe}#{unsafe}".freeze

0 comments on commit 6580b3a

Please sign in to comment.
Something went wrong with that request. Please try again.