diff options
| author | Ashe Connor <ashe@kivikakk.ee> | 2018-03-09 11:27:15 +1100 |
|---|---|---|
| committer | Ashe Connor <ashe@kivikakk.ee> | 2018-03-09 11:29:59 +1100 |
| commit | 8f5f2bf915f43fe7165440460830c5939af10ad8 (patch) | |
| tree | 338d64ecc86c7c3b13eec12b5206acc3d5842bba /activesupport | |
| parent | 6a54932d43da3b24a1a8f41575cfe65c6a18c6bd (diff) | |
| download | rails-8f5f2bf915f43fe7165440460830c5939af10ad8.tar.gz rails-8f5f2bf915f43fe7165440460830c5939af10ad8.tar.bz2 rails-8f5f2bf915f43fe7165440460830c5939af10ad8.zip | |
Only apply monkey-patch if detected to be required
We test the failing case we're trying to patch; only if it throws an
Exception do we patch.
Currently this will *always* throw, but upstream Ruby has patched this
bug: https://git.io/vAxKB
Signed-off-by: Ashe Connor <ashe@kivikakk.ee>
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/uri.rb | 11 |
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 |