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_http_internal.cpp
This commit is contained in:
Thulinma 2018-11-13 16:35:12 +01:00
commit 109995809d
13 changed files with 85 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/output/output_http.cpp
View file

@ -41,13 +41,14 @@ namespace Mist {
config = cfg;
}
void HTTPOutput::onFail(){
void HTTPOutput::onFail(const std::string & msg, bool critical){
INFO_MSG("Failing '%s': %s: %s", streamName.c_str(), H.url.c_str(), msg.c_str());
if (!webSock){
H.Clean(); //make sure no parts of old requests are left in any buffers
H.SetBody("Stream not found. Sorry, we tried.");
H.SendResponse("404", "Stream not found", myConn);
H.SetBody("Could not retrieve stream: "+msg);
H.SendResponse("404", "Error opening stream", myConn);
}
Output::onFail();
Output::onFail(msg, critical);
}
bool isMatch(const std::string & url, const std::string & m, std::string & streamname){