Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Rodrigo Mosconi
2014-07-02 21:22:51 -03:00
263 changed files with 14938 additions and 7520 deletions

View File

@@ -283,6 +283,13 @@ zmq::fd_t zmq::ipc_listener_t::accept ()
return retired_fd;
}
// Race condition can cause socket not to be closed (if fork happens
// between accept and this point).
#ifdef FD_CLOEXEC
int rc = fcntl (sock, F_SETFD, FD_CLOEXEC);
errno_assert (rc != -1);
#endif
// IPC accept() filters
#if defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
if (!filter (sock)) {