0x2620/python-ox
2
1
Fork 0
Code Issues Pull requests Releases Wiki Activity

do not fail if XACCELREDIRECT and XSENDFILE are not defined

Browse source
This commit is contained in:
j 2011-04-06 20:38:00 +02:00
parent 9a05621d69
commit bd242d9712
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ox/django/http.py
View file

@ -7,21 +7,24 @@ from django.http import HttpResponse, Http404
from django.conf import settings from django.conf import settings
def HttpFileResponse(path, content_type=None, filename=None): def HttpFileResponse(path, content_type=None, filename=None):
if not os.path.exists(path): if not os.path.exists(path):
raise Http404 raise Http404
if not content_type: if not content_type:
content_type = mimetypes.guess_type(path)[0] content_type = mimetypes.guess_type(path)[0]
if settings.XACCELREDIRECT: if getattr(settings, 'XACCELREDIRECT', False):
response = HttpResponse() response = HttpResponse()
response['Content-Length'] = os.stat(path).st_size response['Content-Length'] = os.stat(path).st_size
if path.startswith(settings.STATIC_ROOT):
path = settings.STATIC_URL + path[len(settings.STATIC_ROOT)+1:] for PREFIX in ('STATIC', 'MEDIA'):
if path.startswith(settings.MEDIA_ROOT): root = getattr(settings, PREFIX+'_ROOT', '')
path = settings.MEDIA_URL + path[len(settings.MEDIA_ROOT)+1:] url = getattr(settings, PREFIX+'_URL', '')
if root and path.startswith(root):
path = url + path[len(root)+1:]
response['X-Accel-Redirect'] = path response['X-Accel-Redirect'] = path
response['Content-Type'] = content_type response['Content-Type'] = content_type
elif settings.XSENDFILE: elif getattr(settings, 'XSENDFILE', False):
response = HttpResponse() response = HttpResponse()
response['X-Sendfile'] = path response['X-Sendfile'] = path
response['Content-Type'] = content_type response['Content-Type'] = content_type