From 7a3422ed468117df4ac434a640ad3568333d83cc Mon Sep 17 00:00:00 2001 From: Mark Dodwell Date: Sun, 23 Oct 2011 23:20:26 -0700 Subject: [PATCH] ERB::Util.url_encode should not escape any unreserved characters --- lib/erb.rb | 2 +- test/erb/test_erb.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/erb.rb b/lib/erb.rb index bb47943..47538c8 100644 --- a/lib/erb.rb +++ b/lib/erb.rb @@ -928,7 +928,7 @@ def html_escape(s) # Programming%20Ruby%3A%20%20The%20Pragmatic%20Programmer%27s%20Guide # def url_encode(s) - s.to_s.dup.force_encoding("ASCII-8BIT").gsub(/[^a-zA-Z0-9_\-.]/n) { + s.to_s.dup.force_encoding("ASCII-8BIT").gsub(/[^a-zA-Z0-9_\-.~]/n) { sprintf("%%%02X", $&.unpack("C")[0]) } end diff --git a/test/erb/test_erb.rb b/test/erb/test_erb.rb index 05d2556..06f6fe0 100644 --- a/test/erb/test_erb.rb +++ b/test/erb/test_erb.rb @@ -441,6 +441,10 @@ def test_url_encode assert_equal("%A5%B5%A5%F3%A5%D7%A5%EB", ERB::Util.url_encode("\xA5\xB5\xA5\xF3\xA5\xD7\xA5\xEB".force_encoding("EUC-JP"))) + + assert_equal("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~", + ERB::Util.url_encode("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~"), + "should not escape any unreserved characters, as per RFC3986 Section 2.3") end def test_percent_after_etag -- 1.7.10