naruse	2014-02-22 15:01:44 +0900 (Sat, 22 Feb 2014)

  New Revision: 45114

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=45114

  Log:
    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]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/lib/resolv.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 45113)
+++ ruby_2_1/ChangeLog	(revision 45114)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Sat Feb 22 15:01:21 2014  Tanaka Akira  <akr@f...>
+
+	* lib/resolv.rb (Resolv::DNS::Resource::TXT#data): Return concatenated
+	  string.
+	  Patch by Ryan Brunner.  [ruby-core:58220] [Bug #9093]
+
 Sat Feb 22 14:52:55 2014  Zachary Scott  <e@z...>
 
 	* ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Szuecs [Bug #9243]
Index: ruby_2_1/lib/resolv.rb
===================================================================
--- ruby_2_1/lib/resolv.rb	(revision 45113)
+++ ruby_2_1/lib/resolv.rb	(revision 45114)
@@ -1974,10 +1974,10 @@ class Resolv https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/resolv.rb#L1974
         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:
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 45113)
+++ ruby_2_1/version.h	(revision 45114)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.1"
 #define RUBY_RELEASE_DATE "2014-02-22"
-#define RUBY_PATCHLEVEL 58
+#define RUBY_PATCHLEVEL 59
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44642


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/