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

Merge pull request #13836 from Quix0r/fixes/configurable-file-size 

Make hard-coded max response configurable
This commit is contained in:
Hypolite Petovan 2024-01-16 22:35:08 -05:00 committed by GitHub
parent 28a7884ad9 550b4ce420
commit 3a2461322d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,7 +123,7 @@ class HttpClient extends BaseFactory
$resolver->setMaxRedirects(10); $resolver->setMaxRedirects(10);
$resolver->setRequestTimeout(10); $resolver->setRequestTimeout(10);
// if the file is too large then exit // if the file is too large then exit
$resolver->setMaxResponseDataSize(1000000); $resolver->setMaxResponseDataSize($this->config->get('performance', 'max_response_data_size', 1000000));
// Designate a temporary file that will store cookies during the session. // Designate a temporary file that will store cookies during the session.
// Some websites test the browser for cookie support, so this enhances results. // Some websites test the browser for cookie support, so this enhances results.
$resolver->setCookieJar(System::getTempPath() .'/resolver-cookie-' . Strings::getRandomName(10)); $resolver->setCookieJar(System::getTempPath() .'/resolver-cookie-' . Strings::getRandomName(10));

6
static/defaults.config.php
View File

@ -614,6 +614,12 @@ return [
// Timeout in seconds for fetching the XRD links and other requests with an expected shorter timeout // Timeout in seconds for fetching the XRD links and other requests with an expected shorter timeout
'xrd_timeout' => 20, 'xrd_timeout' => 20,
], ],
'performance' => [
// max_response_data_size (Integer)
// Maximum allowed outgoing HTTP request response data size in Bytes. Does not affect incoming requests to this node.
// Warning: Lowering this value can help with some PHP memory exhaustion issues, but can also partially break some federation features e.g. large posts may not be fetched or received from remote servers.
'max_response_data_size' => 1000000,
],
'proxy' => [ 'proxy' => [
// forwarded_for_headers (String) // forwarded_for_headers (String)
// A comma separated list of all allowed header values to retrieve the real client IP // A comma separated list of all allowed header values to retrieve the real client IP