summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-07 08:12:23 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-07 08:12:23 +0000
commit3c94d03c304d4ab5ff32782354668d947185533a (patch)
tree91e845649428d454b7143b1a029a7f9c692ff65a
parent41948816524acce9efe1955c01bcd54625909270 (diff)
downloadruby-3c94d03c304d4ab5ff32782354668d947185533a.tar.gz
ruby-3c94d03c304d4ab5ff32782354668d947185533a.tar.xz
ruby-3c94d03c304d4ab5ff32782354668d947185533a.zip
* lib/ipaddr.rb (IPAddr#initialize): get rid of ArgumentError in
IPAddr#to_range. a patch from okkez <okkez000 AT gmail.com> in [ruby-dev:35091]. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@17940 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/ipaddr.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 18becd871..e533338d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jul 7 17:12:20 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/ipaddr.rb (IPAddr#initialize): get rid of ArgumentError in
+ IPAddr#to_range. a patch from okkez <okkez000 AT gmail.com> in
+ [ruby-dev:35091].
+
Mon Jul 7 01:24:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_file_s_extname): fix for file name with spaces.
diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb
index 0c9b2ff0d..7c246326c 100644
--- a/lib/ipaddr.rb
+++ b/lib/ipaddr.rb
@@ -483,7 +483,7 @@ class IPAddr
if prefixlen
mask!(prefixlen)
else
- @mask_addr = (family == Socket::AF_INET) ? IN4MASK : IN6MASK
+ @mask_addr = (@family == Socket::AF_INET) ? IN4MASK : IN6MASK
end
end