Skip to content

Commit

Permalink
Fix starting non-media repos (#17626)
Browse files Browse the repository at this point in the history
Regressed in #17543.

The `max_download_size` config is not available on workers that don't
load the media repo.

Besides, we should honour the max_size param that was passed into the
function.
  • Loading branch information
erikjohnston authored Aug 29, 2024
1 parent a8f29c9 commit b21134d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion changelog.d/17543.bugfix
Original file line number Diff line number Diff line change
@@ -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 change: 1 addition & 0 deletions changelog.d/17626.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix authenticated media responses using a wrong limit when following redirects over federation.
6 changes: 2 additions & 4 deletions synapse/http/matrixfederationclient.py
Original file line number Diff line number Diff line change
Expand Up @@ -464,8 +464,6 @@ def __init__(
self.max_long_retries = hs.config.federation.max_long_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._sleeper = AwakenableSleeper(self.reactor)
Expand Down Expand Up @@ -1759,9 +1757,9 @@ async def federation_get_file(
str_url,
)
# 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(
str_url, output_stream, self.max_download_size
str_url, output_stream, max_size
)

logger.info(
Expand Down

0 comments on commit b21134d

Please sign in to comment.