aboutsummaryrefslogtreecommitdiffstats
path: root/slowcgi.c
diff options
context:
space:
mode:
authorclaudio2020-05-11 10:40:12 +0000
committerWynn Wolf Arbor2020-05-24 14:08:57 +0200
commit56691b1bbbb8517a01f4abc123d0ebbf34256707 (patch)
treeb6e4243421f1751121e88968535fa2bed15f97e8 /slowcgi.c
parent95e6e630258f4432d63dffb839eea40aa4c57e41 (diff)
downloadslowcgi-56691b1bbbb8517a01f4abc123d0ebbf34256707.tar.gz
Allow specifying -d multiple times. Only print the fcgi header data if debug > 1 (-dd) since it adds a lot of noise to the output. In syslog_debug do not check for the debug variable instead let syslog handle it. Currently syslog_debug() would never print anything since it is only called with debug = 0 (debug > 0 implies the console logger). OK florian@
Diffstat (limited to '')
-rw-r--r--slowcgi.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/slowcgi.c b/slowcgi.c
index bf5d7fc..0b5d62a 100644
--- a/slowcgi.c
+++ b/slowcgi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: slowcgi.c,v 1.56 2020/05/08 07:41:33 claudio Exp $ */
+/* $OpenBSD: slowcgi.c,v 1.57 2020/05/11 10:40:12 claudio Exp $ */
/*
* Copyright (c) 2013 David Gwynne <dlg@openbsd.org>
* Copyright (c) 2013 Florian Obser <florian@openbsd.org>
@@ -317,7 +317,7 @@ main(int argc, char *argv[])
while ((c = getopt(argc, argv, "dp:s:U:u:")) != -1) {
switch (c) {
case 'd':
- debug = 1;
+ debug++;
break;
case 'p':
chrootpath = optarg;
@@ -624,7 +624,7 @@ slowcgi_response(int fd, short events, void *arg)
while ((resp = TAILQ_FIRST(&c->response_head))) {
header = (struct fcgi_record_header*) resp->data;
- if (debug)
+ if (debug > 1)
dump_fcgi_record("resp ", header);
n = write(fd, resp->data + resp->data_pos, resp->data_len);
@@ -861,7 +861,7 @@ parse_record(uint8_t *buf, size_t n, struct request *c)
h = (struct fcgi_record_header*) buf;
- if (debug)
+ if (debug > 1)
dump_fcgi_record("", h);
if (n < sizeof(struct fcgi_record_header) + ntohs(h->content_len)
@@ -1314,9 +1314,6 @@ syslog_debug(const char *fmt, ...)
{
va_list ap;
- if (!debug)
- return;
-
va_start(ap, fmt);
vsyslog(LOG_DEBUG, fmt, ap);
va_end(ap);