diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-11 02:28:53 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-11 02:28:53 +0000 |
| commit | dbab45654393ad38e9fcb6210308e5b044f15bd5 (patch) | |
| tree | 5576e8cb64d9687850a5a07d53664d8e4b7064a0 /lib | |
| parent | d8cf72f4189e701172878836becef3f047a57dc5 (diff) | |
merge revision(s) 39299,39300: [Backport #7477]
* 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]
* lib/ipaddr.rb (IPAddr#in6_addr): Fix a typo with the closing
parenthesis.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@40230 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 b6bea19832..4d5e3f419f 100644 --- a/lib/ipaddr.rb +++ b/lib/ipaddr.rb @@ -534,7 +534,8 @@ class IPAddr left = $1 right = $3 + '0:0' else - left.count(':') <= 7 or raise ArgumentError, "invalid address" + left.count(':') <= ($1.empty? || $2.empty? ? 8 : 7) or + raise InvalidAddressError, "invalid address" left = $1 right = $2 addr = 0 @@ -656,6 +657,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) @@ -712,6 +715,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) [ ["192.168.0.256"], |