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/encode3/encodeDataWarehouse/lib/edwLib.c src/hg/encode3/encodeDataWarehouse/lib/edwLib.c
index 5ea3983c47e..d7aed8040db 100644
--- src/hg/encode3/encodeDataWarehouse/lib/edwLib.c
+++ src/hg/encode3/encodeDataWarehouse/lib/edwLib.c
@@ -946,32 +946,31 @@
* of correlations with older ones. Sorry younguns, it's like social security. */
{
if (sameString(vf->format, "unknown"))
return NULL;
char query[256];
sqlSafef(query, sizeof(query),
"select * from edwValidFile where id<%d and experiment='%s' and format='%s'"
" and outputType='%s'"
, vf->id, vf->experiment, vf->format, vf->outputType);
return edwValidFileLoadByQuery(conn, query);
}
void edwWebHeaderWithPersona(char *title)
/* Print out HTTP and HTML header through tag with persona info */
{
-printf("Content-Type:text/html\r\n");
-printf("\r\n\r\n");
+cgiPrintContentType("text/html");
puts("");
printf("%s\n", "ENCODE Data Warehouse");
puts("");
// Use Stanford ENCODE3 CSS for common look
puts("");
puts("");
// external link icon (box with arrow) is from FontAwesome (fa-external-link)
puts("");
puts("");
puts("");
puts("");
puts("");