mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 00:41:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

nttpd: allow sendfile() to cope with files >= 2GB; introduce range support

Browse Source 
(This re-applies most of the patches I've reverted about two hours ago.)
This commit is contained in:
martii
2014-07-20 19:00:16 +02:00
committed by [CST] Focus
parent cf0bf3fa20
commit ff46970457
13 changed files with 92 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/nhttpd/yhttpd_mods/mod_sendfile.cpp
View File

@@ -113,8 +113,22 @@ THandleStatus CmodSendfile::Hook_PrepareResponse(CyhookHandler *hh) {
// Send normal or not-modified header
if (modified) {
hh->SendFile(fullfilename);
hh->ResponseMimeType = mime;
hh->RangeStart = 0;
hh->RangeEnd = hh->ContentLength - 1;
const char *range = (hh->HeaderList["Range"] == "") ? NULL : hh->HeaderList["Range"].c_str();
if ((range &&
(2 != sscanf(range, "bytes=%lld-%lld", &hh->RangeStart, &hh->RangeEnd)) &&
(1 != sscanf(range, "bytes=%lld-", &hh->RangeStart)))
|| (hh->RangeStart > hh->RangeEnd)
|| (hh->RangeEnd > hh->ContentLength - 1)) {
hh->SetError(HTTP_REQUEST_RANGE_NOT_SATISFIABLE);
aprintf("mod_sendfile: Client requested range '%s' which is outside of [0,%lld]\n", range, hh->ContentLength - 1);
} else {
hh->SendFile(fullfilename);
hh->ResponseMimeType = mime;
if (hh->RangeStart && (hh->RangeEnd != hh->ContentLength - 1))
hh->httpStatus = HTTP_PARTIAL_CONTENT;
}
} else
hh->SetHeader(HTTP_NOT_MODIFIED, mime, HANDLED_READY);
} else {