The unified diff between revisions [8778af05..] and [1dfbc5ef..] is displayed below. It can also be downloaded as a raw diff.

#
#
# patch "common-channel.c"
#  from [6f44bbe2729e12dd2854d0bd00a965981774fe05]
#    to [0e59b0fa1496989cb45aff3a6ae4fa93c9616c91]
#
============================================================
--- common-channel.c	6f44bbe2729e12dd2854d0bd00a965981774fe05
+++ common-channel.c	0e59b0fa1496989cb45aff3a6ae4fa93c9616c91
@@ -186,6 +186,29 @@ struct Channel* getchannel() {
 	return getchannel_msg(NULL);
 }

+/* In order to tell if a writefd is closed, we put it in the readfd FD_SET.
+   We then just try reading a single byte from it. It'll give EAGAIN or something
+   if the socket is still alive (but the FD probably shouldn't be set anyway?)*/
+static void check_closed_writefd(struct Channel* channel, int fd) {
+	char c;
+	int ret;
+	TRACE(("enter check_closed_writefd fd %d", fd))
+	if (fd < 0)	{
+		TRACE(("leave check_closed_writefd."))
+		return;
+	}
+
+	/* Read something. doing read(fd,x,0) seems to become a NOP on some platforms */
+	ret = read(fd, &c, 1);
+	TRACE(("ret %d errno %d", ret, errno))
+	if (ret > 0 || (ret < 0 && (errno == EINTR || errno == EAGAIN)))	{
+		TRACE(("leave check_closed_writefd"))
+		return;
+	}
+	close_chan_fd(channel, fd, SHUT_WR);
+	TRACE(("leave check_closed_writefd after closing %d", fd))
+}
+
 /* Iterate through the channels, performing IO if available */
 void channelio(fd_set *readfds, fd_set *writefds) {

@@ -229,6 +252,16 @@ void channelio(fd_set *readfds, fd_set *
 			writechannel(channel, channel->errfd, channel->extrabuf);
 		}

+		/* Check writefds for close, even if we don't have anything
+		   to write into them. */
+		if (channel->writefd >= 0) {
+			check_closed_writefd(channel, channel->writefd);
+		}
+		if (ERRFD_IS_WRITE(channel) && channel->errfd >= 0) {
+			check_closed_writefd(channel, channel->errfd);
+		}
+
+
 		/* handle any channel closing etc */
 		check_close(channel);

@@ -439,6 +472,16 @@ void setchannelfds(fd_set *readfds, fd_s
 				FD_SET(channel->errfd, writefds);
 		}

+		/* We also set the writefds for reading, so that we will be notified of close */
+		if (channel->writefd >= 0) {
+			FD_SET(channel->writefd, readfds);
+		}
+		if (ERRFD_IS_WRITE(channel) && channel->errfd >= 0) {
+			FD_SET(channel->errfd, readfds);
+		}
+
+
+
 	} /* foreach channel */

 #ifdef USING_LISTENERS