fcgi/repos/extra-x86_64/fcgi-2.4.0-poll.patch

   1 Author: Anton Kortunov <toshic.toshic@gmail.com>
   2 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libfcgi/+bug/933417
   3 Description: use poll in os_unix.c instead of select to avoid problem with > 1024 connections
   4 Forwarded: yes, fastcgi-developers@mailman.fastcgi.com
   5
   6 diff --git a/libfcgi/os_unix.c b/libfcgi/os_unix.c
   7 index 73e6a7f..af35aee 100755
   8 --- a/libfcgi/os_unix.c
   9 +++ b/libfcgi/os_unix.c
  10 @@ -42,6 +42,7 @@ static const char rcsid[] = "$Id: os_unix.c,v 1.37 2002/03/05 19:14:49 robs Exp
  11  #include <sys/time.h>
  12  #include <sys/un.h>
  13  #include <signal.h>
  14 +#include <poll.h>
  15
  16  #ifdef HAVE_NETDB_H
  17  #include <netdb.h>
  18 @@ -103,6 +104,9 @@ static int volatile maxFd = -1;
  19  static int shutdownPending = FALSE;
  20  static int shutdownNow = FALSE;
  21
  22 +static int libfcgiOsClosePollTimeout = 2000;
  23 +static int libfcgiIsAfUnixKeeperPollTimeout = 2000;
  24 +
  25  void OS_ShutdownPending()
  26  {
  27      shutdownPending = TRUE;
  28 @@ -168,6 +172,16 @@ int OS_LibInit(int stdioFds[3])
  29      if(libInitialized)
  30          return 0;
  31
  32 +    char *libfcgiOsClosePollTimeoutStr = getenv( "LIBFCGI_OS_CLOSE_POLL_TIMEOUT" );
  33 +    if(libfcgiOsClosePollTimeoutStr) {
  34 +        libfcgiOsClosePollTimeout = atoi(libfcgiOsClosePollTimeoutStr);
  35 +    }
  36 +
  37 +    char *libfcgiIsAfUnixKeeperPollTimeoutStr = getenv( "LIBFCGI_IS_AF_UNIX_KEEPER_POLL_TIMEOUT" );
  38 +    if(libfcgiIsAfUnixKeeperPollTimeoutStr) {
  39 +        libfcgiIsAfUnixKeeperPollTimeout = atoi(libfcgiIsAfUnixKeeperPollTimeoutStr);
  40 +    }
  41 +
  42      asyncIoTable = (AioInfo *)malloc(asyncIoTableSize * sizeof(AioInfo));
  43      if(asyncIoTable == NULL) {
  44          errno = ENOMEM;
  45 @@ -755,19 +769,16 @@ int OS_Close(int fd)
  46
  47      if (shutdown(fd, 1) == 0)
  48      {
  49 -        struct timeval tv;
  50 -        fd_set rfds;
  51 +        struct pollfd pfd;
  52          int rv;
  53          char trash[1024];
  54
  55 -        FD_ZERO(&rfds);
  56 +        pfd.fd = fd;
  57 +        pfd.events = POLLIN;
  58
  59          do
  60          {
  61 -            FD_SET(fd, &rfds);
  62 -            tv.tv_sec = 2;
  63 -            tv.tv_usec = 0;
  64 -            rv = select(fd + 1, &rfds, NULL, NULL, &tv);
  65 +            rv = poll(&pfd, 1, libfcgiOsClosePollTimeout);
  66          }
  67          while (rv > 0 && read(fd, trash, sizeof(trash)) > 0);
  68      }
  69 @@ -1116,13 +1127,11 @@ static int is_reasonable_accept_errno (const int error)
  70   */
  71  static int is_af_unix_keeper(const int fd)
  72  {
  73 -    struct timeval tval = { READABLE_UNIX_FD_DROP_DEAD_TIMEVAL };
  74 -    fd_set read_fds;
  75 -
  76 -    FD_ZERO(&read_fds);
  77 -    FD_SET(fd, &read_fds);
  78 +    struct pollfd pfd;
  79 +    pfd.fd = fd;
  80 +    pfd.events = POLLIN;
  81
  82 -    return select(fd + 1, &read_fds, NULL, NULL, &tval) >= 0 && FD_ISSET(fd, &read_fds);
  83 +    return poll(&pfd, 1, libfcgiIsAfUnixKeeperPollTimeout) >= 0 && (pfd.revents & POLLIN);
  84  }
  85
  86  /*