diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-08 15:33:06 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-08 15:33:06 +0000 |
| commit | 5c4e05232e20b0b545e87c289cc857e04bb0f4fc (patch) | |
| tree | dfb2d0c50efe21a069bba4e3ea2fae9eaf7f4d01 | |
| parent | 4f19613f4a13987c658c27ca2ab729f713968d44 (diff) | |
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24463 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | sample/dualstack-httpd.rb | 2 | ||||
| -rw-r--r-- | sample/svr.rb | 2 | ||||
| -rw-r--r-- | sample/tsvr.rb | 2 | ||||
| -rw-r--r-- | version.h | 2 |
5 files changed, 12 insertions, 4 deletions
@@ -1,3 +1,11 @@ +Mon Aug 3 18:25:08 2009 Yukihiro Matsumoto <matz@ruby-lang.org> + + * 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 <matz@ruby-lang.org> * thread.c (recursive_push): untrust internal hash to prevent diff --git a/sample/dualstack-httpd.rb b/sample/dualstack-httpd.rb index 69e3181863..11c5201d74 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 11cfc5fbfe..f4f29eb8e7 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 52cdd32dce..2fa6c87ef9 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(":")) @@ -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 |