merge revision(s) r44642: [Backport #9093]

* lib/resolv.rb (Resolv::DNS::Resource::TXT#data): Return concatenated
	  string.
	  Patch by Ryan Brunner.  [ruby-core:58220] [Bug #9093]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44983 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2014-02-15 15:55:08 +00:00
parent 9187fefa4d
commit 5d5fb5f2b4
3 changed files with 9 additions and 3 deletions

View file

@ -1943,10 +1943,10 @@ class Resolv
attr_reader :strings
##
# Returns the first string from +strings+.
# Returns the concatenated string from +strings+.
def data
@strings[0]
@strings.join("")
end
def encode_rdata(msg) # :nodoc: