Close writing end of socket for ${readsocket before reading.

3 files changed, 16 insertions, 4 deletions

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 67a455b22..57f603b7b 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.419 2006/10/31 09:50:09 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.420 2006/10/31 11:14:17 ph10 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -217,6 +217,9 @@ PH/30 Exim was sometimes attempting to deliver messages that had suffered
            routing retry time is respected, so at least it doesn't keep
            hammering the server.
 
+PH/31 Installed Andrew Findlay's patch to close the writing end of the socket
+      in ${readsocket because some servers need this prod.
+
 
 Exim version 4.63
 -----------------
diff --git a/src/ACKNOWLEDGMENTS b/src/ACKNOWLEDGMENTS
index 15827ea0c..71f532f63 100644
--- a/src/ACKNOWLEDGMENTS
+++ b/src/ACKNOWLEDGMENTS
@@ -1,4 +1,4 @@
-$Cambridge: exim/src/ACKNOWLEDGMENTS,v 1.61 2006/10/24 15:01:26 ph10 Exp $
+$Cambridge: exim/src/ACKNOWLEDGMENTS,v 1.62 2006/10/31 11:14:18 ph10 Exp $
 
 EXIM ACKNOWLEDGEMENTS
 
@@ -20,7 +20,7 @@ relatively small patches.
 Philip Hazel
 
 Lists created: 20 November 2002
-Last updated:  24 October 2006
+Last updated:  31 October 2006
 
 
 THE OLD LIST
@@ -120,6 +120,7 @@ Jochen Erwied             Fix for BDB 4.1 API
 Stefan Esser              Fix for DNS RR parsing bug
 Peter Evans               Suggested using modification time of "new" for time
                             of "mailbox last read" for maildir
+Andrew Findlay            Patch to close writing end of ${readsocket
 Michael Fischer
   v. Mollard              Suggested patch for exigrep -t option
 Kevin Fleming             Callout cache code
diff --git a/src/src/expand.c b/src/src/expand.c
index 665d3d8f9..4943bcb5c 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/expand.c,v 1.66 2006/10/30 14:59:15 ph10 Exp $ */
+/* $Cambridge: exim/src/src/expand.c,v 1.67 2006/10/31 11:14:18 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -3833,6 +3833,14 @@ while (*s != 0)
             }
           }
 
+        /* Shut down the sending side of the socket. This helps some servers to
+        recognise that it is their turn to do some work. Just in case some
+        system doesn't have this function, make it conditional. */
+
+        #ifdef SHUT_WR
+        shutdown(fd, SHUT_WR);
+        #endif
+
         /* Now we need to read from the socket, under a timeout. The function
         that reads a file can be used. */