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

merge revision(s) 33611:

Browse source 
* lib/webrick/utils.rb: fix fcntl call.
	* lib/drb/unix.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@35939 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2012-06-06 05:20:08 +00:00
parent c869f69c35
commit 69883b3ee6
4 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Wed Jun 6 14:06:02 2012 Tanaka Akira <akr@fsij.org>
* lib/webrick/utils.rb: fix fcntl call.
* lib/drb/unix.rb: ditto.
Mon May 21 16:29:47 2012 Akinori MUSHA <knu@iDaemons.org> Mon May 21 16:29:47 2012 Akinori MUSHA <knu@iDaemons.org>
* ext/syslog/syslog.c (mSyslog_inspect): Make sure self is a * ext/syslog/syslog.c (mSyslog_inspect): Make sure self is a

2
lib/drb/unix.rb
View file

@ -100,7 +100,7 @@ module DRb
end end
def set_sockopt(soc) def set_sockopt(soc)
soc.fcntl(Fcntl::F_SETFL, Fcntl::FD_CLOEXEC) if defined? Fcntl::FD_CLOEXEC soc.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) if defined? Fcntl::FD_CLOEXEC
end end
end end

2
lib/webrick/utils.rb
View file

@ -29,7 +29,7 @@ module WEBrick
def set_close_on_exec(io) def set_close_on_exec(io)
if defined?(Fcntl::FD_CLOEXEC) if defined?(Fcntl::FD_CLOEXEC)
io.fcntl(Fcntl::FD_CLOEXEC, 1) io.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
end end
end end
module_function :set_close_on_exec module_function :set_close_on_exec

10
version.h
View file

@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.7" #define RUBY_VERSION "1.8.7"
#define RUBY_RELEASE_DATE "2012-05-21" #define RUBY_RELEASE_DATE "2012-06-06"
#define RUBY_VERSION_CODE 187 #define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20120521 #define RUBY_RELEASE_CODE 20120606
#define RUBY_PATCHLEVEL 362 #define RUBY_PATCHLEVEL 363
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7 #define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_YEAR 2012
#define RUBY_RELEASE_MONTH 5 #define RUBY_RELEASE_MONTH 6
#define RUBY_RELEASE_DAY 21 #define RUBY_RELEASE_DAY 6
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];