2 files changed, 18 insertions, 0 deletions
diff --git a/lib/uri/common.rb b/lib/uri/common.rb
index e31e0abcc0..904df10663 100644
--- a/lib/uri/common.rb
+++ b/lib/uri/common.rb
@@ -45,6 +45,15 @@ module URI
   end
   self.parser = RFC3986_PARSER
 
+  def self.const_missing(const)
+    if value = RFC2396_PARSER.regexp[const]
+      warn "URI::#{const} is obsolete. Use RFC2396_PARSER.regexp[#{const.inspect}] explicitly.", uplevel: 1 if $VERBOSE
+      value
+    else
+      super
+    end
+  end
+
   module Util # :nodoc:
     def make_components_hash(klass, array_hash)
       tmp = {}
diff --git a/test/uri/test_common.rb b/test/uri/test_common.rb
index aa9c6898ed..bccdeafeaf 100644
--- a/test/uri/test_common.rb
+++ b/test/uri/test_common.rb
@@ -10,6 +10,15 @@ class URI::TestCommon < Test::Unit::TestCase
   def teardown
   end
 
+  def test_fallback_constants
+    orig_verbose = $VERBOSE
+    $VERBOSE = nil
+    assert URI::ABS_URI
+    assert_raise(NameError) { URI::FOO }
+  ensure
+    $VERBOSE = orig_verbose
+  end
+
   def test_parser_switch
     assert_equal(URI::Parser, URI::RFC3986_Parser)
     refute defined?(URI::REGEXP)