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/hgc/hgc.c src/hg/hgc/hgc.c
index 6c1dc70566b..e9e2cf9e8b4 100644
--- src/hg/hgc/hgc.c
+++ src/hg/hgc/hgc.c
@@ -23756,31 +23756,32 @@
firstTime = FALSE;
else
htmlHorizontalLine();
smp = sampleLoad(row+hasBin);
sscanf(smp->name,"footPrinter.%d.%d",&offset,&motifid);
safef(filename, sizeof filename, "../zoo_blanchem/new_raw2_offset%d.fa.main.html?motifID=%d", offset, motifid);
safef(tempTableName, sizeof tempTableName,"%s_%s", smp->chrom, pslTableName );
if (!hFindSplitTable(database, seqName, pslTableName, table, sizeof table, &hasBin))
errAbort("table %s not found", pslTableName);
sqlSafef(query, sizeof query, "select * from %s where tName = '%s' and tEnd >= %d and tStart <= %d" ,
table, smp->chrom, smp->chromStart+smp->samplePosition[0],
smp->chromStart+smp->samplePosition[smp->sampleCount-1] );
- printf("Content-Type: text/html\n\n<HTML><BODY><SCRIPT nonce='%s'>\n", getNonce());
+ cgiPrintContentType("text/html");
+ printf("<HTML><BODY><SCRIPT nonce='%s'>\n", getNonce());
printf("location.replace('%s')\n",filename);
printf("</SCRIPT> <NOSCRIPT> No JavaScript support. "
"Click <b><a href=\"%s\">continue</a></b> for "
"the requested GenBank report. </NOSCRIPT>\n",
filename);
}
}
void humMusClickHandler(struct trackDb *tdb, char *item,
char *targetName, char *targetDb, char *targetTable, boolean printWindowFlag )
/* Put up sample track info. */
{
char *words[16], *dupe = cloneString(tdb->type);
int num;
int wordCount;