From acfa2c38e64ed5a1471b1d0b05ac4aea85a652e0 Mon Sep 17 00:00:00 2001 From: nahi Date: Sat, 6 Dec 2003 08:26:15 +0000 Subject: * lib/soap/soap.rb(SOAP::Env.getenv): allow upcase environment variable as well as downcase one. * lib/soap/netHttpClient.rb(SOAP::NetHttpClient#proxy=): check URI. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5124 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/soap/netHttpClient.rb | 5 +++++ lib/soap/soap.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/soap/netHttpClient.rb b/lib/soap/netHttpClient.rb index a0b3b7ca2..4505de815 100644 --- a/lib/soap/netHttpClient.rb +++ b/lib/soap/netHttpClient.rb @@ -40,6 +40,11 @@ class NetHttpClient @proxy = nil else @proxy = URI.parse(proxy_str) + if @proxy.scheme == nil or @proxy.scheme.downcase != 'http' or + @proxy.host == nil or @proxy.port == nil + raise ArgumentError.new("unsupported proxy `#{proxy_str}'") + end + @proxy end end diff --git a/lib/soap/soap.rb b/lib/soap/soap.rb index ea2b4db2e..d00d89b05 100644 --- a/lib/soap/soap.rb +++ b/lib/soap/soap.rb @@ -100,7 +100,7 @@ end module Env def self.getenv(name) - ENV[name.downcase] || ENV[name] + ENV[name.downcase] || ENV[name.upcase] end use_proxy = getenv('soap_use_proxy') == 'on' -- cgit