nagachika	2013-04-04 02:27:19 +0900 (Thu, 04 Apr 2013)

  New Revision: 40089

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

  Log:
    merge revision(s) 39725: [Backport #8054]
    
    * lib/resolv-replace.rb (TCPSocket#initialize): resolve the 3rd
      argument only if non-nil value is given.
      [ruby-dev:47150] [ruby-trunk - Bug #8054] reported and analyzed by
      mrkn.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/lib/resolv-replace.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 40088)
+++ ruby_2_0_0/ChangeLog	(revision 40089)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Thu Apr  4 02:27:12 2013  Tanaka Akira  <akr@f...>
+
+	* lib/resolv-replace.rb (TCPSocket#initialize): resolve the 3rd
+	  argument only if non-nil value is given.
+	  [ruby-dev:47150] [ruby-trunk - Bug #8054] reported and analyzed by
+	  mrkn.
+
 Thu Apr  4 02:24:59 2013  NARUSE, Yui  <naruse@r...>
 
 	* Merge Onigmo d4bad41e16e3eccd97ccce6f1f96712e557c4518.
Index: ruby_2_0_0/lib/resolv-replace.rb
===================================================================
--- ruby_2_0_0/lib/resolv-replace.rb	(revision 40088)
+++ ruby_2_0_0/lib/resolv-replace.rb	(revision 40089)
@@ -19,7 +19,7 @@ class TCPSocket < IPSocket https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/resolv-replace.rb#L19
   alias original_resolv_initialize initialize
   # :startdoc:
   def initialize(host, serv, *rest)
-    rest[0] = IPSocket.getaddress(rest[0]) unless rest.empty?
+    rest[0] = IPSocket.getaddress(rest[0]) if rest[0]
     original_resolv_initialize(IPSocket.getaddress(host), serv, *rest)
   end
 end
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40088)
+++ ruby_2_0_0/version.h	(revision 40089)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-04-04"
-#define RUBY_PATCHLEVEL 104
+#define RUBY_PATCHLEVEL 105
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39725


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