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/hgTracks/myVariantsTrack.c src/hg/hgTracks/myVariantsTrack.c
index 43689c6f078..e0ec47aee8a 100644
--- src/hg/hgTracks/myVariantsTrack.c
+++ src/hg/hgTracks/myVariantsTrack.c
@@ -985,41 +985,41 @@
void myVariantsMethods(struct track *track)
/* Set up special methods for myVariants type tracks. */
{
linkedFeaturesMethods(track);
track->totalHeight = myVariantsTotalHeight;
track->drawLeftLabels = myVariantsDrawLeftLabels;
track->loadItems = myVariantsLoadItems;
track->itemName = myVariantsName;
track->nextItemButtonable = TRUE;
}
static void apiSuccess(struct jsonWrite *jw)
/* Send 200 JSON response and exit. */
{
-printf("Content-Type: application/json\n\n");
+cgiPrintContentType("application/json");
puts(jw->dy->string);
jsonWriteFree(&jw);
exit(0);
}
static void apiError(int httpStatus, char *message)
/* Send error JSON response with given HTTP status and exit. */
{
printf("Status: %d\n", httpStatus);
-printf("Content-Type: application/json\n\n");
+cgiPrintContentType("application/json");
struct jsonWrite *jw = jsonWriteNew();
jsonWriteObjectStart(jw, NULL);
jsonWriteString(jw, "error", message);
jsonWriteObjectEnd(jw);
puts(jw->dy->string);
jsonWriteFree(&jw);
exit(0);
}
static void shareToJson(struct jsonWrite *jw, struct myVariantsShare *share)
/* Write a single share record as a JSON object into jw. */
{
jsonWriteObjectStart(jw, NULL);
jsonWriteNumber(jw, "id", share->id);
jsonWriteString(jw, "ownerUser", share->ownerUser);