kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Remove , and ; (comma and semicolon) from routing separators again. References #8558.

Browse source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7599 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper 2007-09-23 21:58:02 +00:00
parent 7d9fe04b1d
commit 6580b3ab00
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
actionpack/lib/action_controller/routing.rb
View file

@ -248,7 +248,7 @@ module ActionController
# end # end
# #
module Routing module Routing
SEPARATORS = %w( / ; . , ? ) SEPARATORS = %w( / . ? )
HTTP_METHODS = [:get, :head, :post, :put, :delete] HTTP_METHODS = [:get, :head, :post, :put, :delete]
@ -567,7 +567,7 @@ module ActionController
end end
class Segment #:nodoc: class Segment #:nodoc:
RESERVED_PCHAR = ':@&=+$' RESERVED_PCHAR = ':@&=+$,;'
UNSAFE_PCHAR = Regexp.new("[^#{URI::REGEXP::PATTERN::UNRESERVED}#{RESERVED_PCHAR}]", false, 'N').freeze UNSAFE_PCHAR = Regexp.new("[^#{URI::REGEXP::PATTERN::UNRESERVED}#{RESERVED_PCHAR}]", false, 'N').freeze
attr_accessor :is_optional attr_accessor :is_optional

2
actionpack/test/controller/routing_test.rb
View file

@ -22,7 +22,7 @@ class UriReservedCharactersRoutingTest < Test::Unit::TestCase
map.connect ':controller/:action/:variable' map.connect ':controller/:action/:variable'
end end
safe, unsafe = %w(: @ & = + $), %w(^ / ? # [ ] , ;) safe, unsafe = %w(: @ & = + $ , ;), %w(^ / ? # [ ])
hex = unsafe.map { |char| '%' + char.unpack('H2').first.upcase } hex = unsafe.map { |char| '%' + char.unpack('H2').first.upcase }
@segment = "#{safe}#{unsafe}".freeze @segment = "#{safe}#{unsafe}".freeze