mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-19 01:21:09 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes

Browse source
This commit is contained in:
Erik Johnston 2024-08-29 13:38:41 +01:00
commit bd00c10485
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog.d/17543.bugfix
View file

@ -1 +1 @@
Fix authenticated media responses using a wrong limit when following redirects over federation. Fix authenticated media responses using a wrong limit when following redirects over federation.

1
changelog.d/17626.bugfix Normal file
View file

@ -0,0 +1 @@
Fix authenticated media responses using a wrong limit when following redirects over federation.

6
synapse/http/matrixfederationclient.py
View file

@ -464,8 +464,6 @@ class MatrixFederationHttpClient:
self.max_long_retries = hs.config.federation.max_long_retries self.max_long_retries = hs.config.federation.max_long_retries
self.max_short_retries = hs.config.federation.max_short_retries self.max_short_retries = hs.config.federation.max_short_retries
self.max_download_size = hs.config.media.max_upload_size
self._cooperator = Cooperator(scheduler=_make_scheduler(self.reactor)) self._cooperator = Cooperator(scheduler=_make_scheduler(self.reactor))
self._sleeper = AwakenableSleeper(self.reactor) self._sleeper = AwakenableSleeper(self.reactor)
@ -1759,9 +1757,9 @@ class MatrixFederationHttpClient:
str_url, str_url,
) )
# We don't know how large the response will be upfront, so limit it to # We don't know how large the response will be upfront, so limit it to
# the `max_upload_size` config value. # the `max_size` config value.
length, headers, _, _ = await self._simple_http_client.get_file( length, headers, _, _ = await self._simple_http_client.get_file(
str_url, output_stream, self.max_download_size str_url, output_stream, max_size
) )
logger.info( logger.info(