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/hg/hgText/hgWigText.c src/hg/hgText/hgWigText.c
index bc6eff46e86..f7628c65632 100644
--- src/hg/hgText/hgWigText.c
+++ src/hg/hgText/hgWigText.c
@@ -565,31 +565,31 @@
maxLinesOut = sqlUnsigned(setting);
setting = cartCgiUsualString(cart, "tbWigDataType", "wigData");
if ( sameString(setting, "bedData") )
wigBED = TRUE;
saveOutputOptionsState();
saveIntersectOptionsState();
constraints = constrainFields(NULL);
if ((constraints != NULL) && (constraints[0] == 0))
constraints = NULL;
if (!doCt)
{
- printf("Content-Type: text/plain\n\n");
+ cgiPrintContentType("text/plain");
webStartText();
}
if (differentWord(ctName,table) )
snprintf(tableName, sizeof(tableName), "%s", ctName);
else
snprintf(tableName, sizeof(tableName), "tb_%s", table);
if (ctDesc != (char *)NULL)
{
freeMem(longLabel);
longLabel = cloneString(ctDesc);
}
if (ctVis != (char *)NULL)
@@ -836,31 +836,31 @@
struct customTrack *ctList = getCustomTracks();
slAddHead(&ctList, ctNew);
carefulClose(&wigAsciiFH);
/* Save the custom tracks out to file (overwrite the old file): */
customTracksSaveCart(cart, ctList);
}
if (doCt)
{
char browserUrl[128];
char headerText[256];
int redirDelay = 5;
if (linesOutput < 1)
{
- printf("Content-Type: text/plain\n\n");
+ cgiPrintContentType("text/plain");
webStartText();
printf("#\tno results returned from query\n");
webEnd();
}
else
{
safef(browserUrl, sizeof(browserUrl),
"%s?db=%s&position=%s:%d-%d",
hgTracksName(), database, chrom, winStart, winEnd);
safef(headerText, sizeof(headerText),
"<META HTTP-EQUIV=\"REFRESH\" CONTENT=\"%d;URL=%s\">",
redirDelay, browserUrl);
webStartHeader(cart, headerText,
"Table Browser: %s %s: %s", hOrganism(database),
freezeName, getCtPhase);