Mercurial > public > mercurial-scm > hg-stable
diff mercurial/httppeer.py @ 37555:930c433eb311
httppeer: always add x-hg* headers to Vary header
Before, we manually updated the Vary header value for each
header contributing to it.
All X-Hg* headers are reserved for the Mercurial protocol and
could have caching implications. So it makes sense to always add
these headers to Vary.
A test revealed that X-HgArgs-Post wasn't being added to Vary.
This is only sent on POST requests. POST requests generally
aren't cacheable. However, it is possible if the server sends
the appropriate headers. Mercurial shouldn't be sending those
headers. But let's not take any chances.
Differential Revision: https://phab.mercurial-scm.org/D3240
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Tue, 10 Apr 2018 16:53:44 -0700 |
| parents | 301a1d2e8016 |
| children | b77aa48ba690 |
line wrap: on
line diff
--- a/mercurial/httppeer.py Tue Apr 10 13:41:21 2018 -0700 +++ b/mercurial/httppeer.py Tue Apr 10 16:53:44 2018 -0700 @@ -158,7 +158,6 @@ ui.debug("sending %s command\n" % cmd) q = [('cmd', cmd)] headersize = 0 - varyheaders = [] # Important: don't use self.capable() here or else you end up # with infinite recursion when trying to look up capabilities # for the first time. @@ -194,7 +193,6 @@ for header, value in encodevalueinheaders(encargs, 'X-HgArg', headersize): headers[header] = value - varyheaders.append(header) # Send arguments via query string (Mercurial <1.9). else: q += sorted(args.items()) @@ -238,10 +236,14 @@ headersize or 1024) for header, value in protoheaders: headers[header] = value + + varyheaders = [] + for header in headers: + if header.lower().startswith(r'x-hg'): varyheaders.append(header) if varyheaders: - headers[r'Vary'] = r','.join(varyheaders) + headers[r'Vary'] = r','.join(sorted(varyheaders)) req = requestbuilder(pycompat.strurl(cu), data, headers)