Merge pull request #7670 from nobu/rescue-vendored-net-http

Should rescue vendored net-http exception

(cherry picked from commit 4aa0592)

Author: hsbt

test/rubygems/test_bundled_ca.rb

@@ -33,7 +33,7 @@ def assert_https(host)
     http.verify_mode = OpenSSL::SSL::VERIFY_PEER
     http.cert_store = bundled_certificate_store
     http.get("/")
-  rescue Errno::ENOENT, Errno::ETIMEDOUT, SocketError, Net::OpenTimeout
+  rescue Errno::ENOENT, Errno::ETIMEDOUT, SocketError, Gem::Net::OpenTimeout
     pend "#{host} seems offline, I can't tell whether ssl would work."
   rescue OpenSSL::SSL::SSLError => e
     # Only fail for certificate verification errors