Dolda2000 GitWeb
/
ashd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dirplex, patplex: Emit more helpful error message on EAGAIN from child.
[ashd.git]
/
src
/
dirplex
/
dirplex.c
diff --git
a/src/dirplex/dirplex.c
b/src/dirplex/dirplex.c
index
55b4648
..
f6002f3
100644
(file)
--- 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;
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))
}
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))
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);
}
free(tmp);
}
@@
-244,7
+252,7
@@
static int checkdir(struct hthead *req, int fd, char *path, char *rest)
struct child *ch;
cf = getconfig(path);
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);
cpath = sprintf2("%s/", path);
if((ch = findchild(cpath, cf->capture, &ccf)) == NULL) {
free(cpath);
@@
-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))
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);
return(1);
}
return(0);