[exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim…

Αρχική Σελίδα
Delete this message
Reply to this message
Συντάκτης: Philip Hazel
Ημερομηνία:  
Προς: exim-cvs
Αντικείμενο: [exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim/exim-src ACKNOWLEDGMENTS exim/exim-src/src spam.c
ph10 2006/07/03 16:19:44 BST

  Modified files:
    exim-doc/doc-txt     ChangeLog 
    exim-src             ACKNOWLEDGMENTS 
    exim-src/src         spam.c 
  Log:
  Patch to use select() when poll() not available in spam.c.


  Revision  Changes    Path
  1.366     +3 -0      exim/exim-doc/doc-txt/ChangeLog
  1.50      +2 -2      exim/exim-src/ACKNOWLEDGMENTS
  1.12      +18 -3     exim/exim-src/src/spam.c


  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
  retrieving revision 1.365
  retrieving revision 1.366
  diff -u -r1.365 -r1.366
  --- ChangeLog    30 Jun 2006 15:36:08 -0000    1.365
  +++ ChangeLog    3 Jul 2006 15:19:44 -0000    1.366
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.365 2006/06/30 15:36:08 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.366 2006/07/03 15:19:44 ph10 Exp $


   Change log file for Exim from version 4.21
   -------------------------------------------
  @@ -66,6 +66,9 @@
         person was confused, thinking that -bt output corresponded to deliveries.
         (Suppressing duplicates isn't a good idea as you lose the information
         about possibly different redirections that led to the duplicates.)
  +
  +PH/09 Applied patch from Erik to use select() instead of poll() in spam.c on
  +      systems where poll() doesn't work, in particular OS X.



Exim version 4.62

  Index: ACKNOWLEDGMENTS
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/ACKNOWLEDGMENTS,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- ACKNOWLEDGMENTS    28 Jun 2006 16:00:23 -0000    1.49
  +++ ACKNOWLEDGMENTS    3 Jul 2006 15:19:44 -0000    1.50
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.49 2006/06/28 16:00:23 ph10 Exp $
  +$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.50 2006/07/03 15:19:44 ph10 Exp $


EXIM ACKNOWLEDGEMENTS

@@ -20,7 +20,7 @@
Philip Hazel

Lists created: 20 November 2002
-Last updated: 28 June 2006
+Last updated: 03 July 2006


   THE OLD LIST
  @@ -253,5 +253,5 @@
   Alain Williams            Suggested patch for exicyclog options
   David Woodhouse           SQLite support proof of concept code
                             control=freeze/no_tell basic code
  -
  +Erik ?                    patch to use select() instead of poll() on OS X
   ****


  Index: spam.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/spam.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- spam.c    1 Aug 2005 14:41:25 -0000    1.11
  +++ spam.c    3 Jul 2006 15:19:44 -0000    1.12
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/spam.c,v 1.11 2005/08/01 14:41:25 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/spam.c,v 1.12 2006/07/03 15:19:44 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -42,6 +42,9 @@
     struct sockaddr_un server;
   #ifndef NO_POLL_H
     struct pollfd pollfd;
  +#else                               /* Patch posted by Erik ? for OS X */
  +  struct timeval select_tv;         /* and applied by PH */
  +  fd_set select_fd;
   #endif


     /* stop compiler warning */
  @@ -218,7 +221,8 @@
      * and we poll the desciptor to make sure that we can write without
      * blocking.  Short writes are gracefully handled and if the whole
      * trasaction takes too long it is aborted.
  -   * Note: poll() is not supported in OSX 10.2.
  +   * Note: poll() is not supported in OSX 10.2 and is reported to be
  +   *       broken in more recent versions (up to 10.4).
      */
   #ifndef NO_POLL_H
     pollfd.fd = spamd_sock;
  @@ -232,8 +236,19 @@
   again:
   #ifndef NO_POLL_H
         result = poll(&pollfd, 1, 1000);
  +
  +/* Patch posted by Erik ? for OS X and applied by PH */
  +#else
  +      select_tv.tv_sec = 1;
  +      select_tv.tv_usec = 0;
  +      FD_ZERO(&select_fd);
  +      FD_SET(spamd_sock, &select_fd);
  +      result = select(spamd_sock+1, NULL, &select_fd, NULL, &select_tv);
  +#endif
  +/* End Erik's patch */
  +
         if (result == -1 && errno == EINTR)
  -        continue;
  +        goto again;
         else if (result < 1) {
           if (result == -1)
             log_write(0, LOG_MAIN|LOG_PANIC,
  @@ -248,7 +263,7 @@
           (void)fclose(mbox_file);
           return DEFER;
         }
  -#endif
  +
         wrote = send(spamd_sock,spamd_buffer + offset,read - offset,0);
         if (wrote == -1)
         {