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/cirm/cdw/cdwGetMetadataAsFile/cdwGetMetadataAsFile.c src/hg/cirm/cdw/cdwGetMetadataAsFile/cdwGetMetadataAsFile.c index 6ba0d2bed0f..85335ddefb9 100644 --- src/hg/cirm/cdw/cdwGetMetadataAsFile/cdwGetMetadataAsFile.c +++ src/hg/cirm/cdw/cdwGetMetadataAsFile/cdwGetMetadataAsFile.c @@ -91,31 +91,31 @@ char *format = cartString(cart, "Download format"); /* Determine the users meta data access and generate a tagStorm tree of it. */ struct tagStorm *tags = cdwUserTagStorm(conn, user); /* Identify and print the meta data that matches the users search. */ cdwPrintMatchingStanzas(rqlQuery->string, 1000000, tags, format); } void localWebWrap(struct cart *theCart) /* We got the http stuff handled, and a cart. */ { cart = theCart; struct sqlConnection *conn = sqlConnect(cdwDatabase); -printf("Content-Type: text/plain\n\n"); +cgiPrintContentType("text/plain"); user = cdwCurrentUser(conn); cdwGetMetadataAsFile(conn); sqlDisconnect(&conn); } char *excludeVars[] = {"submit", NULL}; int main(int argc, char *argv[]) /* Process command line. */ { boolean isFromWeb = cgiIsOnWeb(); if (!isFromWeb && !cgiSpoof(&argc, argv)) usage(); oldVars = hashNew(0); cartEmptyShellNoContent(localWebWrap, hUserCookie(), excludeVars, oldVars);