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

Merge sessions option in HLS output now supports caching properly

Browse source
This commit is contained in:
Thulinma 2019-01-14 16:53:05 +01:00
parent d711d32c6a
commit 3977bad570
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/output/output_hls.cpp
View file

@ -408,10 +408,17 @@ namespace Mist {
} //crossdomain.xml } //crossdomain.xml
if (H.method == "OPTIONS") { if (H.method == "OPTIONS") {
bool isTS = (HTTP::URL(H.url).getExt().substr(0, 3) != "m3u");
H.Clean(); H.Clean();
H.SetHeader("Content-Type", "application/octet-stream");
H.SetHeader("Cache-Control", "no-cache");
H.setCORSHeaders(); H.setCORSHeaders();
H.SetHeader("Content-Type", "application/octet-stream");
if (isTS && !hasSessionIDs()){
H.SetHeader("Cache-Control", "public, max-age=600, immutable");
H.SetHeader("Pragma", "");
H.SetHeader("Expires", "");
}else{
H.SetHeader("Cache-Control", "no-cache");
}
H.SetBody(""); H.SetBody("");
H.SendResponse("200", "OK", myConn); H.SendResponse("200", "OK", myConn);
H.Clean(); H.Clean();
@ -448,7 +455,6 @@ namespace Mist {
} }
H.SetHeader("Content-Type", "application/vnd.apple.mpegurl"); H.SetHeader("Content-Type", "application/vnd.apple.mpegurl");
if (relPushUrl == "/index.m3u8"){ if (relPushUrl == "/index.m3u8"){
H.SetHeader("Cache-Control", "no-cache");
H.setCORSHeaders(); H.setCORSHeaders();
H.SetBody(pushLiveIndex()); H.SetBody(pushLiveIndex());
H.SendResponse("200", "OK", myConn); H.SendResponse("200", "OK", myConn);
@ -463,7 +469,6 @@ namespace Mist {
if (eTime < bTime){ if (eTime < bTime){
eTime = bTime; eTime = bTime;
} }
H.SetHeader("Cache-Control", "no-cache");
H.setCORSHeaders(); H.setCORSHeaders();
H.SetBody(pushLiveIndex(vTrack, bTime, eTime)); H.SetBody(pushLiveIndex(vTrack, bTime, eTime));
H.SendResponse("200", "OK", myConn); H.SendResponse("200", "OK", myConn);
@ -520,6 +525,13 @@ namespace Mist {
H.SetHeader("Content-Type", "video/mp2t"); H.SetHeader("Content-Type", "video/mp2t");
H.setCORSHeaders(); H.setCORSHeaders();
if (hasSessionIDs()){
H.SetHeader("Cache-Control", "no-cache");
}else{
H.SetHeader("Cache-Control", "public, max-age=600, immutable");
H.SetHeader("Pragma", "");
H.SetHeader("Expires", "");
}
if(method == "OPTIONS" || method == "HEAD"){ if(method == "OPTIONS" || method == "HEAD"){
H.SendResponse("200", "OK", myConn); H.SendResponse("200", "OK", myConn);
H.Clean(); H.Clean();
@ -541,9 +553,8 @@ namespace Mist {
initialize(); initialize();
std::string request = H.url.substr(H.url.find("/", 5) + 1); std::string request = H.url.substr(H.url.find("/", 5) + 1);
H.Clean(); H.Clean();
H.SetHeader("Content-Type", "application/vnd.apple.mpegurl");
H.SetHeader("Cache-Control", "no-cache");
H.setCORSHeaders(); H.setCORSHeaders();
H.SetHeader("Content-Type", "application/vnd.apple.mpegurl");
if (!myMeta.tracks.size()){ if (!myMeta.tracks.size()){
H.SendResponse("404", "Not online or found", myConn); H.SendResponse("404", "Not online or found", myConn);
H.Clean(); H.Clean();