ruby-changes:37171
From: usa <ko1@a...>
Date: Wed, 14 Jan 2015 16:49:47 +0900 (JST)
Subject: [ruby-changes:37171] usa:r49252 (ruby_2_0_0): merge revision(s) 49071-49073, 49078: [Backport #10550]
usa 2015-01-14 16:49:35 +0900 (Wed, 14 Jan 2015) New Revision: 49252 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49252 Log: merge revision(s) 49071-49073,49078: [Backport #10550] * lib/resolv.rb (Resolv::DNS::Name#==): DNS is case-insensitive, so the comparison should be case-insensitive as well. [ruby-core:66498] [Bug #10550] * lib/resolv.rb (Resolv::DNS::Name): names with different dots should be different. * lib/resolv.rb (Resolv::DNS::Name#==): Compare an array of Label:Str objects. Label#Str#== is case-insensitive. 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 Index: ruby_2_0_0/ChangeLog =================================================================== --- ruby_2_0_0/ChangeLog (revision 49251) +++ ruby_2_0_0/ChangeLog (revision 49252) @@ -1,3 +1,19 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1 +Wed Jan 14 16:48:15 2015 Tanaka Akira <akr@f...> + + * lib/resolv.rb (Resolv::DNS::Name#==): Compare an array of Label:Str + objects. Label#Str#== is case-insensitive. + +Wed Jan 14 16:48:15 2015 Ben Miller <bmiller@r...> + + * lib/resolv.rb (Resolv::DNS::Name#==): DNS is case-insensitive, so the + comparison should be case-insensitive as well. + [ruby-core:66498] [Bug #10550] + +Wed Jan 14 16:48:15 2015 Nobuyoshi Nakada <nobu@r...> + + * lib/resolv.rb (Resolv::DNS::Name): names with different dots + should be different. + Wed Jan 14 16:30:51 2015 NARUSE, Yui <naruse@r...> * lib/net/http/response.rb (Net::HTTPResponse): require one or more Index: ruby_2_0_0/lib/resolv.rb =================================================================== --- ruby_2_0_0/lib/resolv.rb (revision 49251) +++ ruby_2_0_0/lib/resolv.rb (revision 49252) @@ -1209,7 +1209,8 @@ class Resolv https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/resolv.rb#L1209 def ==(other) # :nodoc: return false unless Name === other - return @labels.join == other.to_a.join && @absolute == other.absolute? + return false unless @absolute == other.absolute? + return @labels == other.to_a end alias eql? == # :nodoc: Index: ruby_2_0_0/version.h =================================================================== --- ruby_2_0_0/version.h (revision 49251) +++ ruby_2_0_0/version.h (revision 49252) @@ -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 "2015-01-14" -#define RUBY_PATCHLEVEL 612 +#define RUBY_PATCHLEVEL 613 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 1 Index: ruby_2_0_0/test/resolv/test_dns.rb =================================================================== --- ruby_2_0_0/test/resolv/test_dns.rb (revision 49251) +++ ruby_2_0_0/test/resolv/test_dns.rb (revision 49252) @@ -175,4 +175,17 @@ class TestResolvDNS < Test::Unit::TestCa https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/resolv/test_dns.rb#L175 end end end + + def test_dots_diffences + name1 = Resolv::DNS::Name.create("example.org") + name2 = Resolv::DNS::Name.create("ex.ampl.eo.rg") + assert_not_equal(name1, name2, "different dots") + end + + def test_case_insensitive_name + bug10550 = '[ruby-core:66498] [Bug #10550]' + lower = Resolv::DNS::Name.create("ruby-lang.org") + upper = Resolv::DNS::Name.create("Ruby-Lang.org") + assert_equal(lower, upper, bug10550) + end end Property changes on: ruby_2_0_0 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r49071-49073,49078 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/