diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-23 04:03:59 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-23 04:03:59 +0000 |
| commit | 5b764f07717a2337920c53532516100e8f5159b7 (patch) | |
| tree | 1ade26a5d43af702e4e3a7d392fd8879f6f539c0 /lib | |
| parent | 937e68b9bd0f07e5004c37feb974fca4ceadc5b8 (diff) | |
merge revision(s) 39298:39300:
* lib/ipaddr.rb (IPAddr#in6_addr): Fix a typo with the closing
parenthesis.
* lib/ipaddr.rb (IPAddr#in6_addr): Fix the parser so that it can
recognize IPv6 addresses with only one edge 16-bit piece
compressed, like [::2:3:4:5:6:7:8] or [1:2:3:4:5:6:7::].
[Bug #7477]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39423 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ipaddr.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb index 933ba7f90b..13016fcbba 100644 --- a/lib/ipaddr.rb +++ b/lib/ipaddr.rb @@ -549,7 +549,8 @@ class IPAddr left = $1 right = $3 + '0:0' else - left.count(':') <= 7 or raise InvalidAddressError, "invalid address" + left.count(':') <= ($1.empty? || $2.empty? ? 8 : 7) or + raise InvalidAddressError, "invalid address" left = $1 right = $2 addr = 0 @@ -671,6 +672,8 @@ class TC_IPAddr < Test::Unit::TestCase ["0:0:0:1::"], ["2001:200:300::/48"], ["2001:200:300::192.168.1.2/48"], + ["1:2:3:4:5:6:7::"], + ["::2:3:4:5:6:7:8"], ].each { |args| assert_nothing_raised { IPAddr.new(*args) @@ -727,6 +730,8 @@ class TC_IPAddr < Test::Unit::TestCase assert_equal("2001:200:300::", IPAddr.new("2001:200:300::/48").to_s) assert_equal("2001:200:300::", IPAddr.new("[2001:200:300::]/48").to_s) + assert_equal("1:2:3:4:5:6:7:0", IPAddr.new("1:2:3:4:5:6:7::").to_s) + assert_equal("0:2:3:4:5:6:7:8", IPAddr.new("::2:3:4:5:6:7:8").to_s) assert_raises(IPAddr::InvalidAddressError) { IPAddr.new("192.168.0.256") } assert_raises(IPAddr::InvalidAddressError) { IPAddr.new("192.168.0.011") } |