2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

change map caching header to E-Tag

Browse source
This commit is contained in:
Laura Klünder 2016-12-22 12:12:06 +01:00
parent a2cb13f154
commit 18d6bc82d6
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/c3nav/site/views.py
View file

@ -1,4 +1,3 @@
from calendar import timegm
from datetime import timedelta from datetime import timedelta
import qrcode import qrcode
@ -7,7 +6,6 @@ from django.http import Http404, HttpResponse, HttpResponseNotModified
from django.shortcuts import get_object_or_404, redirect, render from django.shortcuts import get_object_or_404, redirect, render
from django.urls import reverse from django.urls import reverse
from django.utils import timezone from django.utils import timezone
from django.utils.http import http_date, parse_http_date_safe
from c3nav.access.apply import get_visible_areas from c3nav.access.apply import get_visible_areas
from c3nav.mapdata.inclusion import get_includables_avoidables, parse_include_avoid from c3nav.mapdata.inclusion import get_includables_avoidables, parse_include_avoid
@ -246,18 +244,17 @@ def map_image(request, area, level):
raise Http404 raise Http404
last_update = get_last_mapdata_update() last_update = get_last_mapdata_update()
etag = '-'.join(str(i) for i in last_update.timetuple())
if_modified_since = request.META.get('HTTP_IF_MODIFIED_SINCE') if_none_match = request.META.get('HTTP_IF_NONE_MATCH')
if if_modified_since: if if_none_match:
if_modified_since = parse_http_date_safe(if_modified_since) if if_none_match != etag:
if if_modified_since != last_update:
return HttpResponseNotModified() return HttpResponseNotModified()
response = HttpResponse(content_type='image/png') response = HttpResponse(content_type='image/png')
for chunk in File(open(img, 'rb')).chunks(): for chunk in File(open(img, 'rb')).chunks():
response.write(chunk) response.write(chunk)
last_modified = http_date(timegm(last_update.utctimetuple())) response['E-Tag'] = etag
response['Last-Modifed'] = last_modified response['Cache-Control'] = 'no-cache'
response['Cache-Control'] = 'max-age=30, must-revalidate'
return response return response