mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 06:48:18 -07:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
81 lines
2.4 KiB
Diff
81 lines
2.4 KiB
Diff
diff -uNr fcgi-2.4.1-SNAP-0910052249.orig/libfcgi/os_unix.c fcgi-2.4.1-SNAP-0910052249/libfcgi/os_unix.c
|
|
--- fcgi-2.4.1-SNAP-0910052249.orig/libfcgi/os_unix.c 2015-02-06 21:49:40.677082591 -0200
|
|
+++ fcgi-2.4.1-SNAP-0910052249/libfcgi/os_unix.c 2015-02-06 21:54:23.147097903 -0200
|
|
@@ -42,6 +42,7 @@
|
|
#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 shutdownPending = FALSE;
|
|
static int shutdownNow = FALSE;
|
|
|
|
+static int libfcgiOsClosePollTimeout = 2000;
|
|
+static int libfcgiIsAfUnixKeeperPollTimeout = 2000;
|
|
+
|
|
void OS_ShutdownPending()
|
|
{
|
|
shutdownPending = TRUE;
|
|
@@ -169,6 +173,16 @@
|
|
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;
|
|
@@ -780,19 +794,16 @@
|
|
{
|
|
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);
|
|
}
|
|
@@ -1142,13 +1153,11 @@
|
|
*/
|
|
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);
|
|
}
|
|
|
|
/*
|