Broaden URI.unescape fix to all affected 1.9.x by checking for broken behavior instead of specific patchlevel

1 files changed, 12 insertions, 6 deletions

diff --git a/activesupport/lib/active_support/core_ext/uri.rb b/activesupport/lib/active_support/core_ext/uri.rb
index 4c8ebbee58..9a1c61d99b 100644
--- a/activesupport/lib/active_support/core_ext/uri.rb
+++ b/activesupport/lib/active_support/core_ext/uri.rb
@@ -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