1 Taken from http://pkgs.fedoraproject.org/cgit/rpms/fcgi.git/plain/fcgi-2.4.0-poll.patch
4 Author: Anton Kortunov <toshic.toshic@gmail.com>
5 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libfcgi/+bug/933417
6 Description: use poll in os_unix.c instead of select to avoid problem with > 1024 connections
7 Forwarded: yes, fastcgi-developers@mailman.fastcgi.com
9 diff --git a/libfcgi/os_unix.c b/libfcgi/os_unix.c
10 index 73e6a7f..af35aee 100755
11 --- a/libfcgi/os_unix.c
12 +++ b/libfcgi/os_unix.c
13 @@ -42,6 +42,7 @@ static const char rcsid[] = "$Id: os_unix.c,v 1.37 2002/03/05 19:14:49 robs Exp
21 @@ -103,6 +104,9 @@ static int volatile maxFd = -1;
22 static int shutdownPending = FALSE;
23 static int shutdownNow = FALSE;
25 +static int libfcgiOsClosePollTimeout = 2000;
26 +static int libfcgiIsAfUnixKeeperPollTimeout = 2000;
28 void OS_ShutdownPending()
30 shutdownPending = TRUE;
31 @@ -168,6 +172,16 @@ int OS_LibInit(int stdioFds[3])
35 + char *libfcgiOsClosePollTimeoutStr = getenv( "LIBFCGI_OS_CLOSE_POLL_TIMEOUT" );
36 + if(libfcgiOsClosePollTimeoutStr) {
37 + libfcgiOsClosePollTimeout = atoi(libfcgiOsClosePollTimeoutStr);
40 + char *libfcgiIsAfUnixKeeperPollTimeoutStr = getenv( "LIBFCGI_IS_AF_UNIX_KEEPER_POLL_TIMEOUT" );
41 + if(libfcgiIsAfUnixKeeperPollTimeoutStr) {
42 + libfcgiIsAfUnixKeeperPollTimeout = atoi(libfcgiIsAfUnixKeeperPollTimeoutStr);
45 asyncIoTable = (AioInfo *)malloc(asyncIoTableSize * sizeof(AioInfo));
46 if(asyncIoTable == NULL) {
48 @@ -755,19 +769,16 @@ int OS_Close(int fd)
50 if (shutdown(fd, 1) == 0)
60 + pfd.events = POLLIN;
67 - rv = select(fd + 1, &rfds, NULL, NULL, &tv);
68 + rv = poll(&pfd, 1, libfcgiOsClosePollTimeout);
70 while (rv > 0 && read(fd, trash, sizeof(trash)) > 0);
72 @@ -1116,13 +1127,11 @@ static int is_reasonable_accept_errno (const int error)
74 static int is_af_unix_keeper(const int fd)
76 - struct timeval tval = { READABLE_UNIX_FD_DROP_DEAD_TIMEVAL };
80 - FD_SET(fd, &read_fds);
83 + pfd.events = POLLIN;
85 - return select(fd + 1, &read_fds, NULL, NULL, &tval) >= 0 && FD_ISSET(fd, &read_fds);
86 + return poll(&pfd, 1, libfcgiIsAfUnixKeeperPollTimeout) >= 0 && (pfd.revents & POLLIN);