[people/ms/ipfire-3.x.git] / openssh / patches / openssh-5.6p1-exit-deadlock.patch

diff -up openssh-5.6p1/channels.c.exit-deadlock openssh-5.6p1/channels.c
--- openssh-5.6p1/channels.c.exit-deadlock	2010-08-05 15:09:48.000000000 +0200
+++ openssh-5.6p1/channels.c	2010-08-23 12:41:43.000000000 +0200
@@ -1647,6 +1647,10 @@ channel_handle_wfd(Channel *c, fd_set *r
 	u_int dlen, olen = 0;
 	int len;
 
+	if(c->wfd != -1 && buffer_len(&c->output) > 0 && c->ostate == CHAN_OUTPUT_WAIT_DRAIN) {
+		debug("channel %d: forcing write", c->self);
+		FD_SET(c->wfd, writeset);
+	}
 	/* Send buffered output data to the socket. */
 	if (c->wfd != -1 &&
 	    FD_ISSET(c->wfd, writeset) &&
Commit	Line	Data
852f4e06 SS	1	diff -up openssh-5.6p1/channels.c.exit-deadlock openssh-5.6p1/channels.c
	2	--- openssh-5.6p1/channels.c.exit-deadlock 2010-08-05 15:09:48.000000000 +0200
	3	+++ openssh-5.6p1/channels.c 2010-08-23 12:41:43.000000000 +0200
	4	@@ -1647,6 +1647,10 @@ channel_handle_wfd(Channel c, fd_set r
	5	u_int dlen, olen = 0;
	6	int len;
	7
	8	+ if(c->wfd != -1 && buffer_len(&c->output) > 0 && c->ostate == CHAN_OUTPUT_WAIT_DRAIN) {
	9	+ debug("channel %d: forcing write", c->self);
	10	+ FD_SET(c->wfd, writeset);
	11	+ }
	12	/* Send buffered output data to the socket. */
	13	if (c->wfd != -1 &&
	14	FD_ISSET(c->wfd, writeset) &&