diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-26 13:50:31 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-26 13:50:31 +0000 |
| commit | 8f9c33791f1e0ecb26e529f0815974fd4bd69d10 (patch) | |
| tree | 0a4ecf819ba0073c29bc076ddb5e10a69e0d2c15 /lib | |
| parent | 6872246bc7925628298c9cacf502f383f01bb2cc (diff) | |
| download | ruby-8f9c33791f1e0ecb26e529f0815974fd4bd69d10.tar.gz ruby-8f9c33791f1e0ecb26e529f0815974fd4bd69d10.tar.xz ruby-8f9c33791f1e0ecb26e529f0815974fd4bd69d10.zip | |
* lib/resolv.rb (Resolv::DNS::Name.==): fix for other is array of
Resolv::DNS::Label::Str.
* lib/resolv.rb (Resolv::DNS::MessageEncoder#put_label): String#string
is not defined, so replace to_s.
* lib/resolv.rb (Resolv::IPv6#to_name): ip6.int is obsoleted by ip6.arpa.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14723 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/resolv.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/resolv.rb b/lib/resolv.rb index deceeaba3..1fa3598e8 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -1032,7 +1032,7 @@ class Resolv def ==(other) # :nodoc: return false unless Name === other - return @labels == other.to_a && @absolute == other.absolute? + return @labels.join == other.to_a.join && @absolute == other.absolute? end alias eql? == # :nodoc: @@ -1262,7 +1262,7 @@ class Resolv end def put_label(d) - self.put_string(d.string) + self.put_string(d.to_s) end end @@ -2191,7 +2191,7 @@ class Resolv def to_name return DNS::Name.new( - @address.unpack("H32")[0].split(//).reverse + ['ip6', 'int']) + @address.unpack("H32")[0].split(//).reverse + ['ip6', 'arpa']) end def ==(other) # :nodoc: |