usa	2015-01-14 15:55:00 +0900 (Wed, 14 Jan 2015)

  New Revision: 49245

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

  Log:
    merge revision(s) 48534: [Backport #10412]
    
    * lib/resolv.rb: fall back if canonicalization fails.
      Thanks Vit Ondruch for the patch!  [ruby-core:65836]
    
    * test/resolv/test_dns.rb: test for patch

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/lib/resolv.rb
    branches/ruby_2_0_0/test/resolv/test_dns.rb
    branches/ruby_2_0_0/version.h
    branches/ruby_2_0_0/win32/win32.c
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 49244)
+++ ruby_2_0_0/ChangeLog	(revision 49245)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Wed Jan 14 15:54:18 2015  Aaron Patterson <aaron@t...>
+
+	* lib/resolv.rb: fall back if canonicalization fails.
+	  Thanks Vit Ondruch for the patch!  [ruby-core:65836]
+
+	* test/resolv/test_dns.rb: test for patch
+
 Fri Nov 28 16:43:20 2014  Eric Hodel  <drbrain@s...>
 
 	* lib/net/http.rb:  Do not attempt SSL session resumption when the
Index: ruby_2_0_0/lib/resolv.rb
===================================================================
--- ruby_2_0_0/lib/resolv.rb	(revision 49244)
+++ ruby_2_0_0/lib/resolv.rb	(revision 49245)
@@ -1039,6 +1039,10 @@ class Resolv https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/resolv.rb#L1039
             candidates = []
           end
           candidates.concat(@search.map {|domain| Name.new(name.to_a + domain)})
+          fname = Name.create("#{name}.")
+          if !candidates.include?(fname)
+            candidates << fname
+          end
         end
         return candidates
       end
Index: ruby_2_0_0/win32/win32.c
===================================================================
--- ruby_2_0_0/win32/win32.c	(revision 49244)
+++ ruby_2_0_0/win32/win32.c	(revision 49245)
@@ -1399,6 +1399,8 @@ insert(const char *path, VALUE vinfo, vo https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/win32/win32.c#L1399
     return 0;
 }
 
+/* License: RubArtistic or GPL */
+
 /* License: Artistic or GPL */
 static NtCmdLineElement **
 cmdglob(NtCmdLineElement *patt, NtCmdLineElement **tail)
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 49244)
+++ ruby_2_0_0/version.h	(revision 49245)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2014-11-28"
-#define RUBY_PATCHLEVEL 606
+#define RUBY_RELEASE_DATE "2015-01-14"
+#define RUBY_PATCHLEVEL 607
 
-#define RUBY_RELEASE_YEAR 2014
-#define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_YEAR 2015
+#define RUBY_RELEASE_MONTH 1
+#define RUBY_RELEASE_DAY 14
 
 #include "ruby/version.h"
 
Index: ruby_2_0_0/test/resolv/test_dns.rb
===================================================================
--- ruby_2_0_0/test/resolv/test_dns.rb	(revision 49244)
+++ ruby_2_0_0/test/resolv/test_dns.rb	(revision 49245)
@@ -23,6 +23,20 @@ class TestResolvDNS < Test::Unit::TestCa https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/resolv/test_dns.rb#L23
     end
   end
 
+  # [ruby-core:65836]
+  def test_resolve_with_2_ndots
+    conf = Resolv::DNS::Config.new :nameserver => ['127.0.0.1'], :ndots => 2
+    assert conf.single?
+
+    candidates = []
+    conf.resolv('example.com') { |candidate, *args|
+      candidates << candidate
+      raise Resolv::DNS::Config::NXDomain
+    }
+    n = Resolv::DNS::Name.create 'example.com.'
+    assert_equal n, candidates.last
+  end
+
   def test_query_ipv4_address
     begin
       OpenSSL

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


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