forked from rails/rails
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Broaden URI.unescape fix to all affected 1.9.x by checking for broken…
… behavior instead of specific patchlevel
- Loading branch information
Showing
2 changed files
with
18 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,16 @@ | ||
if RUBY_VERSION == "1.9.1" && defined?(RUBY_PATCHLEVEL) && RUBY_PATCHLEVEL == 0 | ||
if RUBY_VERSION >= '1.9' | ||
require 'uri' | ||
URI::Parser.class_eval do | ||
remove_method :unescape | ||
def unescape(str, escaped = @regexp[:ESCAPED]) | ||
enc = (str.encoding == Encoding::US_ASCII) ? Encoding::UTF_8 : str.encoding | ||
str.gsub(escaped) { [$&[1, 2].hex].pack('C') }.force_encoding(enc) | ||
|
||
str = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E" # Ni-ho-nn-go in UTF-8, means Japanese. | ||
str.force_encoding(Encoding::UTF_8) if str.respond_to?(:force_encoding) | ||
|
||
unless str == URI.unescape(URI.escape(str)) | ||
URI::Parser.class_eval do | ||
remove_method :unescape | ||
def unescape(str, escaped = @regexp[:ESCAPED]) | ||
enc = (str.encoding == Encoding::US_ASCII) ? Encoding::UTF_8 : str.encoding | ||
str.gsub(escaped) { [$&[1, 2].hex].pack('C') }.force_encoding(enc) | ||
end | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,12 @@ | ||
require 'abstract_unit' | ||
require 'uri' | ||
|
||
class URITest < Test::Unit::TestCase | ||
class URIExtTest < Test::Unit::TestCase | ||
def test_uri_decode_handle_multibyte | ||
str = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E" # Ni-ho-nn-go in UTF-8, means Japanese. | ||
str.force_encoding(Encoding::UTF_8) if(defined? Encoding::UTF_8) | ||
str = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E" # Ni-ho-nn-go in UTF-8, means Japanese. | ||
str.force_encoding(Encoding::UTF_8) if str.respond_to?(:force_encoding) | ||
|
||
assert_equal str, ::URI.unescape( ::URI.escape(str) ) | ||
assert_equal str, ::URI.decode( ::URI.escape(str) ) | ||
assert_equal str, URI.unescape(URI.escape(str)) | ||
assert_equal str, URI.decode(URI.escape(str)) | ||
end | ||
end |