static char buf[1024];
static int pending;
+ /* %: does not contain newlines
+ * _: empty (garbage)
+ */
+
+ /* %%%%%%%%%%%__________________ */
+ /* ^ pending */
+
for (;;) {
int avail = sizeof(buf) - pending;
ssize_t got = read(errpipe, buf+pending, avail);
if (got==-1) {
if (errno==EINTR) continue;
- else if (errno==EWOULDBLOCK || errno==EAGAIN) /*ok*/;
+ else if (errno==EWOULDBLOCK || errno==EAGAIN) return;
else diee("(stage2) errpipe read");
got = 0;
} else if (got==0) {
}
syslog(LOG_ERR,"stderr: %.*s", printupto-eaten, buf+eaten);
eaten += eat;
+ scanned = eaten;
}
pending -= eaten;
memmove(buf, buf+eaten, pending);
print REALSTDERR "[$$ real-stderr starting]\n";
while ($request->Accept >= 0) {
+ my $ua = $ENV{HTTP_USER_AGENT} // '<none>';
print <<END;
Content-Type; text/plain
success
count=$count
+$ua
END
- print STDERR "[$$ stderr] serviced $count.\n";
- print REALSTDERR "[$$ real-stderr] serviced $count.\n";
+ print STDERR "[$$ stderr] serviced $count ($ua).\n";
+ print REALSTDERR "[$$ real-stderr] serviced $count ($ua).\n";
$count++;
}
+chiark-utils (4.5.0~iwj3) unstable; urgency=medium
+
+ * cgi-fcgi-interp: Fix logger buffer-handling bugs.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk> Mon, 25 Apr 2016 02:45:44 +0100
+
chiark-utils (4.5.0~iwj2) UNRELEASED; urgency=medium
* cgi-fcgi-interp: mkdir ~/.cgi-fcgi-interp if necessary.