Skip to content

XDebug: Always append to the X- header, rather than prepend #6333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bryancall merged 2 commits into from
Mar 11, 2020
Merged

XDebug: Always append to the X- header, rather than prepend #6333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e9d291
XDebug: Always append to the X- header, rather than prepend
zwoop Jan 16, 2020
d9339c0
Updated the docs as well
zwoop Mar 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions doc/admin-guide/plugins/xdebug.en.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ X-Cache
skipped The cache lookup was skipped.
========== ===========

If a request goes through multiple proxies, each one prepends its X-Cache header content
at the beginning of the existing X-Cache header. As a result, the order is reversed from
the Via: header.
If a request goes through multiple proxies, each one appends its X-Cache header content
the end of the existing X-Cache header. This is the same order as for the
``Via`` header.

X-Cache-Generation
The cache generation ID for this transaction, as specified by the
Expand Down
14 changes: 7 additions & 7 deletions plugins/xdebug/xdebug.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ InjectCacheKeyHeader(TSHttpTxn txn, TSMBuffer buffer, TSMLoc hdr)
}

// Now copy the cache lookup URL into the response header.
TSReleaseAssert(TSMimeHdrFieldValueStringInsert(buffer, hdr, dst, 0 /* idx */, strval.ptr, strval.len) == TS_SUCCESS);
TSReleaseAssert(TSMimeHdrFieldValueStringInsert(buffer, hdr, dst, -1 /* idx */, strval.ptr, strval.len) == TS_SUCCESS);

done:
if (dst != TS_NULL_MLOC) {
Expand Down Expand Up @@ -197,11 +197,11 @@ InjectCacheHeader(TSHttpTxn txn, TSMBuffer buffer, TSMLoc hdr)

if (TSHttpTxnCacheLookupStatusGet(txn, &status) == TS_ERROR) {
// If the cache lookup hasn't happened yes, TSHttpTxnCacheLookupStatusGet will fail.
TSReleaseAssert(TSMimeHdrFieldValueStringInsert(buffer, hdr, dst, 0 /* idx */, "none", 4) == TS_SUCCESS);
TSReleaseAssert(TSMimeHdrFieldValueStringInsert(buffer, hdr, dst, -1 /* idx */, "none", 4) == TS_SUCCESS);
} else {
const char *msg = (status < 0 || status >= static_cast<int>(countof(names))) ? "unknown" : names[status];

TSReleaseAssert(TSMimeHdrFieldValueStringInsert(buffer, hdr, dst, 0 /* idx */, msg, -1) == TS_SUCCESS);
TSReleaseAssert(TSMimeHdrFieldValueStringInsert(buffer, hdr, dst, -1 /* idx */, msg, -1) == TS_SUCCESS);
}

done:
Expand Down Expand Up @@ -272,7 +272,7 @@ InjectMilestonesHeader(TSHttpTxn txn, TSMBuffer buffer, TSMLoc hdr)
double elapsed = static_cast<double>(time - epoch) / 1000000000.0;
int len = snprintf(hdrval, sizeof(hdrval), "%s=%1.9lf", milestones[i].msname, elapsed);

TSReleaseAssert(TSMimeHdrFieldValueStringInsert(buffer, hdr, dst, 0 /* idx */, hdrval, len) == TS_SUCCESS);
TSReleaseAssert(TSMimeHdrFieldValueStringInsert(buffer, hdr, dst, -1 /* idx */, hdrval, len) == TS_SUCCESS);
}
}

Expand Down Expand Up @@ -334,7 +334,7 @@ InjectRemapHeader(TSHttpTxn txn, TSMBuffer buffer, TSMLoc hdr)
TSfree(const_cast<char *>(toUrlStr));
}

TSReleaseAssert(TSMimeHdrFieldValueStringInsert(buffer, hdr, dst, 0 /* idx */, buf, len) == TS_SUCCESS);
TSReleaseAssert(TSMimeHdrFieldValueStringInsert(buffer, hdr, dst, -1 /* idx */, buf, len) == TS_SUCCESS);
TSHandleMLocRelease(buffer, hdr, dst);
}
}
Expand All @@ -349,7 +349,7 @@ InjectTxnUuidHeader(TSHttpTxn txn, TSMBuffer buffer, TSMLoc hdr)
TSUuid uuid = TSProcessUuidGet();
int len = snprintf(buf, sizeof(buf), "%s-%" PRIu64 "", TSUuidStringGet(uuid), TSHttpTxnIdGet(txn));

TSReleaseAssert(TSMimeHdrFieldValueStringInsert(buffer, hdr, dst, 0 /* idx */, buf, len) == TS_SUCCESS);
TSReleaseAssert(TSMimeHdrFieldValueStringInsert(buffer, hdr, dst, -1 /* idx */, buf, len) == TS_SUCCESS);
TSHandleMLocRelease(buffer, hdr, dst);
}
}
Expand Down Expand Up @@ -387,7 +387,7 @@ InjectParentSelectionKeyHeader(TSHttpTxn txn, TSMBuffer buffer, TSMLoc hdr)
}

// Now copy the parent selection lookup URL into the response header.
TSReleaseAssert(TSMimeHdrFieldValueStringInsert(buffer, hdr, dst, 0 /* idx */, strval.ptr, strval.len) == TS_SUCCESS);
TSReleaseAssert(TSMimeHdrFieldValueStringInsert(buffer, hdr, dst, -1 /* idx */, strval.ptr, strval.len) == TS_SUCCESS);

done:
if (dst != TS_NULL_MLOC) {
Expand Down