From e86a90420d06f613cf597f266abb5429aa2d6b43 Mon Sep 17 00:00:00 2001 From: akr Date: Sat, 18 Jan 2014 14:01:43 +0000 Subject: * 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/trunk@44642 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/resolv.rb | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 36c62566bf..2ced7f90aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Jan 18 22:57:44 2014 Tanaka Akira + + * lib/resolv.rb (Resolv::DNS::Resource::TXT#data): Return concatenated + string. + Patch by Ryan Brunner. [ruby-core:58220] [Bug #9093] + Sat Jan 18 22:35:15 2014 Tanaka Akira * io.c (rb_update_max_fd): Return immediately if the given fd is small diff --git a/lib/resolv.rb b/lib/resolv.rb index 0c2b68ec27..3194d76aa1 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -1963,10 +1963,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: -- cgit v1.2.3