#include <utils.h>
#include <log.h>
#include <cf.h>
+#include <resp.h>
#include "dirplex.h"
freepattern(pat);
}
freeca(cf->index);
+ if(cf->capture != NULL)
+ free(cf->capture);
free(cf);
}
newrule(pat)->type = PAT_ALL;
} else if(!strcmp(s->argv[0], "default")) {
newrule(pat)->type = PAT_DEFAULT;
+ } else if(!strcmp(s->argv[0], "local")) {
+ newrule(pat)->type = PAT_LOCAL;
} else if(!strcmp(s->argv[0], "handler")) {
if(s->argc < 2) {
flog(LOG_WARNING, "%s:%i: missing child name for `handler' directive", s->file, s->lno);
cf->index = NULL;
if(s->argc > 1)
cf->index = cadup(s->argv + 1);
+ } else if(!strcmp(s->argv[0], "capture")) {
+ if(s->argc < 2) {
+ flog(LOG_WARNING, "%s:%i: missing argument to capture declaration", s->file, s->lno);
+ continue;
+ }
+ if(cf->capture != NULL)
+ free(cf->capture);
+ cf->capture = sstrdup(s->argv[1]);
} else if(!strcmp(s->argv[0], "eof")) {
break;
} else {
return(cf);
}
-static void mergechildren(struct config *dst, struct config *src)
-{
- struct child *ch1, *ch2;
-
- for(ch1 = dst->children; ch1 != NULL; ch1 = ch1->next) {
- for(ch2 = src->children; ch2 != NULL; ch2 = ch2->next) {
- if(!strcmp(ch1->name, ch2->name)) {
- ch1->fd = ch2->fd;
- ch2->fd = -1;
- break;
- }
- }
- }
-}
-
struct config *getconfig(char *path)
{
struct config *cf, *ocf;
mtime = sb.st_mtime;
}
if(ocf != NULL) {
- mergechildren(cf, ocf);
+ mergechildren(cf->children, ocf->children);
freeconfig(ocf);
}
cf->path = sstrdup(path);
struct config **cfs;
struct child *ch;
+ if(cf != NULL)
+ *cf = NULL;
cfs = getconfigs(file);
for(i = 0; cfs[i] != NULL; i++) {
if((ch = getchild(cfs[i], name)) != NULL) {
return(ch);
}
}
+ if(!strcmp(name, ".notfound"))
+ return(notfound);
return(NULL);
}
struct config **cfs;
struct pattern *pat;
struct rule *rule;
+ size_t pl;
if((bn = strrchr(file, '/')) != NULL)
bn++;
} else if(rule->type == PAT_DEFAULT) {
if(!trydefault)
break;
+ } else if(rule->type == PAT_LOCAL) {
+ if(cfs[c]->path == NULL)
+ break;
+ pl = strlen(cfs[c]->path);
+ if(!((strlen(file) > pl) && !strncmp(file, cfs[c]->path, pl) && (file[pl] == '/') && !strchr(file + pl + 1, '/')))
+ break;
}
}
if(!rule)
return(findmatch(file, 1, dir));
return(NULL);
}
+
+static int donotfound(struct child *ch, struct hthead *req, int fd, void (*chinit)(void *), void *idata)
+{
+ simpleerror(fd, 404, "Not Found", "The requested URL has no corresponding resource.");
+ return(0);
+}
+
+static struct chandler i_notfound = {
+ .handle = donotfound,
+};
+
+static struct child s_notfound = {
+ .name = ".notfound",
+ .iface = &i_notfound,
+};
+struct child *notfound = &s_notfound;