clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11727 from nupplaphil/bug/redirect 

Fix HTTP Client redirect Bug
This commit is contained in:
Hypolite Petovan 2022-07-12 15:24:58 -04:00 committed by GitHub
parent d9d30c7b06 8e547510a0
commit a2c929d128
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Network/HTTPClient/Factory/HttpClient.php
View File

@ -94,11 +94,11 @@ class HttpClient extends BaseFactory
$guzzle = new GuzzleHttp\Client([ $guzzle = new GuzzleHttp\Client([
RequestOptions::ALLOW_REDIRECTS => [ RequestOptions::ALLOW_REDIRECTS => [
'max' => 8, 'max' => 8,
'on_redirect' => $onRedirect, 'on_redirect' => $onRedirect,
'track_redirect' => true, 'track_redirects' => true,
'strict' => true, 'strict' => true,
'referer' => true, 'referer' => true,
], ],
RequestOptions::HTTP_ERRORS => false, RequestOptions::HTTP_ERRORS => false,
// Without this setting it seems as if some webservers send compressed content // Without this setting it seems as if some webservers send compressed content

15
tests/src/Network/HTTPClient/Client/HTTPClientTest.php
View File

@ -49,4 +49,19 @@ class HTTPClientTest extends MockedTest
self::assertFalse(DI::httpClient()->get('https://friendica.local')->isSuccess()); self::assertFalse(DI::httpClient()->get('https://friendica.local')->isSuccess());
} }
/**
* Test for issue https://github.com/friendica/friendica/issues/11726
*/
public function testRedirect()
{
$this->httpRequestHandler->setHandler(new MockHandler([
new Response(302, ['Location' => 'https://mastodon.social/about']),
new Response(200, ['Location' => 'https://mastodon.social']),
]));
$result = DI::httpClient()->get('https://mastodon.social');
self::assertEquals('https://mastodon.social', $result->getUrl());
self::assertEquals('https://mastodon.social/about', $result->getRedirectUrl());
}
} }