return(tmpl);
}
+static void setupchild(void)
+{
+ /* PHP appears to not expect to inherit SIGCHLD set to SIG_IGN, so
+ * reset it for it. */
+ signal(SIGCHLD, SIG_DFL);
+}
+
static void startlisten(void)
{
- int i, fd;
+ int fd;
struct addrinfo *ai, *cai;
char *unpath;
struct sockaddr_un unm;
exit(1);
}
if(child == 0) {
+ setupchild();
dup2(fd, 0);
- for(i = 3; i < FD_SETSIZE; i++)
- close(i);
+ close(fd);
execvp(*progspec, progspec);
flog(LOG_ERR, "callfcgi: %s: %s", *progspec, strerror(errno));
_exit(127);
static void startnolisten(void)
{
- int i, fd;
+ int fd;
if((child = fork()) < 0) {
flog(LOG_ERR, "could not fork: %s", strerror(errno));
exit(1);
}
if(child == 0) {
- for(i = 3; i < FD_SETSIZE; i++)
- close(i);
+ setupchild();
if((fd = open("/dev/null", O_RDONLY)) < 0) {
flog(LOG_ERR, "/dev/null: %s", strerror(errno));
_exit(127);
pi = sprintf2("/%s", tmp = pi);
free(tmp);
}
- bufaddenv(dst, "PATH_INFO", pi);
- bufaddenv(dst, "SCRIPT_NAME", url);
+ bufaddenv(dst, "PATH_INFO", "%s", pi);
+ bufaddenv(dst, "SCRIPT_NAME", "%s", url);
bufaddenv(dst, "QUERY_STRING", "%s", qp?qp:"");
free(pi);
free(url);
char buf[8192];
sfd = reconn();
- is = mtstdopen(fd, 1, 60, "r+");
- os = mtstdopen(sfd, 1, 600, "r+");
+ is = mtstdopen(fd, 1, 60, "r+", NULL);
+ os = mtstdopen(sfd, 1, 600, "r+", NULL);
outi = NULL;
mtiopipe(&outi, &outo); mtiopipe(&erri, &erro);
- mustart(outplex, mtstdopen(dup(sfd), 1, 600, "r+"), outo, FCGI_STDOUT, erro, FCGI_STDERR, NULL);
+ mustart(outplex, mtstdopen(dup(sfd), 1, 600, "r+", NULL), outo, FCGI_STDOUT, erro, FCGI_STDERR, NULL);
mustart(errhandler, erri);
if(begreq(os, 1))