cartodb/CartoDB-SQL-API
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Set max-age=0 when using no-cache"

Browse Source
This commit is contained in:
Luis Bosque 2013-07-10 07:58:35 +02:00
parent 46b7f7a309
commit 7b6b541083
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS.md
View File

@ -1,6 +1,7 @@
1.5.2
-----
* Keep numbers as such in JSON output (#100)
* Revert max-age=0 in Cache-Control when using no-cache
1.5.1
-----

9
app/controllers/app.js
View File

@ -262,13 +262,10 @@ function handleQuery(req, res) {
if ( cache_policy == 'persist' ) {
res.header('Cache-Control', 'public,max-age=31536000'); // 1 year
} else {
// don't cache the result !
// NOTE: both Varnish and Cloudfront ignore this header,
// X-Cache-Channel is for controlling Varnish
// Cloudfront can only be skipped perturbating the URL
//
// TODO: set ttl=0 when tableCache[sql_md5].may_write is true ?
var ttl = 3600;
res.header('Last-Modified', new Date().toUTCString());
res.header('Cache-Control', 'no-cache,max-age=0,must-revalidate,public');
res.header('Cache-Control', 'no-cache,max-age='+ttl+',must-revalidate,public');
}
return result;

2
test/acceptance/app.test.js
View File

@ -30,7 +30,7 @@ app.setMaxListeners(0);
suite('app.test', function() {
var expected_cache_control = 'no-cache,max-age=0,must-revalidate,public';
var expected_cache_control = 'no-cache,max-age=3600,must-revalidate,public';
var expected_cache_control_persist = 'public,max-age=31536000';
test('GET /api/v1/sql', function(done){