summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-24 13:38:06 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-24 13:38:06 +0000
commit7567977adc82ec528f4f0e5c650a940304e84b34 (patch)
treed13bc24b85c674b489834a55a8959c7f71cf65ca /lib
parent46541321450f377c52d6ffe4db307840da0283e0 (diff)
merge revision(s) 42153: [Backport #8645]
* lib/uri/generic.rb (find_proxy): raise BadURIError if the URI is a relative URI. [Bug #8645] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/uri/generic.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb
index 1d8963af4d..387682b5b5 100644
--- a/lib/uri/generic.rb
+++ b/lib/uri/generic.rb
@@ -1611,6 +1611,7 @@ module URI
# http_proxy is not used too if the variable is case insensitive.
# CGI_HTTP_PROXY can be used instead.
def find_proxy
+ raise BadURIError, "relative URI: #{self}" if self.relative?
name = self.scheme.downcase + '_proxy'
proxy_uri = nil
if name == 'http_proxy' && ENV.include?('REQUEST_METHOD') # CGI?