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/lib/web.c src/hg/lib/web.c
index 3956dfe8a48..4691c7f63e4 100644
--- src/hg/lib/web.c
+++ src/hg/lib/web.c
@@ -587,31 +587,31 @@
webEndGb();
}
static boolean gotWarnings = FALSE;
void webVaWarn(char *format, va_list args)
/* Warning handler that closes out page and stuff in
* the fancy form. */
{
gotWarnings = TRUE;
boolean needStart = !webHeadAlreadyOutputed;
if (needStart)
{
// All callers of this (via webPushErrHandlersCartDb) have skipped Content-type
// because they want to output text unless we hit this condition:
- puts("Content-type:text/html\n");
+ cgiPrintContentType("text/html");
cartWebStart(errCart, errDb, "Error");
}
htmlVaWarn(format, args);
printf("\n<!-- HGERROR -->\n\n\n");
}
boolean webGotWarnings()
/* Return TRUE if webVaWarn has been called. */
{
return gotWarnings;
}
void webAbortExt(boolean withHttpHeader, char* title, char *format, va_list args)
/* an abort function that outputs a error page */