home = getenv("HOME");
if(home && !access(sprintf3("%s/.ashd/sockets/", home), X_OK))
- tmpl = sprintf2("%s/.ashd/sockets/scgi-a-XXXXXX");
+ tmpl = sprintf2("%s/.ashd/sockets/scgi-a-XXXXXX", home);
else
tmpl = sprintf2("/tmp/scgi-a-%i-XXXXXX", getuid());
if((fd = mkstemp(tmpl)) < 0) {
flog(LOG_ERR, "could not create anonymous socket `%s': %s", tmpl, strerror(errno));
exit(1);
}
+ close(fd);
unlink(tmpl);
return(tmpl);
}
for(i = 3; i < FD_SETSIZE; i++)
close(i);
execvp(*progspec, progspec);
+ flog(LOG_ERR, "callscgi: %s: %s", *progspec, strerror(errno));
exit(127);
}
close(fd);
static void startnolisten(void)
{
- int i;
+ int i, fd;
if((child = fork()) < 0) {
flog(LOG_ERR, "could not fork: %s", strerror(errno));
if(child == 0) {
for(i = 3; i < FD_SETSIZE; i++)
close(i);
+ if((fd = open("/dev/null", O_RDONLY)) < 0) {
+ flog(LOG_ERR, "/dev/null: %s", strerror(errno));
+ exit(127);
+ }
+ dup2(fd, 0);
+ close(fd);
execvp(*progspec, progspec);
+ flog(LOG_ERR, "callscgi: %s: %s", *progspec, strerror(errno));
exit(127);
}
}
}
break;
}
- if(tries++ < nolisten) {
- sleep(1);
- goto retry;
- }
if(fd < 0) {
+ if(tries++ < nolisten) {
+ sleep(1);
+ goto retry;
+ }
flog(LOG_ERR, "could not connect to specified TCP address: %s", strerror(errno));
exit(1);
}
bufaddenv(dst, "SERVER_PROTOCOL", "%s", req->ver);
bufaddenv(dst, "REQUEST_METHOD", "%s", req->method);
bufaddenv(dst, "REQUEST_URI", "%s", req->url);
- if(*req->rest)
- bufaddenv(dst, "PATH_INFO", "/%s", req->rest);
- else
- bufaddenv(dst, "PATH_INFO", "");
+ bufaddenv(dst, "PATH_INFO", req->rest);
url = sstrdup(req->url);
if((qp = strchr(url, '?')) != NULL)
*(qp++) = 0;
/* XXX: This is an ugly hack (I think), but though I can think of
* several alternatives, none seem to be better. */
- if(*req->rest && (strlen(url) > strlen(req->rest)) &&
- !strcmp(req->rest, url + strlen(url) - strlen(req->rest)) &&
- (url[strlen(url) - strlen(req->rest) - 1] == '/')) {
- bufaddenv(dst, "SCRIPT_NAME", "%.*s", (int)(strlen(url) - strlen(req->rest) - 1), url);
+ if(*req->rest && (strlen(url) >= strlen(req->rest)) &&
+ !strcmp(req->rest, url + strlen(url) - strlen(req->rest))) {
+ bufaddenv(dst, "SCRIPT_NAME", "%.*s", (int)(strlen(url) - strlen(req->rest)), url);
} else {
bufaddenv(dst, "SCRIPT_NAME", "%s", url);
}
bufaddenv(dst, "SERVER_NAME", "%s", h);
if((h = getheader(req, "X-Ash-Server-Port")) != NULL)
bufaddenv(dst, "SERVER_PORT", "%s", h);
- if(((h = getheader(req, "X-Ash-Server-Protocol")) != NULL) && !strcmp(h, "https"))
+ if(((h = getheader(req, "X-Ash-Protocol")) != NULL) && !strcmp(h, "https"))
bufaddenv(dst, "HTTPS", "on");
if((h = getheader(req, "X-Ash-Address")) != NULL)
bufaddenv(dst, "REMOTE_ADDR", "%s", h);
if((h = getheader(req, "X-Ash-File")) != NULL)
bufaddenv(dst, "SCRIPT_FILENAME", "%s", absolutify(h));
for(i = 0; i < req->noheaders; i++) {
- h = sstrdup(req->headers[i][0]);
+ h = sprintf2("HTTP_%s", req->headers[i][0]);
for(p = h; *p; p++) {
if(isalnum(*p))
*p = toupper(*p);
}
}
+static void sigign(int sig)
+{
+}
+
+static void sigexit(int sig)
+{
+ exit(0);
+}
+
static void usage(FILE *out)
{
fprintf(out, "usage: servescgi [-h] [-N RETRIES] [-i ID] [-u UNIX-PATH] [-t [HOST:]TCP-PORT] [PROGRAM [ARGS...]]\n");
exit(1);
}
signal(SIGCHLD, SIG_IGN);
+ signal(SIGPIPE, sigign);
+ signal(SIGINT, sigexit);
+ signal(SIGTERM, sigexit);
mustart(listenloop, 0);
atexit(killcuraddr);
ioloop();