From 88960eb7070d9f5c34a84f57a005c9d5602ed229 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Tue, 27 Jan 2009 06:17:02 +0000 Subject: merge revision(s) 19593: * ext/socket/socket.c (host_str): numeric address should be unsigned. [ruby-core:18971] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@21796 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/socket/socket.c | 2 +- version.h | 8 ++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9caed9de48..9d40368af4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Jan 27 15:16:05 2009 Nobuyoshi Nakada + + * ext/socket/socket.c (host_str): numeric address should be unsigned. + [ruby-core:18971] + Mon Jan 26 11:11:22 2009 NAKAMURA Usaku * lib/tmpdir.rb: setup buffer with nul characters instead of spaces. diff --git a/ext/socket/socket.c b/ext/socket/socket.c index d037be02c7..5b0c7049df 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -840,7 +840,7 @@ host_str(host, hbuf, len) return NULL; } else if (rb_obj_is_kind_of(host, rb_cInteger)) { - long i = NUM2LONG(host); + unsigned long i = NUM2ULONG(host); make_inetaddr(htonl(i), hbuf, len); return hbuf; diff --git a/version.h b/version.h index dfe9fa56fe..0c1acef9b6 100644 --- a/version.h +++ b/version.h @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2009-01-26" +#define RUBY_RELEASE_DATE "2009-01-27" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20090126 -#define RUBY_PATCHLEVEL 310 +#define RUBY_RELEASE_CODE 20090127 +#define RUBY_PATCHLEVEL 311 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 26 +#define RUBY_RELEASE_DAY 27 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3