Changeset 1096

Timestamp:

12/02/03 16:23:13 (5 years ago)

Author:

nahi

Message:

* recover environment variable proxy setting feature. you can specify http

proxy with env http_proxy(ignore case), and unproxyed list with env
no_proxy(dittto). but bear in mind that these environment are only valid if
env soap_use_proxy is turned 'on'. so you must specify http_proxy like;

bash> soap_use_proxy=on http_proxy=http://myproxy:8080 ruby myclient.rb
csh > env soap_use_proxy=on http_proxy=http://myproxy:8080 ruby myclient.rb

environment variables are checked only once when soap/soap.rb is loaded.

Files:

• trunk/lib/soap/rpc/driver.rb (modified) (1 diff)
• trunk/lib/soap/soap.rb (modified) (3 diffs)
• trunk/lib/soap/wsdlDriver.rb (modified) (1 diff)
• trunk/lib/wsdl/importer.rb (modified) (2 diffs)
• trunk/test/soap/test_streamhandler.rb (added)

trunk/lib/soap/rpc/driver.rb

@@ -83 +83 @@
-    @servant.soapaction = soapaction
-    @proxy = @servant.proxy
+    if env_httpproxy = ::SOAP::Env::HTTP_PROXY
+      @servant.options["client.protocol.http.proxy"] = env_httpproxy
+    end
+    if env_no_proxy = ::SOAP::Env::NO_PROXY
+      @servant.options["client.protocol.http.no_proxy"] = env_no_proxy
+    end
-  end
-

trunk/lib/soap/soap.rb

@@ -14 +14 @@
-
-
-1
+2
-
-EnvelopeNamespace = 'http://schemas.xmlsoap.org/soap/envelope/'
@@ -91 +91 @@
-  def to_s
-    str = nil
-&&
+and
-      str = @faultstring.data
-    end
@@ -98 +98 @@
-end
-
+module Env
+  def self.getenv(name)
+    ENV[name.downcase] || ENV[name]
+  end
+
+  use_proxy = getenv('soap_use_proxy') == 'on'
+  HTTP_PROXY = use_proxy ? getenv('http_proxy') : nil
+  NO_PROXY = use_proxy ? getenv('no_proxy') : nil
+end
+
-
-end

trunk/lib/soap/wsdlDriver.rb

@@ -133 +133 @@
-  def initialize(wsdl, port, logdev)
-    @servant = Servant__.new(self, wsdl, port, logdev)
+    if env_httpproxy = ::SOAP::Env::HTTP_PROXY
+      @servant.options["client.protocol.http.proxy"] = env_httpproxy
+    end
+    if env_httpproxy = ::SOAP::Env::NO_PROXY
+      @servant.options["client.protocol.http.no_proxy"] = env_httpproxy
+    end
-  end
-

trunk/lib/wsdl/importer.rb

@@ -9 +9 @@
-require 'wsdl/info'
-require 'wsdl/parser'
+require 'soap/soap'
-
-
@@ -28 +29 @@
-      content = File.open(location).read
-    else
-
-
+
+
+
+
+
+
+
+
-    end
-    opt = {}    # charset?