merge revision(s) 19593:

shyouhei · shyouhei · commit 1da5a489e4cc · 2009-01-27T06:18:04.000Z
* 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_7@21798 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan 27 15:17:35 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/socket.c (host_str): numeric address should be unsigned.
+	  [ruby-core:18971]
+
 Mon Jan 26 11:12:03 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* lib/tmpdir.rb: setup buffer with nul characters instead of spaces.
diff --git 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
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-01-26"
+#define RUBY_RELEASE_DATE "2009-01-27"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090126
-#define RUBY_PATCHLEVEL 96
+#define RUBY_RELEASE_CODE 20090127
+#define RUBY_PATCHLEVEL 97
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #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[];

Original file line number	Diff line number	Diff line change
`@@ -840,7 +840,7 @@ host_str(host, hbuf, len)`
`840`	`840`	`return NULL;`
`841`	`841`	`}`
`842`	`842`	`else if (rb_obj_is_kind_of(host, rb_cInteger)) {`
`843`		`- long i = NUM2LONG(host);`
	`843`	`+ unsigned long i = NUM2ULONG(host);`
`844`	`844`
`845`	`845`	`make_inetaddr(htonl(i), hbuf, len);`
`846`	`846`	`return hbuf;`