diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-12 15:07:29 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-12 15:07:29 +0000 |
commit | b3470a1a45fef7c117cb06a5a90b1ff5ff2e7f1e (patch) | |
tree | 149319c051e946cf40f03361e36377839cee8f41 | |
parent | 40e3baf292e77d7bfa1a7ffc56ba16bc232b49b0 (diff) |
merge revision(s) 17940:
* 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@18047 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | lib/ipaddr.rb | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Sun Jul 13 00:07:07 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]. + Sun Jul 13 00:02:26 2008 Tanaka Akira <akr@fsij.org> * configure.in (erfc): erfc of glibc comes with Debian GNU/Linux Etch diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb index 17e47f016f..1801d9d86f 100644 --- a/lib/ipaddr.rb +++ b/lib/ipaddr.rb @@ -438,7 +438,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 @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-07-13" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080713 -#define RUBY_PATCHLEVEL 274 +#define RUBY_PATCHLEVEL 275 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |