Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix public path resolution with symlinks #1936

Merged
merged 1 commit into from
Nov 9, 2022
Merged

Fix public path resolution with symlinks #1936

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/App.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,6 +634,9 @@ protected function getRequestUrl(): string

protected function createRequestPathFromLocalPath(string $localPath): string
{
// $localPath does not need realpath() as the path is expected to be built using __DIR__
// which has symlinks resolved

static $requestUrlPath = null;
static $requestLocalPath = null;
if ($requestUrlPath === null) {
Expand All @@ -645,7 +648,7 @@ protected function createRequestPathFromLocalPath(string $localPath): string
} else {
$request = \Symfony\Component\HttpFoundation\Request::createFromGlobals();
$requestUrlPath = $request->getBasePath();
$requestLocalPath = $request->server->get('SCRIPT_FILENAME');
$requestLocalPath = realpath($request->server->get('SCRIPT_FILENAME'));
}
}
$fs = new \Symfony\Component\Filesystem\Filesystem();
Expand Down