aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/core_ext/uri.rb11
1 files changed, 9 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/uri.rb b/activesupport/lib/active_support/core_ext/uri.rb
index c4ac0baa32..dadabb02e5 100644
--- a/activesupport/lib/active_support/core_ext/uri.rb
+++ b/activesupport/lib/active_support/core_ext/uri.rb
@@ -1,10 +1,17 @@
# frozen_string_literal: true
require "uri"
-str = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E" # Ni-ho-nn-go in UTF-8, means Japanese.
+str = "\xE6\x97\xA5"
parser = URI::Parser.new
-unless str == parser.unescape(parser.escape(str))
+needs_monkeypatch =
+ begin
+ str + str != parser.unescape(str + parser.escape(str).force_encoding(Encoding::UTF_8))
+ rescue Encoding::CompatibilityError
+ true
+ end
+
+if needs_monkeypatch
require "active_support/core_ext/module/redefine_method"
URI::Parser.class_eval do
silence_redefinition_of_method :unescape