#include <errno.h>
#include <ctype.h>
#include <regex.h>
+#include <sys/wait.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
regex_t *pattern;
};
+struct headmod {
+ struct headmod *next;
+ char *name, *value;
+};
+
struct pattern {
struct pattern *next;
+ struct headmod *headers;
char *childnm;
struct rule **rules;
char *restpat;
static void freepattern(struct pattern *pat)
{
struct rule **rule;
+ struct headmod *head;
for(rule = pat->rules; *rule; rule++) {
if((*rule)->header != NULL)
}
free(*rule);
}
+ while((head = pat->headers) != NULL) {
+ pat->headers = head->next;
+ free(head->name);
+ free(head->value);
+ free(head);
+ }
if(pat->childnm != NULL)
free(pat->childnm);
free(pat);
struct pattern *pat;
int sl;
struct rule *rule;
+ struct headmod *head;
regex_t *regex;
int rxfl;
if(pat->restpat != NULL)
free(pat->restpat);
pat->restpat = sstrdup(s->argv[1]);
+ } else if(!strcmp(s->argv[0], "set") || !strcmp(s->argv[0], "xset")) {
+ if(s->argc < 3) {
+ flog(LOG_WARNING, "%s:%i: missing header name or pattern for `%s' directive", s->file, s->lno, s->argv[0]);
+ continue;
+ }
+ omalloc(head);
+ if(!strcmp(s->argv[0], "xset"))
+ head->name = sprintf2("X-Ash-%s", s->argv[1]);
+ else
+ head->name = sstrdup(s->argv[1]);
+ head->value = sstrdup(s->argv[2]);
+ head->next = pat->headers;
+ pat->headers = head;
} else if(!strcmp(s->argv[0], "end") || !strcmp(s->argv[0], "eof")) {
break;
} else {
buffree(buf);
}
-static char *findmatch(struct config *cf, struct hthead *req, int trydefault)
+static struct pattern *findmatch(struct config *cf, struct hthead *req, int trydefault)
{
int i, o;
struct pattern *pat;
}
if(mstr)
freeca(mstr);
- return(pat->childnm);
+ return(pat);
}
if(mstr) {
freeca(mstr);
static void serve(struct hthead *req, int fd)
{
- char *chnm;
+ struct pattern *pat;
+ struct headmod *head;
struct child *ch;
- chnm = NULL;
- if(chnm == NULL)
- chnm = findmatch(lconfig, req, 0);
- if(chnm == NULL)
- chnm = findmatch(lconfig, req, 1);
+ pat = NULL;
+ if(pat == NULL)
+ pat = findmatch(lconfig, req, 0);
+ if(pat == NULL)
+ pat = findmatch(lconfig, req, 1);
if(gconfig != NULL) {
- if(chnm == NULL)
- chnm = findmatch(gconfig, req, 0);
- if(chnm == NULL)
- chnm = findmatch(gconfig, req, 1);
+ if(pat == NULL)
+ pat = findmatch(gconfig, req, 0);
+ if(pat == NULL)
+ pat = findmatch(gconfig, req, 1);
}
- if(chnm == NULL) {
+ if(pat == NULL) {
simpleerror(fd, 404, "Not Found", "The requested resource could not be found on this server.");
return;
}
ch = NULL;
if(ch == NULL)
- ch = getchild(lconfig, chnm);
+ ch = getchild(lconfig, pat->childnm);
if(gconfig != NULL) {
if(ch == NULL)
- ch = getchild(gconfig, chnm);
+ ch = getchild(gconfig, pat->childnm);
}
if(ch == NULL) {
- flog(LOG_ERR, "child %s requested, but was not declared", chnm);
- simpleerror(fd, 500, "Configuration Error", "The server is erroneously configured. Handler %s was requested, but not declared.", chnm);
+ flog(LOG_ERR, "child %s requested, but was not declared", pat->childnm);
+ simpleerror(fd, 500, "Configuration Error", "The server is erroneously configured. Handler %s was requested, but not declared.", pat->childnm);
return;
}
+ for(head = pat->headers; head != NULL; head = head->next) {
+ headrmheader(req, head->name);
+ headappheader(req, head->name, head->value);
+ }
if(childhandle(ch, req, fd, NULL, NULL))
simpleerror(fd, 500, "Server Error", "The request handler crashed.");
}
static void reloadconf(char *nm)
{
struct config *cf;
- struct child *ch1, *ch2;
if((cf = readconfig(nm)) == NULL) {
flog(LOG_WARNING, "could not reload configuration file `%s'", nm);
return;
}
- for(ch1 = cf->children; ch1 != NULL; ch1 = ch1->next) {
- for(ch2 = lconfig->children; ch2 != NULL; ch2 = ch2->next) {
- if(!strcmp(ch1->name, ch2->name)) {
- ch1->fd = ch2->fd;
- ch2->fd = -1;
- break;
- }
- }
- }
+ mergechildren(cf->children, lconfig->children);
freeconfig(lconfig);
lconfig = cf;
}
+static void chldhandler(int sig)
+{
+ pid_t pid;
+
+ do {
+ pid = waitpid(-1, NULL, WNOHANG);
+ } while(pid > 0);
+}
+
static void sighandler(int sig)
{
if(sig == SIGHUP)
flog(LOG_ERR, "could not read `%s'", argv[optind]);
exit(1);
}
- signal(SIGCHLD, SIG_IGN);
+ signal(SIGCHLD, chldhandler);
signal(SIGHUP, sighandler);
+ signal(SIGPIPE, sighandler);
while(1) {
if(reload) {
reloadconf(argv[optind]);