diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-22 06:01:44 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-22 06:01:44 +0000 |
| commit | d3452b572705e11b0be6e715b00597f14ebe4bdb (patch) | |
| tree | fde41a0a2cdb5545afdac3ae6d28049121adceea /lib | |
| parent | 48ccb14404de2f79547be93b3192d1a31971a303 (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_2_1@45114 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 ee21c9c843..6b2fa9d903 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -1974,10 +1974,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: |