Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-29 09:44:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

HTTPRequest: Replace getInfo() with new parameter 'content_length'

Browse source
This commit is contained in:
Philipp 2020-10-09 20:52:52 +02:00
parent 1a42f35a3c
commit f3cd973cbe
No known key found for this signature in database
GPG key ID: 9A28B7D4FF5667BD
7 changed files with 15 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/Network/HTTPRequest.php
View file

@ -30,6 +30,7 @@ use Friendica\Util\Network;
use Friendica\Util\Profiler;
use GuzzleHttp\Client;
use GuzzleHttp\Exception\RequestException;
use GuzzleHttp\Exception\TransferException;
use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\UriInterface;
@ -177,10 +178,18 @@ class HTTPRequest implements IHTTPRequest
$this->logger->notice('Curl redirect.', ['url' => $request->getUri(), 'to' => $uri]);
};
$onHeaders = function (ResponseInterface $response) use ($opts) {
if (!empty($opts['content_length']) &&
$response->getHeaderLine('Content-Length') > $opts['content_length']) {
throw new TransferException('The file is too big!');
}
};
$client = new Client([
'allow_redirect' => [
'max' => 8,
'on_redirect' => $onRedirect,
'on_headers' => $onHeaders,
'track_redirect' => true,
'strict' => true,
'referer' => true,
@ -191,8 +200,9 @@ class HTTPRequest implements IHTTPRequest
try {
$response = $client->get($url);
return new GuzzleResponse($response, $url);
} catch (RequestException $exception) {
if ($exception->hasResponse()) {
} catch (TransferException $exception) {
if ($exception instanceof RequestException &&
$exception->hasResponse()) {
return new GuzzleResponse($exception->getResponse(), $url, $exception->getCode(), $exception->getMessage());
} else {
return new CurlResult($url, '', ['http_code' => $exception->getCode()], $exception->getCode(), $exception->getMessage());