aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorclaudio2021-04-20 07:32:19 +0000
committerWolfgang Müller2021-05-27 15:23:31 +0200
commit5252ff504a3e153c7b5bf93ee845ec92b1dd7e0c (patch)
treed8a1762bc27fbc892f4ff926d0dce15c52d03cf7
parent36b2b748e9e23ef76dd21ef64c6611b95407ce7d (diff)
downloadslowcgi-5252ff504a3e153c7b5bf93ee845ec92b1dd7e0c.tar.gz
Ignore SIGPIPE by default and restore default behaviour before executing the CGI. OK bluhm@ florian@
-rw-r--r--slowcgi.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/slowcgi.c b/slowcgi.c
index 03dadaa..391d882 100644
--- a/slowcgi.c
+++ b/slowcgi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: slowcgi.c,v 1.58 2021/01/08 22:05:34 millert Exp $ */
+/* $OpenBSD: slowcgi.c,v 1.59 2021/04/20 07:32:19 claudio Exp $ */
/*
* Copyright (c) 2013 David Gwynne <dlg@openbsd.org>
* Copyright (c) 2013 Florian Obser <florian@openbsd.org>
@@ -165,7 +165,6 @@ SLIST_HEAD(requests_head, requests);
struct slowcgi_proc {
struct requests_head requests;
struct event ev_sigchld;
- struct event ev_sigpipe;
};
struct fcgi_begin_request_body {
@@ -393,11 +392,9 @@ main(int argc, char *argv[])
signal_set(&slowcgi_proc.ev_sigchld, SIGCHLD, slowcgi_sig_handler,
&slowcgi_proc);
- signal_set(&slowcgi_proc.ev_sigpipe, SIGPIPE, slowcgi_sig_handler,
- &slowcgi_proc);
+ signal(SIGPIPE, SIG_IGN);
signal_add(&slowcgi_proc.ev_sigchld, NULL);
- signal_add(&slowcgi_proc.ev_sigpipe, NULL);
event_dispatch();
return (0);
@@ -580,9 +577,6 @@ slowcgi_sig_handler(int sig, short event, void *arg)
if (pid == -1 && errno != ECHILD)
lwarn("waitpid");
break;
- case SIGPIPE:
- /* ignore */
- break;
default:
lerr(1, "unexpected signal: %d", sig);
break;
@@ -961,6 +955,8 @@ exec_cgi(struct request *c)
close(s_out[1]);
close(s_err[1]);
+ signal(SIGPIPE, SIG_DFL);
+
path = strrchr(c->script_name, '/');
if (path != NULL) {
if (path != c->script_name) {