yugui	2009-08-09 00:33:06 +0900 (Sun, 09 Aug 2009)

  New Revision: 24463

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24463

  Log:
    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.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/sample/dualstack-httpd.rb
    branches/ruby_1_9_1/sample/svr.rb
    branches/ruby_1_9_1/sample/tsvr.rb
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 24462)
+++ ruby_1_9_1/ChangeLog	(revision 24463)
@@ -1,3 +1,11 @@
+Mon Aug  3 18:25:08 2009  Yukihiro Matsumoto  <matz@r...>
+
+	* 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@r...>
 
 	* thread.c (recursive_push): untrust internal hash to prevent
Index: ruby_1_9_1/sample/dualstack-httpd.rb
===================================================================
--- ruby_1_9_1/sample/dualstack-httpd.rb	(revision 24462)
+++ ruby_1_9_1/sample/dualstack-httpd.rb	(revision 24463)
@@ -12,7 +12,7 @@
 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
Index: ruby_1_9_1/sample/tsvr.rb
===================================================================
--- ruby_1_9_1/sample/tsvr.rb	(revision 24462)
+++ ruby_1_9_1/sample/tsvr.rb	(revision 24463)
@@ -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(":"))
Index: ruby_1_9_1/sample/svr.rb
===================================================================
--- ruby_1_9_1/sample/svr.rb	(revision 24462)
+++ ruby_1_9_1/sample/svr.rb	(revision 24463)
@@ -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(":"))
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 24462)
+++ ruby_1_9_1/version.h	(revision 24463)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/