diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-14 06:26:06 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-14 06:26:06 +0000 |
| commit | 73176ef9396754d0a9d9f03264059d19b33294a0 (patch) | |
| tree | dd530b6d52a48e5c7624c665064a09fe5d84ad22 /lib | |
| parent | 64fe84aea97489ef2060b553734ead50e71ac489 (diff) | |
merge revision(s) 44642: [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_1_9_3@44944 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/resolv.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/resolv.rb b/lib/resolv.rb index fec2de31cd..646a36b36f 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -1900,10 +1900,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: |