From f2f009c95982947f3cd99567a17bbb65120fa741 Mon Sep 17 00:00:00 2001 From: Fredrik Tolf Date: Sun, 5 Jan 2014 12:30:06 +0100 Subject: [PATCH] dirplex, patplex: Emit more helpful error message on EAGAIN from child. --- src/dirplex/dirplex.c | 14 +++++++++++--- src/patplex.c | 10 +++++++++- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/dirplex/dirplex.c b/src/dirplex/dirplex.c index d687957..f6002f3 100644 --- a/src/dirplex/dirplex.c +++ b/src/dirplex/dirplex.c @@ -55,6 +55,14 @@ static void chinit(void *idata) } } +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; @@ -91,7 +99,7 @@ static void handle(struct hthead *req, int fd, char *path, struct pattern *pat) } 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); } } @@ -104,7 +112,7 @@ static void handle404(struct hthead *req, int fd, char *path) 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."); + childerror(req, fd); free(tmp); } @@ -257,7 +265,7 @@ static int checkdir(struct hthead *req, int fd, char *path, char *rest) 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); diff --git a/src/patplex.c b/src/patplex.c index 692d480..d0e2dad 100644 --- a/src/patplex.c +++ b/src/patplex.c @@ -472,6 +472,14 @@ static struct pattern *findmatch(struct config *cf, struct hthead *req, int tryd return(NULL); } +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 serve(struct hthead *req, int fd) { struct pattern *pat; @@ -511,7 +519,7 @@ static void serve(struct hthead *req, int fd) headappheader(req, head->name, head->value); } if(childhandle(ch, req, fd, NULL, NULL)) - simpleerror(fd, 500, "Server Error", "The request handler crashed."); + childerror(req, fd); } static void reloadconf(char *nm) -- 2.11.0