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/hgCustom/hgCustom.c src/hg/hgCustom/hgCustom.c
index b236e3f45bc..5b01d71963f 100644
--- src/hg/hgCustom/hgCustom.c
+++ src/hg/hgCustom/hgCustom.c
@@ -1278,31 +1278,31 @@
char *user = wikiLinkUserName();
if (isEmpty(user))
errAbort("myVariantsCt: must be logged in");
// Build fully-qualified table name and verify existence
char *dbTable = myVariantsGetDbTable(user);
struct sqlConnection *conn = hAllocConn(CUSTOM_TRASH);
if (!sqlTableExists(conn, dbTable))
{
hFreeConn(&conn);
errAbort("myVariantsCt: table does not exist for current user");
}
// Emit CT text: a track line and BED9 rows filtered by current database
// Plain text response, no HTML
- puts("Content-Type: text/plain\n");
+ cgiPrintContentType("text/plain");
/* Keep track name stable so re-import replaces */
char *userEnc = htmlEncode(user);
printf("track name=\"myVariants\" type=\"bed 9\" itemRgb=\"on\" visibility=\"pack\" shortLabel=\"My Annotations\" longLabel=\"My Annotations (%s)\"\n", userEnc);
freeMem(userEnc);
struct dyString *query = dyStringNew(0);
sqlDyStringPrintf(query,
"select chrom, chromStart, chromEnd, name, score, strand, thickStart, thickEnd, itemRgb "
"from %s where db='%s'",
dbTable, database);
struct sqlResult *sr = sqlGetResult(conn, query->string);
char **row;
while ((row = sqlNextRow(sr)) != NULL)
{
/* BED9: chrom start end name score strand thickStart thickEnd itemRgb */