close(i);
execvp(*progspec, progspec);
flog(LOG_ERR, "callfcgi: %s: %s", *progspec, strerror(errno));
- exit(127);
+ _exit(127);
}
close(fd);
}
close(i);
if((fd = open("/dev/null", O_RDONLY)) < 0) {
flog(LOG_ERR, "/dev/null: %s", strerror(errno));
- exit(127);
+ _exit(127);
}
dup2(fd, 0);
close(fd);
execvp(*progspec, progspec);
flog(LOG_ERR, "callfcgi: %s: %s", *progspec, strerror(errno));
- exit(127);
+ _exit(127);
}
}
static void mkcgienv(struct hthead *req, struct charbuf *dst)
{
int i;
- char *url, *qp, *h, *p;
+ char *url, *pi, *tmp, *qp, *h, *p;
bufaddenv(dst, "SERVER_SOFTWARE", "ashd/%s", VERSION);
bufaddenv(dst, "GATEWAY_INTERFACE", "CGI/1.1");
bufaddenv(dst, "SERVER_PROTOCOL", "%s", req->ver);
bufaddenv(dst, "REQUEST_METHOD", "%s", req->method);
bufaddenv(dst, "REQUEST_URI", "%s", req->url);
- bufaddenv(dst, "PATH_INFO", req->rest);
url = sstrdup(req->url);
if((qp = strchr(url, '?')) != NULL)
*(qp++) = 0;
* several alternatives, none seem to be better. */
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);
+ url[strlen(url) - strlen(req->rest)] = 0;
+ }
+ if((pi = unquoteurl(req->rest)) == NULL)
+ pi = sstrdup(req->rest);
+ if(!strcmp(url, "/")) {
+ /* This seems to be normal CGI behavior, but see callcgi.c for
+ * details. */
+ url[0] = 0;
+ pi = sprintf2("/%s", tmp = pi);
+ free(tmp);
}
+ bufaddenv(dst, "PATH_INFO", pi);
+ bufaddenv(dst, "SCRIPT_NAME", url);
bufaddenv(dst, "QUERY_STRING", "%s", qp?qp:"");
+ free(pi);
+ free(url);
if((h = getheader(req, "Host")) != NULL)
bufaddenv(dst, "SERVER_NAME", "%s", h);
if((h = getheader(req, "X-Ash-Server-Port")) != NULL)
bufaddenv(dst, "CONTENT_LENGTH", "%s", h);
else
bufaddenv(dst, "CONTENT_LENGTH", "0");
- if((h = getheader(req, "X-Ash-File")) != NULL)
- bufaddenv(dst, "SCRIPT_FILENAME", "%s", absolutify(h));
+ if((h = getheader(req, "X-Ash-File")) != NULL) {
+ h = absolutify(h);
+ bufaddenv(dst, "SCRIPT_FILENAME", "%s", h);
+ free(h);
+ }
for(i = 0; i < req->noheaders; i++) {
h = sprintf2("HTTP_%s", req->headers[i][0]);
for(p = h; *p; p++) {
static void sigexit(int sig)
{
+ shutdown(0, SHUT_RDWR);
exit(0);
}