From fd735432ca61308348e1f1eb1b79a42e357aa0b7 Mon Sep 17 00:00:00 2001
From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Mon, 20 Sep 2010 19:30:48 +0200
Subject: [PATCH] Ignore SIGPIPE (non-inheritably) in dirplex, patplex,
 userplex and callscgi.

---
 src/callscgi.c        | 5 +++++
 src/dirplex/dirplex.c | 5 +++++
 src/patplex.c         | 1 +
 src/userplex.c        | 5 +++++
 4 files changed, 16 insertions(+)

diff --git a/src/callscgi.c b/src/callscgi.c
index 5965b5f..fc51009 100644
--- a/src/callscgi.c
+++ b/src/callscgi.c
@@ -578,6 +578,10 @@ static void listenloop(struct muth *muth, va_list args)
     }
 }
 
+static void sigign(int sig)
+{
+}
+
 static void sigexit(int sig)
 {
     exit(0);
@@ -620,6 +624,7 @@ int main(int argc, char **argv)
 	exit(1);
     }
     signal(SIGCHLD, SIG_IGN);
+    signal(SIGPIPE, sigign);
     signal(SIGINT, sigexit);
     signal(SIGTERM, sigexit);
     mustart(listenloop, 0);
diff --git a/src/dirplex/dirplex.c b/src/dirplex/dirplex.c
index f8ac25a..31920e6 100644
--- a/src/dirplex/dirplex.c
+++ b/src/dirplex/dirplex.c
@@ -296,6 +296,10 @@ static void serve(struct hthead *req, int fd)
 	simpleerror(fd, 404, "Not Found", "The requested URL has no corresponding resource.");
 }
 
+static void sighandler(int sig)
+{
+}
+
 static void usage(FILE *out)
 {
     fprintf(out, "usage: dirplex [-hN] [-c CONFIG] DIR\n");
@@ -356,6 +360,7 @@ int main(int argc, char **argv)
 	exit(1);
     }
     signal(SIGCHLD, SIG_IGN);
+    signal(SIGPIPE, sighandler);
     while(1) {
 	if((fd = recvreq(0, &req)) < 0) {
 	    if(errno != 0)
diff --git a/src/patplex.c b/src/patplex.c
index 04b7a10..8394406 100644
--- a/src/patplex.c
+++ b/src/patplex.c
@@ -513,6 +513,7 @@ int main(int argc, char **argv)
     }
     signal(SIGCHLD, SIG_IGN);
     signal(SIGHUP, sighandler);
+    signal(SIGPIPE, sighandler);
     while(1) {
 	if(reload) {
 	    reloadconf(argv[optind]);
diff --git a/src/userplex.c b/src/userplex.c
index 8493f48..cfd313c 100644
--- a/src/userplex.c
+++ b/src/userplex.c
@@ -230,6 +230,10 @@ out:
     free(usrnm);
 }
 
+static void sighandler(int sig)
+{
+}
+
 static void usage(FILE *out)
 {
     fprintf(out, "usage: userplex [-hI] [-g GROUP] [-m MIN-UID] [-d PUB-DIR] [PROGRAM ARGS...]\n");
@@ -279,6 +283,7 @@ int main(int argc, char **argv)
 	childspec = csbuf.b;
     }
     signal(SIGCHLD, SIG_IGN);
+    signal(SIGPIPE, sighandler);
     while(1) {
 	if((fd = recvreq(0, &req)) < 0) {
 	    if(errno != 0)
-- 
2.11.0