From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Mon, 4 May 2026 07:40:03 +0000 (+0300) Subject: Autocommit in repo: ros.vados.ru, generated by owner: root, in 10:40:03 04.05.2026. X-Git-Url: https://git.vados.ru/gitweb.cgi?a=commitdiff_plain;h=2586b4ebf50c7800138bd21a1474bb0569a405cc;p=Mikrotiks%2Fros.vados.ru.git Autocommit in repo: ros.vados.ru, generated by owner: root, in 10:40:03 04.05.2026. --- diff --git a/html/AM-FwAddrLists.rsc b/html/AM-FwAddrLists.rsc index 1bd280199..633c96645 100644 --- a/html/AM-FwAddrLists.rsc +++ b/html/AM-FwAddrLists.rsc @@ -20,7 +20,7 @@ :global CertificateAvailable; :global EitherOr; - :global FetchHuge; + :global FetchLargeFiles; :global HumanReadableNum; :global IfThenElse; :global LogPrint; @@ -59,7 +59,7 @@ :for I from=1 to=5 do={ :if ($FwAddrListsIndex = false) do={ - :set FwAddrListsIndex [ :tolf [ $FetchHuge $ScriptName $FwAddrListsIndexUrl false ] ]; + :set FwAddrListsIndex [ :tolf [ $FetchLargeFiles $ScriptName $FwAddrListsIndexUrl true ] ]; :if ($FwAddrListsIndex = false && $I < 5) do={ :log warning ($ScriptName . " Failed downloading address-list index, " . $I . ". try from: " . $FwAddrListsIndexUrl); :delay (($I * $I) . "s"); diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index 93a540dca..c837865e8 100644 --- a/html/AM-GlobalFunc.rsc +++ b/html/AM-GlobalFunc.rsc @@ -17,9 +17,9 @@ :global GlobalFuncReady false; # Git commit id & info, expected configuration version -:global CommitId "main/541/2e1367ac"; +:global CommitId "main/542/3f4c8852"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 10:30:02 04.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 10:40:03 04.05.2026."; # The variables are received right here. :global GlobalConfVersion 140; @@ -1329,6 +1329,15 @@ } # read parts of a large file +# Description of parameters: +# $1 - script name for logging and user agent +# $2 - url to fetch from +# $3 - check-certificate value for /tool/fetch (true/false) +# $4 - mode value for /tool/fetch (optional, e.g. "keep-broken", "https-only", "http-only" +# "no-redirects", "background", "background-and-keep-broken", "background-and-https-only", +# "background-and-http-only", "background-and-no-redirects", "background-and-keep-broken-and-https-only", "background-and-keep-broken-and-http-only", +# "background-and-keep-broken-and-no-redirects") +# $5 - fetch method for /tool/fetch (optional, e.g. "get", "head", "post", "put", "patch", "delete") :set FetchLargeFiles do={ :local FetchLargeScript [:tostr $1]; :local fetchUrl [:tostr $2];