Skip to content

Commit 7aea6cc

Browse files
committed
SignUrl: Fix request build from global environment
1 parent ca82325 commit 7aea6cc

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

src/Plugin/SignedUrl.php

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,16 +283,24 @@ protected function urlFromGlobal(): string
283283
{
284284
$urlSegments = [];
285285
$urlSegments['scheme'] = !empty($_SERVER['HTTPS']) && strcasecmp($_SERVER['HTTPS'], 'off') ? 'https' : 'http';
286-
$urlSegments['host'] = strtolower($_SERVER['HTTP_HOST'] ?? '');
286+
if (isset($_SERVER['HTTP_HOST'])) {
287+
$urlSegments['host'] = strtolower($_SERVER['HTTP_HOST']);
288+
}
287289

288290
$requestUrl = $_SERVER['REQUEST_URI'] ?? '/';
289291
$requestUrl = preg_replace('#^\w++://[^/]++#', '', $requestUrl);
290292
$tmp = explode('?', $requestUrl, 2);
291293
$urlSegments['path'] = $tmp[0];
292-
$urlSegments['query'] = ($tmp[1] ?? '');
294+
if (isset($tmp[1])) {
295+
$urlSegments['query'] = $tmp[1];
296+
}
293297

294-
$urlSegments['user'] = ($_SERVER['PHP_AUTH_USER'] ?? '');
295-
$urlSegments['pass'] = ($_SERVER['PHP_AUTH_PW'] ?? '');
298+
if (isset($_SERVER['PHP_AUTH_USER'])) {
299+
$urlSegments['user'] = $_SERVER['PHP_AUTH_USER'];
300+
}
301+
if (isset($_SERVER['PHP_AUTH_PW'])) {
302+
$urlSegments['pass'] = $_SERVER['PHP_AUTH_PW'];
303+
}
296304

297305
return $this->buildUrl($urlSegments);
298306
}

0 commit comments

Comments
 (0)