Dolda2000 GitWeb
/
ashd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into duplex
[ashd.git]
/
src
/
callscgi.c
diff --git
a/src/callscgi.c
b/src/callscgi.c
index
47bd107
..
2483c49
100644
(file)
--- a/
src/callscgi.c
+++ b/
src/callscgi.c
@@
-111,9
+111,16
@@
static char *mkanonid(void)
return(tmpl);
}
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)
{
static void startlisten(void)
{
- int
i,
fd;
+ int fd;
struct addrinfo *ai, *cai;
char *unpath;
struct sockaddr_un unm;
struct addrinfo *ai, *cai;
char *unpath;
struct sockaddr_un unm;
@@
-191,9
+198,9
@@
static void startlisten(void)
exit(1);
}
if(child == 0) {
exit(1);
}
if(child == 0) {
+ setupchild();
dup2(fd, 0);
dup2(fd, 0);
- for(i = 3; i < FD_SETSIZE; i++)
- close(i);
+ close(fd);
execvp(*progspec, progspec);
flog(LOG_ERR, "callscgi: %s: %s", *progspec, strerror(errno));
_exit(127);
execvp(*progspec, progspec);
flog(LOG_ERR, "callscgi: %s: %s", *progspec, strerror(errno));
_exit(127);
@@
-203,15
+210,14
@@
static void startlisten(void)
static void startnolisten(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) {
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);
if((fd = open("/dev/null", O_RDONLY)) < 0) {
flog(LOG_ERR, "/dev/null: %s", strerror(errno));
_exit(127);
@@
-430,8
+436,8
@@
static void mkcgienv(struct hthead *req, struct charbuf *dst)
pi = sprintf2("/%s", tmp = pi);
free(tmp);
}
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);
bufaddenv(dst, "QUERY_STRING", "%s", qp?qp:"");
free(pi);
free(url);
@@
-515,8
+521,8
@@
static void serve(struct muth *muth, va_list args)
struct hthead *resp;
sfd = reconn();
struct hthead *resp;
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
);
bufinit(head);
mkcgienv(req, &head);
bufinit(head);
mkcgienv(req, &head);
@@
-608,7
+614,7
@@
int main(int argc, char **argv)
signal(SIGINT, sigexit);
signal(SIGTERM, sigexit);
mustart(listenloop, 0);
signal(SIGINT, sigexit);
signal(SIGTERM, sigexit);
mustart(listenloop, 0);
- atexit(killcuraddr);
ioloop();
ioloop();
+ killcuraddr();
return(0);
}
return(0);
}