kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/ipaddr.rb (to_s, test_to_s): too many colons with some cases.

Browse source 
(backported from CVS HEAD)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7789 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2005-01-19 09:08:39 +00:00
parent d15392668f
commit 418ea6a442
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,7 +1,12 @@
Wed Jan 19 18:06:40 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/ipaddr.rb (to_s, test_to_s): too many colons with some cases.
(backported from CVS HEAD)
Wed Jan 19 01:16:30 2005 Tanaka Akira <akr@m17n.org> Wed Jan 19 01:16:30 2005 Tanaka Akira <akr@m17n.org>
* lib/resolv.rb (Resolv::DNS::Config.parse_resolv_conf): ignore * lib/resolv.rb (Resolv::DNS::Config.parse_resolv_conf): ignore
domain and search directive without an argument. domain and search directive without an argument.
reported by Sam Roberts. [ruby-talk:126781] reported by Sam Roberts. [ruby-talk:126781]
Tue Jan 18 15:03:05 2005 GOTOU Yuuzou <gotoyuzo@notwork.org> Tue Jan 18 15:03:05 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>

6
lib/ipaddr.rb
View file

@ -207,6 +207,7 @@ class IPAddr
break if str.sub!(/\b0:0\b/, ':') break if str.sub!(/\b0:0\b/, ':')
break break
end end
str.sub!(/:{3,}/, '::')
if /\A::(ffff:)?([\da-f]{1,4}):([\da-f]{1,4})\Z/i =~ str if /\A::(ffff:)?([\da-f]{1,4}):([\da-f]{1,4})\Z/i =~ str
str = sprintf('::%s%d.%d.%d.%d', $1, $2.hex / 256, $2.hex % 256, $3.hex / 256, $3.hex % 256) str = sprintf('::%s%d.%d.%d.%d', $1, $2.hex / 256, $2.hex % 256, $3.hex / 256, $3.hex % 256)
@ -602,7 +603,6 @@ class TC_IPAddr < Test::Unit::TestCase
IPAddr.new(*args) IPAddr.new(*args)
} }
} }
end
def test_s_new_ntoh def test_s_new_ntoh
addr = '' addr = ''
@ -674,6 +674,10 @@ class TC_IPAddr < Test::Unit::TestCase
} }
end end
def test_to_s
assert_equal("3ffe:0505:0002:0000:0000:0000:0000:0001", IPAddr.new("3ffe:505:2::1").to_string)
assert_equal("3ffe:505:2::1", IPAddr.new("3ffe:505:2::1").to_s)
end
end end
class TC_Operator < Test::Unit::TestCase class TC_Operator < Test::Unit::TestCase