aboutsummaryrefslogtreecommitdiff
path: root/server-client.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2011-07-08 22:58:30 +0000
committerTiago Cunha <tcunha@gmx.com>2011-07-08 22:58:30 +0000
commit67e70770c8c29df3e92634132401739531f94ff9 (patch)
tree8762c3c90ee004bbcf0f8b72dfdff29c5d0b75c2 /server-client.c
parentbcacbb1a895063a9681f3a3fac9c4fe284f9fc86 (diff)
downloadrtmux-67e70770c8c29df3e92634132401739531f94ff9.tar.gz
rtmux-67e70770c8c29df3e92634132401739531f94ff9.tar.bz2
rtmux-67e70770c8c29df3e92634132401739531f94ff9.zip
Sync OpenBSD patchset 936:
Do not continue to send data to suspended/locked clients or there will be a huge rush of it after they are resumed/unlocked. The main output path was fine but status line updates and the terminal state reset code were missed.
Diffstat (limited to 'server-client.c')
-rw-r--r--server-client.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/server-client.c b/server-client.c
index 805b1ca7..badbe1be 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1,4 +1,4 @@
-/* $Id: server-client.c,v 1.62 2011-05-22 16:25:02 tcunha Exp $ */
+/* $Id$ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -473,6 +473,9 @@ server_client_reset_state(struct client *c)
struct options *wo = &w->options;
int status, mode;
+ if (c->flags & CLIENT_SUSPENDED)
+ return;
+
tty_region(&c->tty, 0, c->tty.sy - 1);
status = options_get_number(oo, "status");