summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-10-29 23:38:37 +0100
committerGitHub <noreply@github.com>2018-10-29 23:38:37 +0100
commit0999f079641cf25cac7aafdc1a0f604f78f3115c (patch)
tree3492808653060185c8f0e01f160c66811f37f97e /lib
parent2d5047849238c4130ca8ec78e29c9e9edcb359e2 (diff)
parent5cf8f4a407787151a8aa47c35e9aa2aa5a3d443c (diff)
downloadnextcloud-server-0999f079641cf25cac7aafdc1a0f604f78f3115c.tar.gz
nextcloud-server-0999f079641cf25cac7aafdc1a0f604f78f3115c.zip
Merge pull request #12052 from nextcloud/bugfix/11594/fix-setup-check-trusted-proxies
Fix setup check trusted proxies
Diffstat (limited to 'lib')
-rw-r--r--lib/private/AppFramework/Http/Request.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php
index 0485d178b49..1d5a29f74f9 100644
--- a/lib/private/AppFramework/Http/Request.php
+++ b/lib/private/AppFramework/Http/Request.php
@@ -320,14 +320,18 @@ class Request implements \ArrayAccess, \Countable, IRequest {
// There's a few headers that seem to end up in the top-level
// server array.
- switch($name) {
+ switch ($name) {
case 'CONTENT_TYPE' :
case 'CONTENT_LENGTH' :
if (isset($this->server[$name])) {
return $this->server[$name];
}
break;
-
+ case 'REMOTE_ADDR' :
+ if (isset($this->server[$name])) {
+ return $this->server[$name];
+ }
+ break;
}
return '';