Skip to content

Commit c3b8d1c

Browse files
authored
Merge pull request #482 from ITernovtsiy/fix-auth
Use userInfo from server configuration when duplicating request
2 parents f0cd186 + 908f608 commit c3b8d1c

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

src/ProxyClient/HttpDispatcher.php

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -223,13 +223,18 @@ private function fanOut(RequestInterface $request)
223223

224224
// Create a request to each caching proxy server
225225
foreach ($this->getServers() as $server) {
226-
$requests[] = $request->withUri(
227-
$uri
228-
->withScheme($server->getScheme())
229-
->withHost($server->getHost())
230-
->withPort($server->getPort()),
231-
true // Preserve application Host header
232-
);
226+
$serverUri = $uri
227+
->withScheme($server->getScheme())
228+
->withHost($server->getHost())
229+
->withPort($server->getPort());
230+
231+
if ($userInfo = $server->getUserInfo()) {
232+
$userInfoParts = explode(':', $userInfo, 2);
233+
$serverUri = $serverUri
234+
->withUserInfo($userInfoParts[0], $userInfoParts[1] ?? null);
235+
}
236+
237+
$requests[] = $request->withUri($serverUri, true); // Preserve application Host header
233238
}
234239

235240
return $requests;

0 commit comments

Comments
 (0)