diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-06 05:20:08 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-06 05:20:08 +0000 |
commit | 69883b3ee6502cc210e598fd440b65e20629cd9c (patch) | |
tree | bd62b7ff7c06aeb0acf1634023d9d53ffaa6212d | |
parent | c869f69c3543552c0ffa27628d587bae460b6213 (diff) |
merge revision(s) 33611:
* 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
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | lib/drb/unix.rb | 2 | ||||
-rw-r--r-- | lib/webrick/utils.rb | 2 | ||||
-rw-r--r-- | version.h | 10 |
4 files changed, 13 insertions, 7 deletions
@@ -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> * ext/syslog/syslog.c (mSyslog_inspect): Make sure self is a diff --git a/lib/drb/unix.rb b/lib/drb/unix.rb index 57feed8301..90ca292b7a 100644 --- a/lib/drb/unix.rb +++ b/lib/drb/unix.rb @@ -100,7 +100,7 @@ module DRb end 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 diff --git a/lib/webrick/utils.rb b/lib/webrick/utils.rb index cf9da6f2ce..1c29ef5ed0 100644 --- a/lib/webrick/utils.rb +++ b/lib/webrick/utils.rb @@ -29,7 +29,7 @@ module WEBrick def set_close_on_exec(io) if defined?(Fcntl::FD_CLOEXEC) - io.fcntl(Fcntl::FD_CLOEXEC, 1) + io.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) end end module_function :set_close_on_exec @@ -1,15 +1,15 @@ #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_RELEASE_CODE 20120521 -#define RUBY_PATCHLEVEL 362 +#define RUBY_RELEASE_CODE 20120606 +#define RUBY_PATCHLEVEL 363 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2012 -#define RUBY_RELEASE_MONTH 5 -#define RUBY_RELEASE_DAY 21 +#define RUBY_RELEASE_MONTH 6 +#define RUBY_RELEASE_DAY 6 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |