Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

f2ed64ea

Commit f2ed64ea authored 8 years ago by Richard van der Hoff Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #1992 from matrix-org/rav/fix_media_loop

Fix routing loop when fetching remote media

parents bad72b0b ef328b2f

Branches

Tags

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

synapse/api/errors.py 63 additions, 11 deletions

synapse/api/errors.py
synapse/http/matrixfederationclient.py 12 additions, 3 deletions

synapse/http/matrixfederationclient.py
synapse/rest/media/v1/download_resource.py 12 additions, 0 deletions

synapse/rest/media/v1/download_resource.py
synapse/rest/media/v1/media_repository.py 34 additions, 10 deletions

synapse/rest/media/v1/media_repository.py

with 121 additions and 24 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment