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

Fixes to urireader: continue without range request support if HEAD request fails; close socket on error

Browse source
This commit is contained in:
Marco van Dijk 2024-05-29 11:59:50 +02:00 • committed by Thulinma
parent acea07e3ec
commit c379a9e686
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/urireader.cpp
View file

@ -213,7 +213,6 @@ namespace HTTP{
downer.getSocket().close(); downer.getSocket().close();
downer.getSocket().Received().clear(); downer.getSocket().Received().clear();
allData.truncate(0); allData.truncate(0);
if (!downer.isOk()){return false;}
supportRangeRequest = false; supportRangeRequest = false;
totalSize = std::string::npos; totalSize = std::string::npos;
}else{ }else{
@ -334,7 +333,16 @@ namespace HTTP{
// Note: this function returns true if the full read was completed only. // Note: this function returns true if the full read was completed only.
// It's the reason this function returns void rather than bool. // It's the reason this function returns void rather than bool.
size_t prev = cb.getDataCallbackPos(); size_t prev = cb.getDataCallbackPos();
downer.continueNonBlocking(cb); if (downer.continueNonBlocking(cb)){
if (downer.getStatusCode() >= 400){
WARN_MSG("Received error response code %" PRIu32 " (%s)", downer.getStatusCode(), downer.getStatusText().c_str());
// cb.dataCallbackFlush();
downer.getSocket().close();
downer.getSocket().Received().clear();
allData.truncate(0);
return 0;
}
}
return cb.getDataCallbackPos() - prev; return cb.getDataCallbackPos() - prev;
} }
// Everything else uses the socket directly // Everything else uses the socket directly