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/oneShot/testCart/cart.c src/hg/oneShot/testCart/cart.c index b33c5f7a402..6aee8326024 100644 --- src/hg/oneShot/testCart/cart.c +++ src/hg/oneShot/testCart/cart.c @@ -382,32 +382,31 @@ * with cart, and write end of web-page. Exclude may be NULL. If it exists it's a * comma-separated list of variables that you don't want to save in the cart between * invocations of the cgi-script. */ { int status; char *hguidString = findCookieData("hguid"); int hguid = (hguidString == NULL ? 0 : atoi(hguidString)); int hgsid = cgiUsualInt("hgsid", 0); struct cart *cart = cartNew(hguid, hgsid, exclude); cartExclude(cart, sessionVar); cartExclude(cart, selfVar); printf("Set-Cookie: %s=%u; path=/; domain=.ucsc.edu; expires=%s\n", cookieName, cart->userInfo->id, cookieDate()); -puts("Content-Type:text/html"); -puts("\n"); +cgiPrintContentType("text/html"); htmStart(stdout, title); /* Set up error recovery (for out of memory and the like) * so that we finish web page regardless of problems. */ pushAbortHandler(htmlAbort); pushWarnHandler(htmlVaWarn); status = setjmp(htmlRecover); /* Do your main thing. */ if (status == 0) { doMiddle(cart); if (!savedSession) errAbort("Program error - need to call saveSession inside form");