diff options
| author | David Baker <dbkr@matrix.org> | 2014-11-20 17:49:48 +0000 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-11-20 17:49:48 +0000 |
| commit | f1c7f8e8131d6e5531e23e3bc2cd57ab7d1881ae (patch) | |
| tree | b1ebd402c0805f475500c9f36a0356322bf26f13 /synapse/http/content_repository.py | |
| parent | Separate out the matrix http client completely because just about all of its ... (diff) | |
| parent | Fix pep8 codestyle warnings (diff) | |
| download | synapse-f1c7f8e8131d6e5531e23e3bc2cd57ab7d1881ae.tar.xz | |
Merge branch 'develop' into http_client_refactor
Diffstat (limited to 'synapse/http/content_repository.py')
| -rw-r--r-- | synapse/http/content_repository.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/synapse/http/content_repository.py b/synapse/http/content_repository.py index 1306b35271..7e046dfe49 100644 --- a/synapse/http/content_repository.py +++ b/synapse/http/content_repository.py @@ -131,12 +131,14 @@ class ContentRepoResource(resource.Resource): request.setHeader('Content-Type', content_type) # cache for at least a day. - # XXX: we might want to turn this off for data we don't want to recommend - # caching as it's sensitive or private - or at least select private. - # don't bother setting Expires as all our matrix clients are smart enough to - # be happy with Cache-Control (right?) - request.setHeader('Cache-Control', 'public,max-age=86400,s-maxage=86400') - + # XXX: we might want to turn this off for data we don't want to + # recommend caching as it's sensitive or private - or at least + # select private. don't bother setting Expires as all our matrix + # clients are smart enough to be happy with Cache-Control (right?) + request.setHeader( + "Cache-Control", "public,max-age=86400,s-maxage=86400" + ) + d = FileSender().beginFileTransfer(f, request) # after the file has been sent, clean up and finish the request |