mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2025-05-10 17:45:41 +03:00
all: partially sync with master; upd chlog
This commit is contained in:
parent
48d1c673a9
commit
fbc0d981ba
71 changed files with 557 additions and 210 deletions
internal/home
|
@ -15,7 +15,6 @@ import (
|
|||
"github.com/AdguardTeam/AdGuardHome/internal/version"
|
||||
"github.com/AdguardTeam/golibs/httphdr"
|
||||
"github.com/AdguardTeam/golibs/log"
|
||||
"github.com/AdguardTeam/golibs/mathutil"
|
||||
"github.com/AdguardTeam/golibs/netutil"
|
||||
"github.com/NYTimes/gziphandler"
|
||||
)
|
||||
|
@ -145,7 +144,7 @@ func handleStatus(w http.ResponseWriter, r *http.Request) {
|
|||
// Make sure that we don't send negative numbers to the frontend,
|
||||
// since enough time might have passed to make the difference less
|
||||
// than zero.
|
||||
protectionDisabledDuration = mathutil.Max(
|
||||
protectionDisabledDuration = max(
|
||||
0,
|
||||
time.Until(*protectionDisabledUntil).Milliseconds(),
|
||||
)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue