upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 17:23:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

Merge pull request #31001 from takahiro-blab/master

Browse source 
Fixed 'overwritewebroot' not work with 'overwritecondaddr'.
This commit is contained in:
Simon L 2023-05-16 23:32:15 +02:00 committed by GitHub
commit 3f786781ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/base.php
View file

@ -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()),