[前][次][番号順一覧][スレッド一覧]

ruby-changes:23888

From: shyouhei <ko1@a...>
Date: Wed, 6 Jun 2012 14:20:22 +0900 (JST)
Subject: [ruby-changes:23888] shyouhei:r35939 (ruby_1_8_7): merge revision(s) 33611:

shyouhei	2012-06-06 14:20:08 +0900 (Wed, 06 Jun 2012)

  New Revision: 35939

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

  Log:
    merge revision(s) 33611:
    * lib/webrick/utils.rb: fix fcntl call.
    * lib/drb/unix.rb: ditto.

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/lib/drb/unix.rb
    branches/ruby_1_8_7/lib/webrick/utils.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 35938)
+++ ruby_1_8_7/ChangeLog	(revision 35939)
@@ -1,3 +1,9 @@
+Wed Jun  6 14:06:02 2012  Tanaka Akira  <akr@f...>
+
+	* lib/webrick/utils.rb: fix fcntl call.
+
+	* lib/drb/unix.rb: ditto.
+
 Mon May 21 16:29:47 2012  Akinori MUSHA  <knu@i...>
 
 	* ext/syslog/syslog.c (mSyslog_inspect): Make sure self is a
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 35938)
+++ ruby_1_8_7/version.h	(revision 35939)
@@ -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[];
Index: ruby_1_8_7/lib/webrick/utils.rb
===================================================================
--- ruby_1_8_7/lib/webrick/utils.rb	(revision 35938)
+++ ruby_1_8_7/lib/webrick/utils.rb	(revision 35939)
@@ -29,7 +29,7 @@
 
     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
Index: ruby_1_8_7/lib/drb/unix.rb
===================================================================
--- ruby_1_8_7/lib/drb/unix.rb	(revision 35938)
+++ ruby_1_8_7/lib/drb/unix.rb	(revision 35939)
@@ -100,7 +100,7 @@
     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
 

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

[前][次][番号順一覧][スレッド一覧]