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

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2015-05-12 11:23:08 +02:00
commit e0c9173f9a
5 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/output/output_hls.cpp
View file

@ -168,6 +168,7 @@ namespace Mist {
H.Clean();
H.SetHeader("Content-Type", "text/xml");
H.SetHeader("Server", "mistserver/" PACKAGE_VERSION "/" + Util::Config::libver);
H.setCORSHeaders();
H.SetBody("<?xml version=\"1.0\"?><!DOCTYPE cross-domain-policy SYSTEM \"http://www.adobe.com/xml/dtds/cross-domain-policy.dtd\"><cross-domain-policy><allow-access-from domain=\"*\" /><site-control permitted-cross-domain-policies=\"all\"/></cross-domain-policy>");
H.SendResponse("200", "OK", myConn);
H.Clean(); //clean for any possible next requests
@ -240,6 +241,7 @@ namespace Mist {
lastVid = from * 90;
H.SetHeader("Content-Type", "video/mp2t");
H.setCORSHeaders();
H.StartResponse(H, myConn, VLCworkaround);
unsigned int fragCounter = myMeta.tracks[vidTrack].missedFrags;
@ -266,6 +268,7 @@ namespace Mist {
H.SetHeader("Content-Type", "audio/mpegurl");
}
H.SetHeader("Cache-Control", "no-cache");
H.setCORSHeaders();
std::string manifest;
if (request.find("/") == std::string::npos){
manifest = liveIndex();