[fcgi] Fix crash when too many connections are used

[Till Maas]

commit c0a46589b2bffd22ad3aedc7df1e9cdc4f03994a
Author: Till Maas <opensource at till.name>
Date:   Fri Feb 6 13:20:48 2015 +0100

    Fix crash when too many connections are used
    
    - Make gcc build dependencies obvious for local builds

 fcgi-2.4.0-poll.patch |   86 +++++++++++++++++++++++++++++++++++++++++++++++++
 fcgi.spec             |   10 +++++-
 2 files changed, 95 insertions(+), 1 deletions(-)
---
diff --git a/fcgi-2.4.0-poll.patch b/fcgi-2.4.0-poll.patch
new file mode 100644
index 0000000..d4bc240
--- /dev/null
+++ b/fcgi-2.4.0-poll.patch
@@ -0,0 +1,86 @@
+Author: Anton Kortunov <toshic.toshic at gmail.com>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libfcgi/+bug/933417
+Description: use poll in os_unix.c instead of select to avoid problem with > 1024 connections
+Forwarded: yes, fastcgi-developers at mailman.fastcgi.com
+
+diff --git a/libfcgi/os_unix.c b/libfcgi/os_unix.c
+index 73e6a7f..af35aee 100755
+--- a/libfcgi/os_unix.c
++++ b/libfcgi/os_unix.c
+@@ -42,6 +42,7 @@ static const char rcsid[] = "$Id: os_unix.c,v 1.37 2002/03/05 19:14:49 robs Exp
+ #include <sys/time.h>
+ #include <sys/un.h>
+ #include <signal.h>
++#include <poll.h>
+ 
+ #ifdef HAVE_NETDB_H
+ #include <netdb.h>
+@@ -103,6 +104,9 @@ static int volatile maxFd = -1;
+ static int shutdownPending = FALSE;
+ static int shutdownNow = FALSE;
+ 
++static int libfcgiOsClosePollTimeout = 2000;
++static int libfcgiIsAfUnixKeeperPollTimeout = 2000;
++
+ void OS_ShutdownPending()
+ {
+     shutdownPending = TRUE;
+@@ -168,6 +172,16 @@ int OS_LibInit(int stdioFds[3])
+     if(libInitialized)
+         return 0;
+ 
++    char *libfcgiOsClosePollTimeoutStr = getenv( "LIBFCGI_OS_CLOSE_POLL_TIMEOUT" );
++    if(libfcgiOsClosePollTimeoutStr) {
++        libfcgiOsClosePollTimeout = atoi(libfcgiOsClosePollTimeoutStr);
++    }
++
++    char *libfcgiIsAfUnixKeeperPollTimeoutStr = getenv( "LIBFCGI_IS_AF_UNIX_KEEPER_POLL_TIMEOUT" );
++    if(libfcgiIsAfUnixKeeperPollTimeoutStr) {
++        libfcgiIsAfUnixKeeperPollTimeout = atoi(libfcgiIsAfUnixKeeperPollTimeoutStr);
++    }
++
+     asyncIoTable = (AioInfo *)malloc(asyncIoTableSize * sizeof(AioInfo));
+     if(asyncIoTable == NULL) {
+         errno = ENOMEM;
+@@ -755,19 +769,16 @@ int OS_Close(int fd)
+ 
+     if (shutdown(fd, 1) == 0)
+     {
+-        struct timeval tv;
+-        fd_set rfds;
++        struct pollfd pfd;
+         int rv;
+         char trash[1024];
+ 
+-        FD_ZERO(&rfds);
++        pfd.fd = fd;
++        pfd.events = POLLIN;
+ 
+         do 
+         {
+-            FD_SET(fd, &rfds);
+-            tv.tv_sec = 2;
+-            tv.tv_usec = 0;
+-            rv = select(fd + 1, &rfds, NULL, NULL, &tv);
++            rv = poll(&pfd, 1, libfcgiOsClosePollTimeout);
+         }
+         while (rv > 0 && read(fd, trash, sizeof(trash)) > 0);
+     }
+@@ -1116,13 +1127,11 @@ static int is_reasonable_accept_errno (const int error)
+  */
+ static int is_af_unix_keeper(const int fd)
+ {
+-    struct timeval tval = { READABLE_UNIX_FD_DROP_DEAD_TIMEVAL };
+-    fd_set read_fds;
+-
+-    FD_ZERO(&read_fds);
+-    FD_SET(fd, &read_fds);
++    struct pollfd pfd;
++    pfd.fd = fd;
++    pfd.events = POLLIN;
+ 
+-    return select(fd + 1, &read_fds, NULL, NULL, &tval) >= 0 && FD_ISSET(fd, &read_fds);
++    return poll(&pfd, 1, libfcgiIsAfUnixKeeperPollTimeout) >= 0 && (pfd.revents & POLLIN);
+ }
+ 
+ /*
diff --git a/fcgi.spec b/fcgi.spec
index 1a24bb9..cc3645a 100644
--- a/fcgi.spec
+++ b/fcgi.spec
@@ -2,7 +2,7 @@
 
 Name:           fcgi
 Version:        2.4.0
-Release:        24%{?dist}
+Release:        25%{?dist}
 Summary:        FastCGI development kit
 
 Group:          Development/Languages
@@ -15,6 +15,9 @@ Patch0:         fcgi-2.4.0-autotools.patch
 Patch1:         fcgi-2.4.0-configure.in.patch
 Patch2:         fcgi-2.4.0-Makefile.am-CPPFLAGS.patch
 Patch3:         fcgi-2.4.0-gcc44_fixes.patch
+Patch4:         fcgi-2.4.0-poll.patch
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
 
 %description
 FastCGI is a language independent, scalable, open extension to CGI that
@@ -36,6 +39,7 @@ developing applications that use %{name}.
 %setup -q
 %patch0 -p1
 %patch3 -p1 -b .gcc44_fixes
+%patch4 -p1 -b .poll
 
 # remove DOS End Of Line Encoding
 sed -i 's/\r//' doc/fastcgi-prog-guide/ch2c.htm
@@ -87,6 +91,10 @@ rm -f -- doc/*.3
 
 
 %changelog
+* Fri Feb 06 2015 Till Maas <opensource at till.name> - 2.4.0-25
+- Fix crash when too many connections are used
+- Make gcc build dependencies obvious for local builds
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.0-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild