cb99f0b11bdeee5dfa76064d38b6410da0f4a709
max
Thu Sep 10 00:55:21 2026 -0700
Centralize CGI Content-Type printing in one cgiPrintContentType() helper
Around 90 places across the tree hand-rolled the CGI response header, each
with its own spelling: "Content-Type:" or "Content-type:", \n or \r\n, and
the terminating blank line written as part of the same string, as a separate
puts("\n") (which emits two newlines, so a stray blank line led the body) or
as printf("\r\n\r\n") (two blank lines). A handful forgot the terminator
entirely and relied on a following header to supply it.
cgiPrintContentType() in lib/cheapcgi.c now writes the Content-Type line and
the blank line that ends the header. Header lines are not ordered, so the
callers that also send Status, Set-Cookie, Content-Disposition, Content-Length
or X-Sendfile write those first and call this last to close the header; that
keeps it to a single helper rather than a print-the-line / end-the-header pair
that a caller can half-use. cart.c's existing httpHeaders list already worked
this way.
Only the CGI response path is touched. The dyStringPrintf("Content-type: ...")
calls that build outgoing HTTP *requests* (genomeSpace, oauthLogin, eapMetaSync,
edwWebAuthLogin, ga4ghToBed) are unrelated and left alone.
Also fills out the apiKey error message in botDelay.c to say where to create a
key and that keys are server-specific.
No behavior change on the wire beyond dropping those stray blank lines and
adding the missing newline after Retry-After.
diff --git src/weblet/counter/counter.c src/weblet/counter/counter.c
index f4a05391c38..e48ac8a3550 100644
--- src/weblet/counter/counter.c
+++ src/weblet/counter/counter.c
@@ -1,92 +1,92 @@
/* counter.c - A simple web hit counter. */
#include "common.h"
#include <time.h>
#include "cheapcgi.h"
#include "memgfx.h"
#include "obscure.h"
struct memGfx *makeCountPic(long count, MgFont *font)
{
char text[16];
int textWidth, textHeight;
int pixWidth, pixHeight;
struct memGfx *mg;
sprintf(text, "%ld", count);
textWidth = mgFontStringWidth(font, text);
textHeight = mgFontLineHeight(font);
pixWidth = textWidth + 4;
pixHeight = textHeight + 4;
mg = mgNew(pixWidth, pixHeight);
mgClearPixels(mg);
mgTextCentered(mg, 0, 0, pixWidth, pixHeight, MG_BLACK, font, text);
return mg;
}
long incCount(char *fileName, boolean saveWhence)
/* Increment counter at start of file. Add hit to end of file.
* Return count. */
{
long val = 0;
FILE *f = fopen(fileName, "r+b");
char *ip;
int ipSize;
time_t seconds = time(NULL);
ip = getenv("REMOTE_HOST");
if (ip == NULL || ip[0] == 0)
ip = getenv("REMOTE_ADDR");
if (ip == NULL)
ip = "";
ipSize = strlen(ip) + 1;
if (f != NULL)
{
mustReadOne(f, val);
rewind(f);
}
else
{
f = fopen(fileName, "wb");
}
++val;
if (f != NULL)
{
fwrite(&val, sizeof(val), 1, f);
fseek(f, 0L, SEEK_END);
fwrite(&seconds, sizeof(seconds), 1, f);
fwrite(ip, ipSize, 1, f);
if (saveWhence)
{
char *whence = getenv("HTTP_REFERER");
int whenceSize;
if (whence == NULL)
whence = "";
whenceSize = strlen(whence)+1;
fwrite(whence, whenceSize, 1, f);
}
}
return val;
}
int main(int argc, char *argv[])
{
char *counterFileName;
long count;
struct memGfx *mg;
boolean saveWhence = cgiBoolean("whence");
boolean mute = cgiBoolean("mute");
counterFileName = cgiOptionalString("file");
if (counterFileName == NULL)
counterFileName = "default.ctr";
count = incCount(counterFileName, saveWhence);
if (mute)
mg = mgNew(1, 1);
else
mg = makeCountPic(count, mgMediumFont());
-fprintf(stdout, "Content-type: image/png\n\n");
+cgiPrintContentType("image/png");
mgSaveToPng(stdout, mg, FALSE);
return 0;
}