naruse	2012-05-19 14:40:29 +0900 (Sat, 19 May 2012)

  New Revision: 35712

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

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

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

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 35711)
+++ ruby_1_9_3/ChangeLog	(revision 35712)
@@ -1,3 +1,9 @@
+Sat May 19 14:39:50 2012  Tanaka Akira  <akr@f...>
+
+	* lib/webrick/utils.rb: fix fcntl call.
+
+	* lib/drb/unix.rb: ditto.
+
 Fri May 18 18:13:44 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/mkmf.rb (MakeMakefile#configuration): keep space at end of
Index: ruby_1_9_3/lib/webrick/utils.rb
===================================================================
--- ruby_1_9_3/lib/webrick/utils.rb	(revision 35711)
+++ ruby_1_9_3/lib/webrick/utils.rb	(revision 35712)
@@ -33,7 +33,7 @@
     # Sets the close on exec flag for +io+
     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_9_3/lib/drb/unix.rb
===================================================================
--- ruby_1_9_3/lib/drb/unix.rb	(revision 35711)
+++ ruby_1_9_3/lib/drb/unix.rb	(revision 35712)
@@ -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
 
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 35711)
+++ ruby_1_9_3/version.h	(revision 35712)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 217
+#define RUBY_PATCHLEVEL 218
 
-#define RUBY_RELEASE_DATE "2012-05-18"
+#define RUBY_RELEASE_DATE "2012-05-19"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 19
 
 #include "ruby/version.h"
 

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