diff options
Diffstat (limited to 'www/fcgi/files')
-rw-r--r-- | www/fcgi/files/patch-CVE-2012-6687-pool | 79 | ||||
-rw-r--r-- | www/fcgi/files/patch-examples__Makefile.in | 11 | ||||
-rw-r--r-- | www/fcgi/files/patch-include__fcgio.h | 10 |
3 files changed, 0 insertions, 100 deletions
diff --git a/www/fcgi/files/patch-CVE-2012-6687-pool b/www/fcgi/files/patch-CVE-2012-6687-pool deleted file mode 100644 index 381cb7f024ba..000000000000 --- a/www/fcgi/files/patch-CVE-2012-6687-pool +++ /dev/null @@ -1,79 +0,0 @@ ---- libfcgi/os_unix.c.orig 2002-03-05 19:14:49 UTC -+++ libfcgi/os_unix.c -@@ -42,6 +42,7 @@ static const char rcsid[] = "$Id: os_uni - #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 (c - */ - 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/www/fcgi/files/patch-examples__Makefile.in b/www/fcgi/files/patch-examples__Makefile.in deleted file mode 100644 index cbf55472784b..000000000000 --- a/www/fcgi/files/patch-examples__Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- examples/Makefile.in.orig 2003-01-19 17:21:17 UTC -+++ examples/Makefile.in -@@ -125,7 +125,7 @@ threaded_CFLAGS = @PTHREAD_CFLAGS@ - threaded_LDFLAGS = @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ - - echo_cpp_SOURCES = $(INCLUDE_FILES) $(INCLUDEDIR)/fcgio.h echo-cpp.cpp --echo_cpp_LDADD = $(LIBDIR)/libfcgi++.la -+echo_cpp_LDADD = $(LIBDIR)/libfcgi++.la $(LIBFCGI) - subdir = examples - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/fcgi_config.h diff --git a/www/fcgi/files/patch-include__fcgio.h b/www/fcgi/files/patch-include__fcgio.h deleted file mode 100644 index c4588a940e85..000000000000 --- a/www/fcgi/files/patch-include__fcgio.h +++ /dev/null @@ -1,10 +0,0 @@ ---- include/fcgio.h.orig 2002-02-25 13:16:11 UTC -+++ include/fcgio.h -@@ -31,6 +31,7 @@ - #define FCGIO_H - - #include <iostream> -+#include <cstdio> - - #include "fcgiapp.h" - |