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

Jump to bottom

Clone request each time before following redirect #345

Closed
wants to merge 1 commit into from
Closed

Clone request each time before following redirect #345

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
14 changes: 8 additions & 6 deletions src/Interceptor/FollowRedirects.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,13 @@ private function followRedirects(
$requestNr = 2;

do {
$request = $this->createRedirectRequest($clonedRequest, $response);
$request = $this->updateRequestForRedirect($clonedRequest, $response);
if ($request === null) {
return $response;
}

$clonedRequest = $this->cloneRequest($request);

$redirectResponse = $client->request($request, $cancellationToken);
$redirectResponse->setPreviousResponse($response);

Expand Down Expand Up @@ -178,7 +180,7 @@ private function cloneRequest(Request $originalRequest): Request
return $request;
}

private function createRedirectRequest(Request $clonedRequest, Response $response): ?Request
private function updateRequestForRedirect(Request $request, Response $response): ?Request
{
$redirectUri = $this->getRedirectUri($response);
if ($redirectUri === null) {
Expand All @@ -188,21 +190,21 @@ private function createRedirectRequest(Request $clonedRequest, Response $respons
$originalUri = $response->getRequest()->getUri();
$isSameHost = $redirectUri->getAuthority() === $originalUri->getAuthority();

$clonedRequest->setUri($redirectUri);
$request->setUri($redirectUri);

if (!$isSameHost) {
// Avoid copying headers for security reasons, any interceptor headers will be added again,
// but application headers will be discarded.
$clonedRequest->setHeaders([]);
$request->setHeaders([]);
}

if ($this->autoReferrer) {
$this->assignRedirectRefererHeader($clonedRequest, $originalUri, $redirectUri);
$this->assignRedirectRefererHeader($request, $originalUri, $redirectUri);
}

$this->discardResponseBody($response);

return $clonedRequest;
return $request;
}

/**
Expand Down
Loading