diff options
author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2021-04-01 13:27:26 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-01 13:27:26 +0200 |
commit | bd2e6309b5b7719f42f10097ffdef09bcb7447dd (patch) | |
tree | c9c70359991cd8a63453f4b7d94f3c241beb38c3 /apps/settings/lib | |
parent | 68d364007691750a5e8ec218c87e6cd8b0919245 (diff) | |
parent | cc0cc68c8d3e2fa2e4d072ca156b889aad2e5313 (diff) | |
download | nextcloud-server-bd2e6309b5b7719f42f10097ffdef09bcb7447dd.tar.gz nextcloud-server-bd2e6309b5b7719f42f10097ffdef09bcb7447dd.zip |
Merge pull request #25605 from nextcloud/trusted-proxy-warning-localhost
dont show trusted proxy warning when the proxy and remote are both localhost
Diffstat (limited to 'apps/settings/lib')
-rw-r--r-- | apps/settings/lib/Controller/CheckSetupController.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php index b1cd36f5b68..367b631706d 100644 --- a/apps/settings/lib/Controller/CheckSetupController.php +++ b/apps/settings/lib/Controller/CheckSetupController.php @@ -319,7 +319,7 @@ class CheckSetupController extends Controller { return false; } - if (\is_array($trustedProxies) && \in_array($remoteAddress, $trustedProxies, true)) { + if (\is_array($trustedProxies) && \in_array($remoteAddress, $trustedProxies, true) && $remoteAddress !== '127.0.0.1') { return $remoteAddress !== $this->request->getRemoteAddress(); } |