2 files changed, 8 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index e2b23c73..3595719b 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ fetchmail-4.1.0 ()
 * Clean up the Interactive UNIX System V/386 Release 3.2 port.
 * Enable parser to detect and complain about the most common syntax error.
 * More warnings about things that can go wrong with multidrop.
+* Dave Bodenstab's fix for flaky phone lines.
 
 There are 262 people on the fetchmail-friends list.
 
diff --git a/driver.c b/driver.c
index 853f5bfa..04d45414 100644
--- a/driver.c
+++ b/driver.c
@@ -1133,7 +1133,14 @@ flag delimited;		/* does the protocol use a message delimiter? */
     while (delimited || len > 0)
     {
 	if ((linelen = SockRead(sock, buf, sizeof(buf)-1)) == -1)
+	{
+	    if (ctl->mda)
+	    {
+		pclose(sinkfp);
+		signal(SIGCHLD, sigchld);
+	    }
 	    return(PS_SOCKET);
+	}
 	set_timeout(ctl->server.timeout);
 
 	/* write the message size dots */