#include <ctype.h>
#include <dirent.h>
#include <time.h>
+#include <sys/wait.h>
#include <sys/signal.h>
#ifdef HAVE_CONFIG_H
struct config *ccf;
char *twd;
+ if(!strncmp(path, "./", 2))
+ path += 2;
if(pat->fchild) {
headappheader(req, "X-Ash-File", path);
stdforkserve(pat->fchild, req, fd, NULL, NULL);
simpleerror(fd, 500, "Configuration Error", "The server is erroneously configured. Handler %s was requested, but not declared.", pat->childnm);
return;
}
- twd = NULL;
- if((twd = ccf->path) != NULL) {
+ if((twd = ccf?ccf->path:NULL) != NULL) {
if(!strcmp(twd, ".")) {
twd = NULL;
} else if(strncmp(path, twd, strlen(twd)) || (path[strlen(twd)] != '/')) {
}
}
+static void handle404(struct hthead *req, int fd, char *path)
+{
+ struct child *ch;
+ struct config *ccf;
+ char *tmp;
+
+ tmp = sstrdup(path);
+ ch = findchild(tmp, ".notfound", &ccf);
+ if(childhandle(ch, req, fd, chinit, ccf?ccf->path:NULL))
+ simpleerror(fd, 500, "Server Error", "The request handler crashed.");
+ free(tmp);
+}
+
static void handlefile(struct hthead *req, int fd, char *path)
{
struct pattern *pat;
if((pat = findmatch(path, 0, 0)) == NULL) {
- simpleerror(fd, 404, "Not Found", "The requested URL has no corresponding resource.");
+ handle404(req, fd, path);
return;
}
handle(req, fd, path, pat);
char *newpath;
int rv;
- if(!el == '.') {
- simpleerror(fd, 404, "Not Found", "The requested URL has no corresponding resource.");
+ if(*el == '.') {
+ handle404(req, fd, sprintf3("%s/", path));
return(1);
}
if(!stat(sprintf3("%s/%s", path, el), &sb)) {
free(newpath);
return(1);
}
- simpleerror(fd, 404, "Not Found", "The requested URL has no corresponding resource.");
+ handle404(req, fd, sprintf3("%s/", path));
return(1);
}
if(!strchr(el, '.') && ((newpath = findfile(path, el, NULL)) != NULL)) {
if(*rest == '/')
rest++;
replrest(req, rest);
- if(childhandle(ch, req, fd, chinit, ccf->path))
+ if(childhandle(ch, req, fd, chinit, ccf?ccf->path:NULL))
simpleerror(fd, 500, "Server Error", "The request handler crashed.");
return(1);
}
goto out;
}
if(strchr(el, '/') || (!*el && *rest)) {
- simpleerror(fd, 404, "Not Found", "The requested URL has no corresponding resource.");
+ handle404(req, fd, sprintf3("%s/", path));
rv = 1;
goto out;
}
if(!*el) {
replrest(req, rest);
handledir(req, fd, path);
- return(1);
+ rv = 1;
+ goto out;
}
rv = checkentry(req, fd, path, rest, el);
{
now = time(NULL);
if(!checkpath(req, fd, ".", req->rest))
- simpleerror(fd, 404, "Not Found", "The requested URL has no corresponding resource.");
+ handle404(req, fd, ".");
+}
+
+static void chldhandler(int sig)
+{
+ pid_t pid;
+
+ do {
+ pid = waitpid(-1, NULL, WNOHANG);
+ } while(pid > 0);
+}
+
+static void sighandler(int sig)
+{
}
static void usage(FILE *out)
flog(LOG_ERR, "could not change directory to %s: %s", argv[optind], strerror(errno));
exit(1);
}
- signal(SIGCHLD, SIG_IGN);
+ signal(SIGCHLD, chldhandler);
+ signal(SIGPIPE, sighandler);
while(1) {
if((fd = recvreq(0, &req)) < 0) {
if(errno != 0)