From 6580b3ab003e7140918eb7984d618e5d6c472b1a Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sun, 23 Sep 2007 21:58:02 +0000 Subject: [PATCH] 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 --- actionpack/lib/action_controller/routing.rb | 4 ++-- actionpack/test/controller/routing_test.rb | 2 +- 2 files changed, 3 insertions(+), 3 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 diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb index bd66e11fd1..9db0a4962b 100644 --- a/actionpack/test/controller/routing_test.rb +++ b/actionpack/test/controller/routing_test.rb @@ -22,7 +22,7 @@ class UriReservedCharactersRoutingTest < Test::Unit::TestCase 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