dirplex: Strip leading `./' from X-Ash-File.

[ashd.git] / src / dirplex / dirplex.c

diff --git a/src/dirplex/dirplex.c b/src/dirplex/dirplex.c
index d5aabea..8b604d2 100644 (file)
--- a/src/dirplex/dirplex.c
+++ b/src/dirplex/dirplex.c
@@ -61,6 +61,8 @@ static void handle(struct hthead *req, int fd, char *path, struct pattern *pat)
     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);
@@ -70,8 +72,7 @@ static void handle(struct hthead *req, int fd, char *path, struct pattern *pat)
            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)] != '/')) {
@@ -89,12 +90,25 @@ static void handle(struct hthead *req, int fd, char *path, struct pattern *pat)
     }
 }
 
+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);
@@ -185,8 +199,8 @@ static int checkentry(struct hthead *req, int fd, char *path, char *rest, char *
     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)) {
@@ -206,7 +220,7 @@ static int checkentry(struct hthead *req, int fd, char *path, char *rest, char *
            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)) {
@@ -237,7 +251,7 @@ static int checkdir(struct hthead *req, int fd, char *path, char *rest)
        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);
     }
@@ -273,14 +287,15 @@ static int checkpath(struct hthead *req, int fd, char *path, char *rest)
        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);
     
@@ -294,7 +309,7 @@ static void serve(struct hthead *req, int fd)
 {
     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)