archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merges r24372 from trunk into ruby_1_9_1.

Browse source 
--
* 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
This commit is contained in:
yugui 2009-08-08 15:33:06 +00:00
parent 4f19613f4a
commit 5c4e05232e
5 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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> Mon Aug 3 18:12:54 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* thread.c (recursive_push): untrust internal hash to prevent * thread.c (recursive_push): untrust internal hash to prevent

2
sample/dualstack-httpd.rb
View file

@ -12,7 +12,7 @@ names = []
threads = [] threads = []
res.each do |i| 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 ") n = Socket.getnameinfo(s.getsockname, Socket::NI_NUMERICHOST|Socket::NI_NUMERICSERV).join(" port ")
sockpool.push s sockpool.push s
names.push n names.push n

2
sample/svr.rb
View file

@ -6,7 +6,7 @@
require "socket" require "socket"
gs = TCPserver.open(0) gs = TCPServer.open(0)
addr = gs.addr addr = gs.addr
addr.shift addr.shift
printf("server is on %s\n", addr.join(":")) printf("server is on %s\n", addr.join(":"))

2
sample/tsvr.rb
View file

@ -3,7 +3,7 @@
require "socket" require "socket"
gs = TCPserver.open(0) gs = TCPServer.open(0)
addr = gs.addr addr = gs.addr
addr.shift addr.shift
printf("server is on %s\n", addr.join(":")) printf("server is on %s\n", addr.join(":"))

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1" #define RUBY_VERSION "1.9.1"
#define RUBY_PATCHLEVEL 267 #define RUBY_PATCHLEVEL 268
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1