Dolda2000 GitWeb
/
ashd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
python: Improved error handling and logging in ashd-wsgi.
[ashd.git]
/
src
/
dirplex
/
dirplex.c
diff --git
a/src/dirplex/dirplex.c
b/src/dirplex/dirplex.c
index
14320ad
..
d687957
100644
(file)
--- a/
src/dirplex/dirplex.c
+++ b/
src/dirplex/dirplex.c
@@
-244,7
+244,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);
@@
-320,10
+320,12
@@
static void serve(struct hthead *req, int fd)
static void chldhandler(int sig)
{
pid_t pid;
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)
}
static void sighandler(int sig)