0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

fix off-by-one in range requests

Browse source
This commit is contained in:
j 2015-02-22 17:38:58 +05:30
parent 7e352f9ac4
commit 08d30c2e67
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
oml/item/handlers.py
View file

@ -43,7 +43,6 @@ class EpubHandler(OMLHandler):
self.write(z.read(filename)) self.write(z.read(filename))
def serve_static(handler, path, mimetype, include_body=True, disposition=None): def serve_static(handler, path, mimetype, include_body=True, disposition=None):
#fixme use static file handler / serve ranges
handler.set_header('Content-Type', mimetype) handler.set_header('Content-Type', mimetype)
size = os.stat(path).st_size size = os.stat(path).st_size
handler.set_header('Accept-Ranges', 'bytes') handler.set_header('Accept-Ranges', 'bytes')
@ -55,9 +54,9 @@ def serve_static(handler, path, mimetype, include_body=True, disposition=None):
r = handler.request.headers.get('Range').split('=')[-1].split('-') r = handler.request.headers.get('Range').split('=')[-1].split('-')
start = int(r[0]) start = int(r[0])
end = int(r[1]) if r[1] else size end = int(r[1]) if r[1] else size
length = end - start length = end - start + 1
handler.set_header('Content-Length', str(length)) handler.set_header('Content-Length', str(length))
handler.set_header('Content-Range', 'bytes %s-%s/%s' % (start, end-1, size)) handler.set_header('Content-Range', 'bytes %s-%s/%s' % (start, end, size))
with open(path, 'rb') as fd: with open(path, 'rb') as fd:
fd.seek(start) fd.seek(start)
handler.write(fd.read(length)) handler.write(fd.read(length))