archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 09:04:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) r46598: [Backport #9991]

Browse source 
* lib/webrick/utils.rb (create_listeners): Close socket objects.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46605 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2014-06-28 16:41:52 +00:00
parent 108828f680
commit b18ab01b09
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Sun Jun 29 01:34:06 2014 Tanaka Akira <akr@fsij.org>
* lib/webrick/utils.rb (create_listeners): Close socket objects.
Sat Jun 28 16:35:51 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Jun 28 16:35:51 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_substr): need to reset code range for shared * string.c (rb_str_substr): need to reset code range for shared

4
lib/webrick/utils.rb
View file

@ -75,7 +75,9 @@ module WEBrick
sockets = Socket.tcp_server_sockets(address, port) sockets = Socket.tcp_server_sockets(address, port)
sockets = sockets.map {|s| sockets = sockets.map {|s|
s.autoclose = false s.autoclose = false
TCPServer.for_fd(s.fileno) ts = TCPServer.for_fd(s.fileno)
s.close
ts
} }
return sockets return sockets
end end

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.1.2" #define RUBY_VERSION "2.1.2"
#define RUBY_RELEASE_DATE "2014-06-28" #define RUBY_RELEASE_DATE "2014-06-29"
#define RUBY_PATCHLEVEL 144 #define RUBY_PATCHLEVEL 145
#define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 6 #define RUBY_RELEASE_MONTH 6
#define RUBY_RELEASE_DAY 28 #define RUBY_RELEASE_DAY 29
#include "ruby/version.h" #include "ruby/version.h"