From 93f643d9572f69b101cdb45f63b78c77846faab4 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sat, 12 Jul 2008 15:08:29 +0000 Subject: merge revision(s) 17940: * lib/ipaddr.rb (IPAddr#initialize): get rid of ArgumentError in IPAddr#to_range. a patch from okkez in [ruby-dev:35091]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@18049 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/ipaddr.rb | 2 +- version.h | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 77b3b67918..0a63235a56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Jul 13 00:08:16 2008 Nobuyoshi Nakada + + * lib/ipaddr.rb (IPAddr#initialize): get rid of ArgumentError in + IPAddr#to_range. a patch from okkez in + [ruby-dev:35091]. + Sun Jul 13 00:04:38 2008 Tanaka Akira * configure.in (erfc): erfc of glibc comes with Debian GNU/Linux Etch diff --git a/lib/ipaddr.rb b/lib/ipaddr.rb index 23d74af451..fe963e406c 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 diff --git a/version.h b/version.h index ff14c339b8..313a773351 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-07-13" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20080713 -#define RUBY_PATCHLEVEL 57 +#define RUBY_PATCHLEVEL 58 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3