summaryrefslogtreecommitdiffabout
path: root/src/ctl.c
authorSergey Poznyakoff <gray@gnu.org>2016-01-03 13:20:09 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2016-01-03 13:20:09 (GMT)
commit85f2fd8d2772506911e95c3e4a0cb2538594b274 (patch) (side-by-side diff)
treed486caebbec25a05024fcd9bfbf99efa6832c2a2 /src/ctl.c
parent6db017a32e379bb2eb7878771dea969f77c3168c (diff)
downloadpies-85f2fd8d2772506911e95c3e4a0cb2538594b274.tar.gz
pies-85f2fd8d2772506911e95c3e4a0cb2538594b274.tar.bz2
Minor changes
* configure.ac: Version 1.2.92 * src/ctl.c (ctlio_finalize_reply): Don't close connection on errors. * src/pies.h (PIES_PRINTFLIKE): New macro. (logmsg, logmsg_printf): Mark as printflike.
Diffstat (limited to 'src/ctl.c') (more/less context) (ignore whitespace changes)
-rw-r--r--src/ctl.c22
1 files changed, 7 insertions, 15 deletions
diff --git a/src/ctl.c b/src/ctl.c
index 4f56923..f7e46d0 100644
--- a/src/ctl.c
+++ b/src/ctl.c
@@ -655,22 +655,14 @@ ctlio_finalize_reply (struct ctlio *io)
char const *val;
struct ctlbuf tmpbuf;
- if (io->state & (CTL_INITIAL_STATE|CTL_AUTHENTICATED_STATE))
+ val = http_get_header (io->input.headers, "connection");
+ if (val)
{
- if (io->code / 100 == 2 || io->code == 401)
- {
- val = http_get_header (io->input.headers, "connection");
- if (val)
- {
- if (strcasecmp (val, "keep-alive") == 0)
- /* nothing */;
- else if (strcasecmp (val, "close") == 0)
- io->state = CTL_END_STATE;
- //FIXME: else?
- }
- }
- else
+ if (strcasecmp (val, "keep-alive") == 0)
+ /* nothing */;
+ else if (strcasecmp (val, "close") == 0)
io->state = CTL_END_STATE;
+ //FIXME: else?
}
if (io->state == CTL_END_STATE || io->state == CTL_ACTION_STATE)
@@ -1184,7 +1176,7 @@ ctl_open ()
if (listen (fd, 8))
{
logmsg (LOG_CRIT, "can't listen on control socket %s: %s",
- strerror (errno));
+ control.url->string, strerror (errno));
exit (EX_UNAVAILABLE);
}

Return to:

Send suggestions and report system problems to the System administrator.