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/hgChooseDb/hgChooseDb.c src/hg/hgChooseDb/hgChooseDb.c index 7db59c93496..083461f7ae4 100644 --- src/hg/hgChooseDb/hgChooseDb.c +++ src/hg/hgChooseDb/hgChooseDb.c @@ -214,31 +214,31 @@ if (startsWithNoCase(term, target)) { if (! hashLookup(matchHash, target)) hashAdd(matchHash, target, dbDb); } } static void lookupTerm() /* Look for matches to term in hgCentral and print as JSON if found. */ { char *term = cgiOptionalString(SEARCH_TERM); if (isEmpty(term)) fail("Missing search term parameter"); // Write JSON response with list of matches -puts("Content-Type:text/javascript\n"); +cgiPrintContentType("text/javascript"); struct jsonWrite *jw = jsonWriteNew(); jsonWriteListStart(jw, NULL); // Search dbDb for matches struct hash *matchHash = hashNew(0); struct dbDb *dbDbList = hDbDbList(), *dbDb; for (dbDb = dbDbList; dbDb != NULL; dbDb = dbDb->next) { if (startsWithNoCase(term, dbDb->name)) { jsonWriteObjectStart(jw, NULL); char description[PATH_LEN]; safef(description, sizeof(description), "%s (%s %s)", dbDb->name, dbDb->genome, dbDb->description); jsonWriteString(jw, "value", description);