Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Show server returned error message for http/404,500 errors

Browse source 
--HG--
branch : develop
This commit is contained in:
Nimetu 2019-06-06 11:03:47 +03:00
parent abad5aa84e
commit 527d4bf00c
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
code/nel/src/gui/group_html.cpp
View file

@ -3827,6 +3827,9 @@ namespace NLGUI
return; return;
} }
// received content from remote
std::string content = trim(_CurlWWW->Content);
// save HSTS header from all requests regardless of HTTP code // save HSTS header from all requests regardless of HTTP code
if (_CurlWWW->hasHSTSHeader()) if (_CurlWWW->hasHSTSHeader())
{ {
@ -3868,8 +3871,11 @@ namespace NLGUI
else if ( (code < 200 || code >= 300) ) else if ( (code < 200 || code >= 300) )
{ {
// catches 304 not modified, but html is not in cache anyway // catches 304 not modified, but html is not in cache anyway
browseError(string("Connection failed\nhttp code " + toString((sint32)code) + ")\nURL '" + _CurlWWW->Url + "'").c_str()); // if server did not send any error back
return; if (content.empty())
{
content = string("<html><head><title>ERROR</title></head><body><h1>Connection failed</h1><p>HTTP code '" + toString((sint32)code) + "'</p><p>URL '" + _CurlWWW->Url + "'</p></body></html>");
}
} }
char *ch; char *ch;
@ -3880,7 +3886,7 @@ namespace NLGUI
contentType = ch; contentType = ch;
} }
htmlDownloadFinished(_CurlWWW->Content, contentType, code); htmlDownloadFinished(content, contentType, code);
// clear curl handler // clear curl handler
if (MultiCurl) if (MultiCurl)