diff options
author | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-20 13:50:15 +0000 |
---|---|---|
committer | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-20 13:50:15 +0000 |
commit | e5a3aba50e2bd7e0327aacd8fe1ab7963fc4a007 (patch) | |
tree | b56a6e784df74331c28e4a94901b96837f214e35 /lib/soap/streamHandler.rb | |
parent | 643dc132113489749c333a6bda14730d9b175ed1 (diff) | |
download | ruby-e5a3aba50e2bd7e0327aacd8fe1ab7963fc4a007.tar.gz |
* added files:
* lib/soap/mapping/wsdl*.rb
* lib/wsdl/soap/element.rb
* lib/wsdl/xmlSchema/simpleContent.rb
* modified files:
* lib/soap/*
* lib/wsdl/*
* lib/xsd/*
* test/soap/*
* test/wsdl/*
* test/xsd/*
* summary
* imported from the soap4r repository. Version: 1.5.3-ruby1.8.2
* added several XSD basetype support: nonPositiveInteger,
negativeInteger, nonNegativeInteger, unsignedLong, unsignedInt,
unsignedShort, unsignedByte, positiveInteger
* HTTP client connection/send/receive timeout support.
* HTTP client/server gzipped content encoding support.
* improved WSDL schema definition support; still is far from
complete, but is making step by step improovement.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7612 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/soap/streamHandler.rb')
-rw-r--r-- | lib/soap/streamHandler.rb | 80 |
1 files changed, 56 insertions, 24 deletions
diff --git a/lib/soap/streamHandler.rb b/lib/soap/streamHandler.rb index efadf21e07..ac2f54d5c9 100644 --- a/lib/soap/streamHandler.rb +++ b/lib/soap/streamHandler.rb @@ -8,6 +8,12 @@ require 'soap/soap' require 'soap/property' +begin + require 'stringio' + require 'zlib' +rescue LoadError + STDERR.puts "Loading stringio or zlib failed. No gzipped response support." if $DEBUG +end module SOAP @@ -44,12 +50,6 @@ class StreamHandler end end - attr_accessor :endpoint_url - - def initialize(endpoint_url) - @endpoint_url = endpoint_url - end - def self.parse_media_type(str) if /^#{ MediaType }(?:\s*;\s*charset=([^"]+|"[^"]+"))?$/i !~ str return nil @@ -65,7 +65,7 @@ class StreamHandler end -class HTTPPostStreamHandler < StreamHandler +class HTTPStreamHandler < StreamHandler include SOAP public @@ -75,31 +75,40 @@ public NofRetry = 10 # [times] - def initialize(endpoint_url, options) - super(endpoint_url) + def initialize(options) + super() @client = Client.new(nil, "SOAP4R/#{ Version }") @wiredump_file_base = nil - @charset = @wiredump_dev = nil + @charset = @wiredump_dev = @nil @options = options set_options @client.debug_dev = @wiredump_dev @cookie_store = nil + @accept_encoding_gzip = false end def test_loopback_response @client.test_loopback_response end + def accept_encoding_gzip=(allow) + @accept_encoding_gzip = allow + end + def inspect - "#<#{self.class}:#{endpoint_url}>" + "#<#{self.class}>" end - def send(conn_data, soapaction = nil, charset = @charset) - send_post(conn_data, soapaction, charset) + def send(endpoint_url, conn_data, soapaction = nil, charset = @charset) + send_post(endpoint_url, conn_data, soapaction, charset) end - def reset - @client.reset(@endpoint_url) + def reset(endpoint_url = nil) + if endpoint_url.nil? + @client.reset_all + else + @client.reset(endpoint_url) + end @client.save_cookie_store if @cookie_store end @@ -143,6 +152,15 @@ private basic_auth.add_hook do |key, value| set_basic_auth(basic_auth) end + @options.add_hook("connect_timeout") do |key, value| + @client.connect_timeout = value + end + @options.add_hook("send_timeout") do |key, value| + @client.send_timeout = value + end + @options.add_hook("receive_timeout") do |key, value| + @client.receive_timeout = value + end @options.lock(true) ssl_config.unlock basic_auth.unlock @@ -213,7 +231,7 @@ private OpenSSL::PKey::RSA.new(File.open(filename) { |f| f.read }) end - def send_post(conn_data, soapaction, charset) + def send_post(endpoint_url, conn_data, soapaction, charset) conn_data.send_contenttype ||= StreamHandler.create_media_type(charset) if @wiredump_file_base @@ -226,26 +244,23 @@ private extra = {} extra['Content-Type'] = conn_data.send_contenttype extra['SOAPAction'] = "\"#{ soapaction }\"" + extra['Accept-Encoding'] = 'gzip' if send_accept_encoding_gzip? send_string = conn_data.send_string - @wiredump_dev << "Wire dump:\n\n" if @wiredump_dev begin - res = @client.post(@endpoint_url, send_string, extra) + res = @client.post(endpoint_url, send_string, extra) rescue - @client.reset(@endpoint_url) + @client.reset(endpoint_url) raise end @wiredump_dev << "\n\n" if @wiredump_dev - receive_string = res.content - if @wiredump_file_base filename = @wiredump_file_base + '_response.xml' f = File.open(filename, "w") f << receive_string f.close end - case res.status when 405 raise PostUnavailableError.new("#{ res.status }: #{ res.reason }") @@ -254,13 +269,30 @@ private else raise HTTPStreamError.new("#{ res.status }: #{ res.reason }") end - + if res.respond_to?(:header) and !res.header['content-encoding'].empty? and + res.header['content-encoding'][0].downcase == 'gzip' + receive_string = decode_gzip(receive_string) + end conn_data.receive_string = receive_string conn_data.receive_contenttype = res.contenttype conn_data end - CRLF = "\r\n" + def send_accept_encoding_gzip? + @accept_encoding_gzip and defined?(::Zlib) + end + + def decode_gzip(instring) + unless send_accept_encoding_gzip? + raise HTTPStreamError.new("Gzipped response content.") + end + begin + gz = Zlib::GzipReader.new(StringIO.new(instring)) + gz.read + ensure + gz.close + end + end end |