Pull request: ADG-8737 fixed missing version in the footer, unnecessary validation call on the encryption page
Squashed commit of the following:
commit 1c4a15f2f32cd8bfbe0878f79feee4f581f0f5a8
Merge: 399d28e67 9d1c45fd9
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jul 2 13:08:21 2024 +0300
Merge branch 'master' into ADG-8737
commit 399d28e67ff8f8886d5552fea96017e83a122306
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jul 1 19:37:05 2024 +0300
fix install
commit 91d5dd23cea0dd5cde1bf5979bad181229d36f1a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 1 17:40:22 2024 +0300
home: imp logs
commit 06917df08b2154c726ca2de7ed7fda1de4269655
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jul 1 16:38:38 2024 +0300
ADG-8737 add missing version, remove validation call
This commit is contained in:
@@ -133,7 +133,14 @@ func webCheckPortAvailable(port uint16) (ok bool) {
|
||||
|
||||
addrPort := netip.AddrPortFrom(config.HTTPConfig.Address.Addr(), port)
|
||||
|
||||
return aghnet.CheckPort("tcp", addrPort) == nil
|
||||
err := aghnet.CheckPort("tcp", addrPort)
|
||||
if err != nil {
|
||||
log.Info("web: warning: checking https port: %s", err)
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
// tlsConfigChanged updates the TLS configuration and restarts the HTTPS server
|
||||
|
||||
Reference in New Issue
Block a user