ph10 2006/10/31 11:14:18 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src ACKNOWLEDGMENTS
exim-src/src expand.c
Log:
Close writing end of socket for ${readsocket before reading.
Revision Changes Path
1.420 +3 -0 exim/exim-doc/doc-txt/ChangeLog
1.62 +2 -1 exim/exim-src/ACKNOWLEDGMENTS
1.67 +8 -0 exim/exim-src/src/expand.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -r1.419 -r1.420
--- ChangeLog 31 Oct 2006 09:50:09 -0000 1.419
+++ ChangeLog 31 Oct 2006 11:14:17 -0000 1.420
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.419 2006/10/31 09:50:09 ph10 Exp $
+$Cambridge: exim/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
-------------------------------------------
@@ -216,6 +216,9 @@
(ii) If, despite (i), such a delivery is accidentally attempted, the
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
Index: ACKNOWLEDGMENTS
===================================================================
RCS file: /home/cvs/exim/exim-src/ACKNOWLEDGMENTS,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- ACKNOWLEDGMENTS 24 Oct 2006 15:01:26 -0000 1.61
+++ ACKNOWLEDGMENTS 31 Oct 2006 11:14:18 -0000 1.62
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.61 2006/10/24 15:01:26 ph10 Exp $
+$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.62 2006/10/31 11:14:18 ph10 Exp $
EXIM ACKNOWLEDGEMENTS
@@ -20,7 +20,7 @@
Philip Hazel
Lists created: 20 November 2002
-Last updated: 24 October 2006
+Last updated: 31 October 2006
THE OLD LIST
@@ -120,6 +120,7 @@
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
Index: expand.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/expand.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- expand.c 30 Oct 2006 14:59:15 -0000 1.66
+++ expand.c 31 Oct 2006 11:14:18 -0000 1.67
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/expand.c,v 1.66 2006/10/30 14:59:15 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/expand.c,v 1.67 2006/10/31 11:14:18 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -3832,6 +3832,14 @@
goto SOCK_FAIL;
}
}
+
+ /* 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. */
