The branch, master has been updated
via b675e6b2d552472288c2f0cc606cc141c650bcee (commit)
via 58b50fb543168128f1eef30ad9908cf27ee91f41 (commit)
from 7712e6f82b7068fb03d86cfc353290a1aae95d30 (commit)
- Log -----------------------------------------------------------------
commit b675e6b2d552472288c2f0cc606cc141c650bcee
Merge: 7712e6f 58b50fb
Author: Thomas Adam <tho...@xteddy.org>
Commit: Thomas Adam <tho...@xteddy.org>
Merge branch 'obsd-master'
server.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 58b50fb543168128f1eef30ad9908cf27ee91f41
Author: nicm <nicm>
Commit: nicm <nicm>
Clear signal handlers before event_reinit as apparently it can otherwise
cause libevent to go strange.
---
server.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server.c b/server.c
index 6438fe6..b53648f 100644
--- a/server.c
+++ b/server.c
@@ -129,9 +129,9 @@ server_start(int lockfd, char *lockfile)
fatal("daemon failed");
/* event_init() was called in our parent, need to reinit. */
+ clear_signals(0);
if (event_reinit(ev_base) != 0)
fatal("event_reinit failed");
- clear_signals(0);
logfile("server");
log_debug("server started, pid %ld", (long) getpid());
-----------------------------------------------------------------------
Summary of changes:
server.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
