usa	2014-02-14 15:26:06 +0900 (Fri, 14 Feb 2014)

  New Revision: 44944

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

  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_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/lib/resolv.rb
    branches/ruby_1_9_3/version.h
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 44943)
+++ ruby_1_9_3/ChangeLog	(revision 44944)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Fri Feb 14 15:25:23 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]
+
 Fri Feb 14 15:23:43 2014  Tanaka Akira  <akr@f...>
 
 	* ext/socket: Avoid unnecessary ppoll/select on Linux.
Index: ruby_1_9_3/lib/resolv.rb
===================================================================
--- ruby_1_9_3/lib/resolv.rb	(revision 44943)
+++ ruby_1_9_3/lib/resolv.rb	(revision 44944)
@@ -1900,10 +1900,10 @@ class Resolv https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/lib/resolv.rb#L1900
         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_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 44943)
+++ ruby_1_9_3/version.h	(revision 44944)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 525
+#define RUBY_PATCHLEVEL 526
 
 #define RUBY_RELEASE_DATE "2014-02-14"
 #define RUBY_RELEASE_YEAR 2014

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


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