shyouhei	2008-06-08 01:40:56 +0900 (Sun, 08 Jun 2008)

  New Revision: 16897

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/ext/socket/socket.c
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 13699:
    * ext/socket/socket.c (s_accept_nonblock): make accepted fd
      nonblocking.  [ruby-talk:274079]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ext/socket/socket.c?r1=16897&r2=16896&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=16897&r2=16896&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=16897&r2=16896&diff_format=u

Index: ruby_1_8_5/ext/socket/socket.c
===================================================================
--- ruby_1_8_5/ext/socket/socket.c	(revision 16896)
+++ ruby_1_8_5/ext/socket/socket.c	(revision 16897)
@@ -1424,6 +1424,24 @@
 	return init_inetsock(sock, Qnil, arg1, Qnil, Qnil, INET_SERVER);
 }
 
+static void
+make_fd_nonblock(int fd)
+{
+    int flags;
+#ifdef F_GETFL
+    flags = fcntl(fd, F_GETFL);
+    if (flags == -1) {
+        rb_sys_fail(0);
+    }
+#else
+    flags = 0;
+#endif
+    flags |= O_NONBLOCK;
+    if (fcntl(fd, F_SETFL, flags) == -1) {
+        rb_sys_fail(0);
+    }
+}
+
 static VALUE
 s_accept_nonblock(VALUE klass, OpenFile *fptr, struct sockaddr *sockaddr, socklen_t *len)
 {
@@ -1435,6 +1453,7 @@
     if (fd2 < 0) {
         rb_sys_fail("accept(2)");
     }
+    make_fd_nonblock(fd2);
     return init_sock(rb_obj_alloc(klass), fd2);
 }
 
Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 16896)
+++ ruby_1_8_5/ChangeLog	(revision 16897)
@@ -1,3 +1,8 @@
+Sun Jun  8 01:37:58 2008  Tanaka Akira  <akr@f...>
+
+	* ext/socket/socket.c (s_accept_nonblock): make accepted fd
+	  nonblocking.  [ruby-talk:274079]
+
 Sun Jun  8 01:28:42 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* win32/mkexports.rb: deal with __fastcall name decorations.
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 16896)
+++ ruby_1_8_5/version.h	(revision 16897)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-08"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 134
+#define RUBY_PATCHLEVEL 135
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

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