#include <sys/un.h>
#include <netinet/in.h>
#include <netdb.h>
-#include <sys/signal.h>
+#include <signal.h>
#include <errno.h>
#ifdef HAVE_CONFIG_H
#endif
#include <utils.h>
#include <req.h>
+#include <resp.h>
#include <log.h>
#include <mt.h>
#include <mtio.h>
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;
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, "callscgi: %s: %s", *progspec, strerror(errno));
_exit(127);
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);
static void mkcgienv(struct hthead *req, struct charbuf *dst)
{
int i;
- char *url, *unq, *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);
- if((unq = unquoteurl(req->rest)) != NULL) {
- bufaddenv(dst, "PATH_INFO", unq);
- free(unq);
- } else {
- 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", "%s", pi);
+ bufaddenv(dst, "SCRIPT_NAME", "%s", 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-Address")) != NULL)
+ bufaddenv(dst, "SERVER_ADDR", "%s", h);
if((h = getheader(req, "X-Ash-Server-Port")) != NULL)
bufaddenv(dst, "SERVER_PORT", "%s", h);
if((h = getheader(req, "X-Ash-Remote-User")) != NULL)
bufaddenv(dst, "HTTPS", "on");
if((h = getheader(req, "X-Ash-Address")) != NULL)
bufaddenv(dst, "REMOTE_ADDR", "%s", h);
+ if((h = getheader(req, "X-Ash-Port")) != NULL)
+ bufaddenv(dst, "REMOTE_PORT", "%s", h);
if((h = getheader(req, "Content-Type")) != NULL)
bufaddenv(dst, "CONTENT_TYPE", "%s", h);
if((h = getheader(req, "Content-Length")) != 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 char *defstatus(int code)
-{
- if(code == 200)
- return("OK");
- else if(code == 201)
- return("Created");
- else if(code == 202)
- return("Accepted");
- else if(code == 204)
- return("No Content");
- else if(code == 300)
- return("Multiple Choices");
- else if(code == 301)
- return("Moved Permanently");
- else if(code == 302)
- return("Found");
- else if(code == 303)
- return("See Other");
- else if(code == 304)
- return("Not Modified");
- else if(code == 307)
- return("Moved Temporarily");
- else if(code == 400)
- return("Bad Request");
- else if(code == 401)
- return("Unauthorized");
- else if(code == 403)
- return("Forbidden");
- else if(code == 404)
- return("Not Found");
- else if(code == 500)
- return("Internal Server Error");
- else if(code == 501)
- return("Not Implemented");
- else if(code == 503)
- return("Service Unavailable");
- else
- return("Unknown status");
-}
-
static struct hthead *parseresp(FILE *in)
{
struct hthead *resp;
resp->msg = sstrdup(p);
} else {
resp->code = atoi(st);
- resp->msg = sstrdup(defstatus(resp->code));
+ resp->msg = sstrdup(httpdefstatus(resp->code));
}
headrmheader(resp, "Status");
} else if(getheader(resp, "Location")) {
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);
static void sigexit(int sig)
{
- exit(0);
+ shutdown(0, SHUT_RDWR);
}
static void usage(FILE *out)
signal(SIGINT, sigexit);
signal(SIGTERM, sigexit);
mustart(listenloop, 0);
- atexit(killcuraddr);
ioloop();
+ killcuraddr();
return(0);
}