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/hgMenubar/hgMenubar.c src/hg/hgMenubar/hgMenubar.c
index 4e2a59c770e..32ed85457c2 100644
--- src/hg/hgMenubar/hgMenubar.c
+++ src/hg/hgMenubar/hgMenubar.c
@@ -107,31 +107,31 @@
cssVer);
}
void printMenuBar(char *cgiPath, char *docRoot, char *pagePath, char *filePath)
{
char *navBarLoc = incFilePath(cgiPath, filePath, docRoot);
struct lineFile *menuFile = lineFileOpen(navBarLoc, TRUE);
char* oldLine = NULL;
int lineSize = 0;
char *cgiContainerPath = replaceChars(cgiPath, CGI_NAME, "");
char *newPath = makeRelativePath(pagePath, cgiContainerPath);
char *newHref = catTwoStrings("href=\"", newPath);
-printf ("Content-type: text/html\r\n\r\n");
+cgiPrintContentType("text/html");
if (sameString(filePath, NAVBAR_INC_PATH))
printIncludes(newPath, docRoot);
while (lineFileNext(menuFile, &oldLine, &lineSize))
{
// Not quite as robust as perl search and replace - no variable whitespace handling
// Also lots of memory leakage - every line is reallocated and forgotten
char *line = oldLine;
// Fill the top-right link placeholders. Login shows the user or a link to hgSession;
// the Share-a-link button is browser-only, so it is dropped on static pages.
if (stringIn("<!-- LOGIN_LINK -->", line))
line = replaceChars(line, "<!-- LOGIN_LINK -->", loginLinkHtml(pagePath));
if (stringIn("<!-- SHARE_LINK -->", line))
line = replaceChars(line, "<!-- SHARE_LINK -->", "");