}
}
+static void childerror(struct hthead *req, int fd)
+{
+ if(errno == EAGAIN)
+ simpleerror(fd, 500, "Server Error", "The request handler is overloaded.");
+ else
+ simpleerror(fd, 500, "Server Error", "The request handler crashed.");
+}
+
static void handle(struct hthead *req, int fd, char *path, struct pattern *pat)
{
struct child *ch;
}
headappheader(req, "X-Ash-File", path);
if(childhandle(ch, req, fd, chinit, twd))
- simpleerror(fd, 500, "Server Error", "The request handler crashed.");
+ childerror(req, fd);
}
}
{
struct child *ch;
struct config *ccf;
- char *tmp;
+ struct pattern *pat;
- 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);
+ char tmp[strlen(path) + 1];
+ strcpy(tmp, path);
+ if((pat = findmatch(tmp, 0, PT_NOTFOUND)) != NULL) {
+ handle(req, fd, tmp, pat);
+ } else {
+ ch = findchild(tmp, ".notfound", &ccf);
+ if(childhandle(ch, req, fd, chinit, ccf?ccf->path:NULL))
+ childerror(req, fd);
+ }
}
static void handlefile(struct hthead *req, int fd, char *path)
{
struct pattern *pat;
- if((pat = findmatch(path, 0, 0)) == NULL) {
+ if((pat = findmatch(path, 0, PT_FILE)) == NULL) {
handle404(req, fd, path);
return;
}
break;
}
}
- if((pat = findmatch(cpath, 0, 1)) != NULL) {
+ if((pat = findmatch(cpath, 0, PT_DIR)) != NULL) {
handle(req, fd, cpath, pat);
goto out;
}
free(cpath);
}
-static int checkpath(struct hthead *req, int fd, char *path, char *rest);
+static int checkpath(struct hthead *req, int fd, char *path, char *rest, int final);
-static int checkentry(struct hthead *req, int fd, char *path, char *rest, char *el)
+static int checkentry(struct hthead *req, int fd, char *path, char *rest, char *el, int final)
{
struct stat sb;
char *newpath;
int rv;
- if(*el == '.') {
- handle404(req, fd, sprintf3("%s/", path));
- return(1);
- }
+ if(*el == '.')
+ return(0);
if(!stat(sprintf3("%s/%s", path, el), &sb)) {
if(S_ISDIR(sb.st_mode)) {
if(!*rest) {
return(1);
}
newpath = sprintf2("%s/%s", path, el);
- rv = checkpath(req, fd, newpath, rest + 1);
+ rv = checkpath(req, fd, newpath, rest + 1, final);
free(newpath);
return(rv);
} else if(S_ISREG(sb.st_mode)) {
struct child *ch;
cf = getconfig(path);
- if(cf->capture != NULL) {
+ if((cf->capture != NULL) && (cf->caproot || !cf->path || strcmp(cf->path, "."))) {
cpath = sprintf2("%s/", path);
if((ch = findchild(cpath, cf->capture, &ccf)) == NULL) {
free(cpath);
rest++;
replrest(req, rest);
if(childhandle(ch, req, fd, chinit, ccf?ccf->path:NULL))
- simpleerror(fd, 500, "Server Error", "The request handler crashed.");
+ childerror(req, fd);
return(1);
}
return(0);
}
-static int checkpath(struct hthead *req, int fd, char *path, char *rest)
+static int checkpath(struct hthead *req, int fd, char *path, char *rest, int final)
{
char *p, *el;
int rv;
goto out;
}
if(strchr(el, '/') || (!*el && *rest)) {
- handle404(req, fd, sprintf3("%s/", path));
- rv = 1;
+ rv = 0;
goto out;
}
if(!*el) {
rv = 1;
goto out;
}
- rv = checkentry(req, fd, path, rest, el);
+ rv = checkentry(req, fd, path, rest, el, final);
out:
+ if(final && !rv) {
+ handle404(req, fd, sprintf3("%s/", path));
+ rv = 1;
+ }
if(el != NULL)
free(el);
return(rv);
static void serve(struct hthead *req, int fd)
{
now = time(NULL);
- if(!checkpath(req, fd, ".", req->rest))
- handle404(req, fd, ".");
+ checkpath(req, fd, ".", req->rest, 1);
}
static void chldhandler(int sig)