mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/{soap,wsdl,xsd}, test/{soap,wsdl,xsd}: imported soap4r/1.5.5.
#nnn is a ticket number at http://dev.ctor.org/soap4r * SOAP * allow to configure an envelope namespace of SOAP request. (#124) TemporaryNamespace = 'http://www.w3.org/2003/05/soap-envelope' @client.options["soap.envelope.requestnamespace"] = TemporaryNamespace @client.options["soap.envelope.responsenamespace"] = TemporaryNamespace @client.do_proc(...) * let SOAP request XML indent space configuable. see "soap.envelope.no_indent" option. (#130) * let external CES configuable. ex. client["soap.mapping.external_ces"] = 'SJIS'. $KCODE is used by default. (#133) external CES ::= CES used in Ruby object of client and server internal CES ::= CES used in SOAP/OM * add iso-8859-1 external CES support. (#106) * fixed illegal 'qualified' handling of elements. it caused ASP.NET inteoperability problem. (#144) * added 'soap.envelope.use_numeric_character_reference' (boolean) option to let query XML use numeric character reference in XML, not plain UTF-8 character. !GoogleSearch server seems to not allow plain UTF-8 character since 2005-08-15 update. (#147) * SOAP::Header::SimpleHeader (de)serialization throws an exception on !SimpleHeader.on_(in|out)bound when header is a String. so we could not use a simple single element headerItem. fixed. thanks to emil. (#129) * out parameter of rpc operation did not work. (#132) * follow HTTP redirect only if using http-access2. (#125) (#145) * add a workaround for importing an WSDL whose path begins with drive letter. (#115) * WSDL * SOAP Data which is defined as a simpletype was not mapped correctly to Ruby obj when using wsdl2ruby.rb generated classdef file. (#123) * rpc/literal support. (#118) * re-implemented local element qualify/unqualify control. handles elementFormDefault and form in WSDL. (#119) * Array of an element which has simpleType causes a crash. (#128) * prarmeterOrder may not contain return part so it can be shorter than parts size. Thanks to Hugh. (#139) * Samples * added !BasicAuth client sample. (#117) * added Base64 client/server sample. * added Flickr SOAP interface client sample. (#122) * added !SalesForce client sample. (#135) * updated Thawte CA certificate for !GoogleAdWords sample. * updated a client script with the newer version made by Johan. thanks! * shortened long file names. (#120) * fixed typo in authheader sample. (#129) * updated deprecated method usage. (#138) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9171 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
caf6ad3a76
commit
533c24268e
54 changed files with 920 additions and 617 deletions
|
|
@ -20,18 +20,6 @@ module SOAP
|
|||
|
||||
|
||||
class StreamHandler
|
||||
Client = begin
|
||||
require 'http-access2'
|
||||
if HTTPAccess2::VERSION < "2.0"
|
||||
raise LoadError.new("http-access/2.0 or later is required.")
|
||||
end
|
||||
HTTPAccess2::Client
|
||||
rescue LoadError
|
||||
warn("Loading http-access2 failed. Net/http is used.") if $DEBUG
|
||||
require 'soap/netHttpClient'
|
||||
SOAP::NetHttpClient
|
||||
end
|
||||
|
||||
RUBY_VERSION_STRING = "ruby #{ RUBY_VERSION } (#{ RUBY_RELEASE_DATE }) [#{ RUBY_PLATFORM }]"
|
||||
|
||||
class ConnectionData
|
||||
|
|
@ -70,12 +58,27 @@ end
|
|||
class HTTPStreamHandler < StreamHandler
|
||||
include SOAP
|
||||
|
||||
begin
|
||||
require 'http-access2'
|
||||
if HTTPAccess2::VERSION < "2.0"
|
||||
raise LoadError.new("http-access/2.0 or later is required.")
|
||||
end
|
||||
Client = HTTPAccess2::Client
|
||||
RETRYABLE = true
|
||||
rescue LoadError
|
||||
warn("Loading http-access2 failed. Net/http is used.") if $DEBUG
|
||||
require 'soap/netHttpClient'
|
||||
Client = SOAP::NetHttpClient
|
||||
RETRYABLE = false
|
||||
end
|
||||
|
||||
|
||||
public
|
||||
|
||||
attr_reader :client
|
||||
attr_accessor :wiredump_file_base
|
||||
|
||||
NofRetry = 10 # [times]
|
||||
MAX_RETRY_COUNT = 10 # [times]
|
||||
|
||||
def initialize(options)
|
||||
super()
|
||||
|
|
@ -119,7 +122,7 @@ private
|
|||
|
||||
def set_options
|
||||
HTTPConfigLoader.set_options(@client, @options)
|
||||
@charset = @options["charset"] || XSD::Charset.charset_label($KCODE)
|
||||
@charset = @options["charset"] || XSD::Charset.xml_encoding_label
|
||||
@options.add_hook("charset") do |key, value|
|
||||
@charset = value
|
||||
end
|
||||
|
|
@ -140,6 +143,7 @@ private
|
|||
end
|
||||
|
||||
def set_cookie_store_file(value)
|
||||
value = nil if value and value.empty?
|
||||
@cookie_store = value
|
||||
@client.set_cookie_store(@cookie_store) if @cookie_store
|
||||
end
|
||||
|
|
@ -161,7 +165,20 @@ private
|
|||
send_string = conn_data.send_string
|
||||
@wiredump_dev << "Wire dump:\n\n" if @wiredump_dev
|
||||
begin
|
||||
res = @client.post(endpoint_url, send_string, extra)
|
||||
retry_count = 0
|
||||
while true
|
||||
res = @client.post(endpoint_url, send_string, extra)
|
||||
if RETRYABLE and HTTP::Status.redirect?(res.status)
|
||||
retry_count += 1
|
||||
if retry_count >= MAX_RETRY_COUNT
|
||||
raise HTTPStreamError.new("redirect count exceeded")
|
||||
end
|
||||
endpoint_url = res.header["location"][0]
|
||||
puts "redirected to #{endpoint_url}" if $DEBUG
|
||||
else
|
||||
break
|
||||
end
|
||||
end
|
||||
rescue
|
||||
@client.reset(endpoint_url)
|
||||
raise
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue