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/ameme/ameme.c src/ameme/ameme.c
index df9249e4f5c..1723503da92 100644
--- src/ameme/ameme.c
+++ src/ameme/ameme.c
@@ -3222,31 +3222,31 @@
else
htmlOut = stdout;
initRandom(); /* This one needs to be after htmlOut set up. */
/* Figure out if we're going to find a pattern in sequences, or just display
* where a pre-computed pattern occurs in sequences. */
isMotifMatcher = cgiVarExists("motifMatcher");
if (isMotifMatcher)
programName = "Motif Matcher";
else
programName = "Improbizer";
/* Print out html header. Make background color brilliant white. */
if (isFromWeb)
- puts("Content-Type:text/html\n");
+ cgiPrintContentType("text/html");
fprintf(htmlOut, "<HEAD>\n%s<TITLE>%s Results</TITLE>\n</HEAD>\n\n", getCspMetaHeader(), programName);
fprintf(htmlOut, "<BODY BGCOLOR='#FFFFFF'>\n\n");
/* Wrap error handling et. around doMiddle. */
if (isFromWeb)
htmEmptyShell(doMiddle, NULL);
else
doMiddle();
//carefulCheckHeap();
/* Write end of html. */
htmEnd(htmlOut);
return 0;
}