X-Git-Url: http://www.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fcallfcgi.c;h=6b04c20332b76d44a75964a624c76c2f13284ebb;hb=a80c8f02a49faab0b773c015fd90ba35bff1fad8;hp=2b3717e33f9e064d99481940d32a41379cb5c467;hpb=5de3363121322e0f307885499786ecdb451a8ec1;p=ashd.git

diff --git a/src/callfcgi.c b/src/callfcgi.c
index 2b3717e..6b04c20 100644
--- a/src/callfcgi.c
+++ b/src/callfcgi.c
@@ -124,9 +124,16 @@ static char *mkanonid(void)
     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;
@@ -204,9 +211,9 @@ static void startlisten(void)
 	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);
@@ -216,15 +223,14 @@ static void startlisten(void)
 
 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);
@@ -467,8 +473,8 @@ static void mkcgienv(struct hthead *req, struct charbuf *dst)
 	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);
@@ -758,7 +764,6 @@ static void sigign(int sig)
 static void sigexit(int sig)
 {
     shutdown(0, SHUT_RDWR);
-    exit(0);
 }
 
 static void usage(FILE *out)
@@ -802,7 +807,7 @@ int main(int argc, char **argv)
     signal(SIGINT, sigexit);
     signal(SIGTERM, sigexit);
     mustart(listenloop, 0);
-    atexit(killcuraddr);
     ioloop();
+    killcuraddr();
     return(0);
 }