Commit 7508b239 authored by Laurence Rowe's avatar Laurence Rowe

don't append Accept-Encoding to Vary header unnecessarily

parent d7bf2837
......@@ -398,7 +398,9 @@ class HTTPResponse(BaseResponse):
# was ignored anyway, so cache should not
# vary on it. Otherwise if not forced, cache should
# respect Accept-Encoding client header
self.appendHeader('Vary','Accept-Encoding')
vary = self.getHeader('Vary')
if vary is None or 'Accept-Encoding' not in vary:
self.appendHeader('Vary','Accept-Encoding')
return self
def enableHTTPCompression(self,REQUEST={},force=0,disable=0,query=0):
......
......@@ -180,6 +180,20 @@ class HTTPResponseTests(unittest.TestCase):
'Set-Cookie: '
'violation="http://www.ietf.org/rfc/rfc2616.txt"\r\n')
def test_setBody_compression_vary(self):
# Vary header should be added here
response = self._makeOne()
response.enableHTTPCompression(REQUEST={'HTTP_ACCEPT_ENCODING': 'gzip'})
response.setBody('foo'*100) # body must get smaller on compression
self.assertEqual('Accept-Encoding' in response.getHeader('Vary'), True)
# But here it would be unnecessary
response = self._makeOne()
response.enableHTTPCompression(REQUEST={'HTTP_ACCEPT_ENCODING': 'gzip'})
response.setHeader('Vary', 'Accept-Encoding,Accept-Language')
before = response.getHeader('Vary')
response.setBody('foo'*100)
self.assertEqual(before, response.getHeader('Vary'))
def test_suite():
suite = unittest.TestSuite()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment