From c9dc4ae58237c765f7e8089a05f63b5de6a2ae48 Mon Sep 17 00:00:00 2001
From: nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 4 Dec 2003 04:05:51 +0000
Subject:         * lib/soap/soap.rb: add SOAP::Env module for environment
 repository           such as HTTP_PROXY.

        * lib/soap/property.rb: property implementation.

        * lib/soap/streamHandler.rb, lib/soap/wsdlDriver.rb,
          lib/soap/rpc/driver.rb: use soap/property.rb.

        * lib/wsdl/importer.rb, lib/soap/wsdlDriver.rb, lib/soap/rpc/driver.rb:
          use SOAP::Env.

        * lib/soap/netHttpClient.rb: add basic_auth, ssl_config, and cookie
          management interface, but ignored for now.

        * lib/xsd/charset.rb: add XSD::Charset.encoding= interface to set
          wiredump charset explicitly.  it was fixed to 'utf-8' when iconv or
          uconv module was found.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5104 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/wsdl/importer.rb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'lib/wsdl')

diff --git a/lib/wsdl/importer.rb b/lib/wsdl/importer.rb
index d35ed5d69..df354311a 100644
--- a/lib/wsdl/importer.rb
+++ b/lib/wsdl/importer.rb
@@ -8,6 +8,7 @@
 
 require 'wsdl/info'
 require 'wsdl/parser'
+require 'soap/soap'
 
 
 module WSDL
@@ -27,8 +28,14 @@ class Importer
     if FileTest.exist?(location)
       content = File.open(location).read
     else
-      proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
-      content = web_client.new(proxy, "WSDL4R").get_content(location)
+      client = web_client.new(nil, "WSDL4R")
+      if env_httpproxy = ::SOAP::Env::HTTP_PROXY
+	client.proxy = env_httpproxy
+      end
+      if env_no_proxy = ::SOAP::Env::NO_PROXY
+	client.no_proxy = env_no_proxy
+      end
+      content = client.get_content(location)
     end
     opt = {}	# charset?
     begin
-- 
cgit