mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/xmlrpc/create.rb (XMLRPC::Create::conv2value): Symbol should
come earlier than String. * lib/soap/mapping/rubytypeFactory.rb (RubytypeFactory::obj2soap): ditto. * lib/set.rb (TC_Set::test_s_new): strings are no longer Enumerable * lib/soap/property.rb (Property::load): ditto. * lib/webrick/httputils.rb (WEBrick::HTTPUtils::parse_header): ditto. * lib/soap/mimemessage.rb (MIMEMessage::Headers::parse): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11259 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
92ca42cb3e
commit
84e2f5268a
10 changed files with 37 additions and 21 deletions
|
@ -38,6 +38,14 @@ class RubytypeFactory < Factory
|
|||
def obj2soap(soap_class, obj, info, map)
|
||||
param = nil
|
||||
case obj
|
||||
when ::Symbol
|
||||
unless @allow_original_mapping
|
||||
return nil
|
||||
end
|
||||
param = SOAPStruct.new(TYPE_SYMBOL)
|
||||
mark_marshalled_obj(obj, param)
|
||||
param.add('id', SOAPString.new(obj.id2name))
|
||||
addiv2soapattr(param, obj, map)
|
||||
when ::String
|
||||
unless @allow_original_mapping
|
||||
return nil
|
||||
|
@ -185,14 +193,6 @@ class RubytypeFactory < Factory
|
|||
mark_marshalled_obj(obj, param)
|
||||
param.add('name', SOAPString.new(obj.name))
|
||||
addiv2soapattr(param, obj, map)
|
||||
when ::Symbol
|
||||
unless @allow_original_mapping
|
||||
return nil
|
||||
end
|
||||
param = SOAPStruct.new(TYPE_SYMBOL)
|
||||
mark_marshalled_obj(obj, param)
|
||||
param.add('id', SOAPString.new(obj.id2name))
|
||||
addiv2soapattr(param, obj, map)
|
||||
when ::Struct
|
||||
unless @allow_original_mapping
|
||||
# treat it as an user defined class. [ruby-talk:104980]
|
||||
|
|
|
@ -49,7 +49,7 @@ class MIMEMessage
|
|||
|
||||
def parse(str)
|
||||
header_cache = nil
|
||||
str.each do |line|
|
||||
str.lines.each do |line|
|
||||
case line
|
||||
when /^\A[^\: \t]+:\s*.+$/
|
||||
parse_line(header_cache) if header_cache
|
||||
|
|
|
@ -70,7 +70,7 @@ class Property
|
|||
LINE_REGEXP = Regexp.new("^#{DEF_REGSRC}$")
|
||||
def load(stream)
|
||||
key_prefix = ""
|
||||
stream.each_with_index do |line, lineno|
|
||||
stream.lines.each_with_index do |line, lineno|
|
||||
line.sub!(/\r?\n\z/, '')
|
||||
case line
|
||||
when COMMENT_REGEXP
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue