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);
dup2(fd, 0);
close(fd);
execvp(*progspec, progspec);
+ flog(LOG_ERR, "callscgi: %s: %s", *progspec, strerror(errno));
exit(127);
}
}
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);
}
}
+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(SIGINT, sigexit);
+ signal(SIGTERM, sigexit);
mustart(listenloop, 0);
atexit(killcuraddr);
ioloop();