From 28bed270e83edaaedb07b48e0b8cffd10355f127 Mon Sep 17 00:00:00 2001 From: Shreyas Zare Date: Sat, 15 Jun 2024 15:09:17 +0530 Subject: [PATCH] main.js: Updated checkForWebConsoleRedirection() to add delay before redirection to new service URL to allow web server to restart. --- DnsServerCore/www/js/main.js | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/DnsServerCore/www/js/main.js b/DnsServerCore/www/js/main.js index 730c9083..1e52e959 100644 --- a/DnsServerCore/www/js/main.js +++ b/DnsServerCore/www/js/main.js @@ -1849,7 +1849,10 @@ function checkForWebConsoleRedirection(responseJSON) { if (location.protocol == "https:") { if (!responseJSON.response.webServiceEnableTls) { - window.open("http://" + window.location.hostname + ":" + responseJSON.response.webServiceHttpPort, "_self"); + setTimeout(function () { + window.open("http://" + window.location.hostname + ":" + responseJSON.response.webServiceHttpPort, "_self"); + }, 2500); //delay redirection to allow web server to restart + return; } @@ -1858,12 +1861,18 @@ function checkForWebConsoleRedirection(responseJSON) { if ((currentPort == 0) || (currentPort == "")) currentPort = 443; - if (currentPort != responseJSON.response.webServiceTlsPort) - window.open("https://" + window.location.hostname + ":" + responseJSON.response.webServiceTlsPort, "_self"); + if (currentPort != responseJSON.response.webServiceTlsPort) { + setTimeout(function () { + window.open("https://" + window.location.hostname + ":" + responseJSON.response.webServiceTlsPort, "_self"); + }, 2500); //delay redirection to allow web server to restart + } } else { if (responseJSON.response.webServiceEnableTls && responseJSON.response.webServiceHttpToTlsRedirect) { - window.open("https://" + window.location.hostname + ":" + responseJSON.response.webServiceTlsPort, "_self"); + setTimeout(function () { + window.open("https://" + window.location.hostname + ":" + responseJSON.response.webServiceTlsPort, "_self"); + }, 2500); //delay redirection to allow web server to restart + return; } @@ -1872,8 +1881,11 @@ function checkForWebConsoleRedirection(responseJSON) { if ((currentPort == 0) || (currentPort == "")) currentPort = 80; - if (currentPort != responseJSON.response.webServiceHttpPort) - window.open("http://" + window.location.hostname + ":" + responseJSON.response.webServiceHttpPort, "_self"); + if (currentPort != responseJSON.response.webServiceHttpPort) { + setTimeout(function () { + window.open("http://" + window.location.hostname + ":" + responseJSON.response.webServiceHttpPort, "_self"); + }, 2500); //delay redirection to allow web server to restart + } } }