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

Fixed multiple responses on errors

Browse source
This commit is contained in:
Thulinma 2020-09-02 16:54:21 +02:00
parent dc0cd0d451
commit dc9d8c8097
3 changed files with 40 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/output/output_http.cpp
View file

@ -55,12 +55,13 @@ namespace Mist{
void HTTPOutput::onFail(const std::string &msg, bool critical){
INFO_MSG("Failing '%s': %s", H.url.c_str(), msg.c_str());
if (!webSock && !isRecording()){
if (!webSock && !isRecording() && !responded){
H.Clean(); // make sure no parts of old requests are left in any buffers
H.SetHeader("Server", APPIDENT);
H.setCORSHeaders();
H.SetBody("Could not retrieve stream: " + msg);
H.SendResponse("404", "Error opening stream", myConn);
responded = true;
}
Output::onFail(msg, critical);
}
@ -292,6 +293,7 @@ namespace Mist{
H.Clean();
return;
}
responded = false;
preHTTP();
onHTTP();
idleLast = Util::bootMS();