dirplex: Added a capture option to ignore captures of the root directory.

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

diff --git a/src/dirplex/dirplex.c b/src/dirplex/dirplex.c
index baf24fa..d687957 100644 (file)
--- a/src/dirplex/dirplex.c
+++ b/src/dirplex/dirplex.c
@@ -59,8 +59,15 @@ static void handle(struct hthead *req, int fd, char *path, struct pattern *pat)
 {
     struct child *ch;
     struct config *ccf;
+    struct headmod *head;
     char *twd;
 
+    for(head = pat->headers; head != NULL; head = head->next) {
+       headrmheader(req, head->name);
+       headappheader(req, head->name, head->value);
+    }
+    if(!strncmp(path, "./", 2) && path[2])
+       path += 2;
     if(pat->fchild) {
        headappheader(req, "X-Ash-File", path);
        stdforkserve(pat->fchild, req, fd, NULL, NULL);
@@ -237,7 +244,7 @@ static int checkdir(struct hthead *req, int fd, char *path, char *rest)
     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);
@@ -313,10 +320,12 @@ static void serve(struct hthead *req, int fd)
 static void chldhandler(int sig)
 {
     pid_t pid;
+    int st;
     
-    do {
-       pid = waitpid(-1, NULL, WNOHANG);
-    } while(pid > 0);
+    while((pid = waitpid(-1, &st, WNOHANG)) > 0) {
+       if(WCOREDUMP(st))
+           flog(LOG_WARNING, "child process %i dumped core", pid);
+    }
 }
 
 static void sighandler(int sig)