From d8d4f18af86a10763f25e54155f0f0953453259a Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 8 Aug 2009 15:33:06 +0000 Subject: merges r24372 from trunk into ruby_1_9_1. -- * sample/svr.rb: obsolete TCPserver renamed. [ruby-core:24712] * sample/tsvr.rb: ditto. * sample/dualstack-httpd.rb: ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24463 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ sample/dualstack-httpd.rb | 2 +- sample/svr.rb | 2 +- sample/tsvr.rb | 2 +- version.h | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e20dcee39..9ee9fd67f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Mon Aug 3 18:25:08 2009 Yukihiro Matsumoto + + * sample/svr.rb: obsolete TCPserver renamed. [ruby-core:24712] + + * sample/tsvr.rb: ditto. + + * sample/dualstack-httpd.rb: ditto. + Mon Aug 3 18:12:54 2009 Yukihiro Matsumoto * thread.c (recursive_push): untrust internal hash to prevent diff --git a/sample/dualstack-httpd.rb b/sample/dualstack-httpd.rb index 69e318186..11c5201d7 100644 --- a/sample/dualstack-httpd.rb +++ b/sample/dualstack-httpd.rb @@ -12,7 +12,7 @@ names = [] threads = [] res.each do |i| - s = TCPserver.new(i[3], i[1]) + s = TCPServer.new(i[3], i[1]) n = Socket.getnameinfo(s.getsockname, Socket::NI_NUMERICHOST|Socket::NI_NUMERICSERV).join(" port ") sockpool.push s names.push n diff --git a/sample/svr.rb b/sample/svr.rb index 11cfc5fbf..f4f29eb8e 100644 --- a/sample/svr.rb +++ b/sample/svr.rb @@ -6,7 +6,7 @@ require "socket" -gs = TCPserver.open(0) +gs = TCPServer.open(0) addr = gs.addr addr.shift printf("server is on %s\n", addr.join(":")) diff --git a/sample/tsvr.rb b/sample/tsvr.rb index 52cdd32dc..2fa6c87ef 100644 --- a/sample/tsvr.rb +++ b/sample/tsvr.rb @@ -3,7 +3,7 @@ require "socket" -gs = TCPserver.open(0) +gs = TCPServer.open(0) addr = gs.addr addr.shift printf("server is on %s\n", addr.join(":")) diff --git a/version.h b/version.h index da326e43d..53199f9db 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 267 +#define RUBY_PATCHLEVEL 268 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit