hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/output/output_progressive_mp4.cpp
This commit is contained in:
Thulinma 2017-03-16 11:16:08 +01:00
commit 2717c21d4e
16 changed files with 55 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/output/output_progressive_mp4.cpp
View file

@ -757,10 +757,6 @@ namespace Mist {
std::stringstream rangeReply;
rangeReply << "bytes " << byteStart << "-" << byteEnd << "/" << fileSize;
H.SetHeader("Content-Length", byteEnd - byteStart + 1);
//do not multiplex requests that are > 1MiB
if (byteEnd - byteStart + 1 > 1024 * 1024) {
H.SetHeader("MistMultiplex", "No");
}
H.SetHeader("Content-Range", rangeReply.str());
/// \todo Switch to chunked?
H.SendResponse("206", "Partial content", myConn);
@ -770,8 +766,6 @@ namespace Mist {
if (!myMeta.live) {
H.SetHeader("Content-Length", byteEnd - byteStart + 1);
}
//do not multiplex requests that aren't ranged
H.SetHeader("MistMultiplex", "No");
/// \todo Switch to chunked?
H.SendResponse("200", "OK", myConn);
//HTTP_S.StartResponse(HTTP_R, conn);