--- rxvt-unicode/src/rxvtd.C	2007/11/11 04:08:00	1.34
+++ rxvt-unicode/src/rxvtd.C	2007/11/17 07:28:00	1.36
@@ -52,7 +52,8 @@
     log_cb (this, &server::log_msg),
     getfd_cb (this, &server::getfd)
   {
-    this->fd = fd;
+    fcntl (fd, F_SETFD, FD_CLOEXEC);
+    fcntl (fd, F_SETFL, 0);
     read_ev.start (fd, ev::READ);
   }
 
@@ -85,6 +86,7 @@
     }
 
   fcntl (fd, F_SETFD, FD_CLOEXEC);
+  fcntl (fd, F_SETFL, O_NONBLOCK);
 
   sa.sun_family = AF_UNIX;
   strcpy (sa.sun_path, sockname);
@@ -115,10 +117,7 @@
   int fd2 = accept (fd, 0, 0);
 
   if (fd2 >= 0)
-    {
-      fcntl (fd2, F_SETFD, FD_CLOEXEC);
-      new server (fd2);
-    }
+    new server (fd2);
 }
 
 int server::getfd (int remote_fd)