The code that tries to read an error from the socket in an abnormal-

exit situation was properly forcing the io_timeout value down to 30
seconds, but failing to set the select_timeout value.

1 files changed, 1 insertions, 1 deletions

diff --git a/io.c b/io.c
index 5d5b030c..62880fba 100644
--- a/io.c
+++ b/io.c
@@ -916,7 +916,7 @@ static void writefd_unbuffered(int fd,char *buf,size_t len)
 			/* If the other side is sending us error messages, try
 			 * to grab any messages they sent before they died. */
 			while (fd == sock_f_out && io_multiplexing_in) {
-				io_timeout = 30;
+				io_timeout = select_timeout = 30;
 				readfd_unbuffered(sock_f_in, io_filesfrom_buf,
 						  sizeof io_filesfrom_buf);
 			}