Merge pull request #135 from ruby/fix-host-constants

Check existence constants only URI module
ruby · Nov 14, 2024 · b45aabb · b45aabb
2 parents eafc475 + b6f5833
commit b45aabb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/uri/common.rb b/lib/uri/common.rb
@@ -34,7 +34,7 @@ def self.parser=(parser = RFC3986_PARSER)
     end
 
     Parser.new.regexp.each_pair do |sym, str|
-      remove_const(sym) if const_defined?(sym)
+      remove_const(sym) if const_defined?(sym, false)
       const_set(sym, str)
     end
   end

diff --git a/lib/uri/rfc2396_parser.rb b/lib/uri/rfc2396_parser.rb
@@ -539,7 +539,7 @@ def convert_to_uri(uri)
 
   # Backward compatibility for URI::REGEXP::PATTERN::*
   RFC2396_Parser.new.pattern.each_pair do |sym, str|
-    unless RFC2396_REGEXP::PATTERN.const_defined?(sym)
+    unless RFC2396_REGEXP::PATTERN.const_defined?(sym, false)
       RFC2396_REGEXP::PATTERN.const_set(sym, str)
     end
   end