Fabio/tileserver-gl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use consistent cache control

Browse source
This commit is contained in:
acalcutt 2025-01-04 14:43:06 -05:00
parent 7e67f40fbf
commit 23f50d01a6
3 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/serve_font.js
View file

@ -42,6 +42,7 @@ export async function serve_font(options, allowedFonts, programOpts) {
if (sanitizedFontStack.length == 0) {
return res.status(400).send('Invalid font stack format');
}
fontstack = decodeURI(sanitizedFontStack);
let range = req.params.range;
const rangeMatch = range?.match(/^[\d-]+$/);
@ -54,6 +55,16 @@ export async function serve_font(options, allowedFonts, programOpts) {
);
}
const modifiedSince = req.get('if-modified-since');
const cc = req.get('cache-control');
if (modifiedSince && (!cc || cc.indexOf('no-cache') === -1)) {
const lastDate = new Date(lastModified).getTime();
const modDate = new Date(modifiedSince).getTime();
if (lastDate === modDate) {
return res.sendStatus(304);
}
}
try {
const concatenated = await getFontsPbf(
options.serveAllFonts ? null : allowedFonts,

4
src/serve_rendered.js
View file

@ -665,7 +665,9 @@ async function handleTileRequest(
const modifiedSince = req.get('if-modified-since');
const cc = req.get('cache-control');
if (modifiedSince && (!cc || cc.indexOf('no-cache') === -1)) {
if (new Date(item.lastModified) <= new Date(modifiedSince)) {
const lastDate = new Date(item.lastModified).getTime();
const modDate = new Date(modifiedSince).getTime();
if (lastDate === modDate) {
return res.sendStatus(304);
}
}

5
src/serve_style.js
View file

@ -143,7 +143,9 @@ export const serve_style = {
const modifiedSince = req.get('if-modified-since');
const cc = req.get('cache-control');
if (modifiedSince && (!cc || cc.indexOf('no-cache') === -1)) {
if (new Date(item.lastModified) <= new Date(modifiedSince)) {
const lastDate = new Date(item.lastModified).getTime();
const modDate = new Date(modifiedSince).getTime();
if (lastDate === modDate) {
return res.sendStatus(304);
}
}
@ -327,6 +329,7 @@ export const serve_style = {
spritePaths,
publicUrl,
name: styleJSON.name,
lastModified: new Date().toUTCString(),
};
return true;