diff options
author | Simon L <szaimen@e.mail.de> | 2023-05-16 23:32:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-16 23:32:15 +0200 |
commit | 3f786781efdbda8b1178b0d284d8d5a0db0c3689 (patch) | |
tree | b9230dec3a71d58242cef957321560895e93cbf7 /lib | |
parent | 0b1444357b317a7dcec7b5730bd6588c749d2a59 (diff) | |
parent | d293293cdaf10745459e98cce70412882241fdec (diff) | |
download | nextcloud-server-3f786781efdbda8b1178b0d284d8d5a0db0c3689.tar.gz nextcloud-server-3f786781efdbda8b1178b0d284d8d5a0db0c3689.zip |
Merge pull request #31001 from takahiro-blab/master
Fixed 'overwritewebroot' not work with 'overwritecondaddr'.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/base.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/base.php b/lib/base.php index c7fde4136fe..83f97963c4d 100644 --- a/lib/base.php +++ b/lib/base.php @@ -161,6 +161,9 @@ class OC { 'SCRIPT_FILENAME' => $_SERVER['SCRIPT_FILENAME'] ?? null, ], ]; + if (isset($_SERVER['REMOTE_ADDR'])) { + $params['server']['REMOTE_ADDR'] = $_SERVER['REMOTE_ADDR']; + } $fakeRequest = new \OC\AppFramework\Http\Request( $params, new \OC\AppFramework\Http\RequestId($_SERVER['UNIQUE_ID'] ?? '', new \OC\Security\SecureRandom()), |