MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-02-26 04:49:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2163 from TotallyNotElite/master

Browse Source 
Prevent reverse proxy 5xx codes from triggering a page reload
This commit is contained in:
Ylian Saint-Hilaire 2021-01-12 12:50:30 -08:00 committed by GitHub
commit a12fba0d98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
views/default-mobile.handlebars
View File

@ -1076,7 +1076,9 @@
if (!xdr) xdr = new XMLHttpRequest(); if (!xdr) xdr = new XMLHttpRequest();
xdr.open('HEAD', window.location.href); xdr.open('HEAD', window.location.href);
xdr.timeout = 15000; xdr.timeout = 15000;
xdr.onload = function () { reload(); }; // Make sure there isn't a reverse proxy in front that may just be returning 5xx codes
// Status code 4xx should still be allowed, since a page could potentially be removed, etc
xdr.onload = function () { if (xdr.status < 500) reload(); else setTimeout(serverPoll, 10000); };
xdr.onerror = xdr.ontimeout = function () { setTimeout(serverPoll, 10000); }; xdr.onerror = xdr.ontimeout = function () { setTimeout(serverPoll, 10000); };
xdr.send(); xdr.send();
} }

4
views/default.handlebars
View File

@ -1849,7 +1849,9 @@
if (!xdr) xdr = new XMLHttpRequest(); if (!xdr) xdr = new XMLHttpRequest();
xdr.open('HEAD', window.location.href); xdr.open('HEAD', window.location.href);
xdr.timeout = 15000; xdr.timeout = 15000;
xdr.onload = function () { reload(); }; // Make sure there isn't a reverse proxy in front that may just be returning 5xx codes
// Status code 4xx should still be allowed, since a page could potentially be removed, etc
xdr.onload = function () { if (xdr.status < 500) reload(); else setTimeout(serverPoll, 10000); };
xdr.onerror = xdr.ontimeout = function () { setTimeout(serverPoll, 10000); }; xdr.onerror = xdr.ontimeout = function () { setTimeout(serverPoll, 10000); };
xdr.send(); xdr.send();
} }