summary refs log tree commit diff
path: root/synapse/rest/media/v1/upload_resource.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-10-13 16:11:31 +0100
committerGitHub <noreply@github.com>2017-10-13 16:11:31 +0100
commitdb3d84f46c69a22ba5e9dc80c3717eade80b3638 (patch)
tree980fee53a8dfdc689ae7c3c37c5c3e34f9ddfdb8 /synapse/rest/media/v1/upload_resource.py
parentoops (diff)
parentAdd try/finally block to close t_byte_source (diff)
downloadsynapse-db3d84f46c69a22ba5e9dc80c3717eade80b3638.tar.xz
Merge pull request #2538 from matrix-org/erikj/media_backup
 Basic implementation of backup media store
Diffstat (limited to 'synapse/rest/media/v1/upload_resource.py')
-rw-r--r--synapse/rest/media/v1/upload_resource.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/media/v1/upload_resource.py b/synapse/rest/media/v1/upload_resource.py
index 4ab33f73bf..f6f498cdc5 100644
--- a/synapse/rest/media/v1/upload_resource.py
+++ b/synapse/rest/media/v1/upload_resource.py
@@ -93,7 +93,7 @@ class UploadResource(Resource):
         # TODO(markjh): parse content-dispostion
 
         content_uri = yield self.media_repo.create_content(
-            media_type, upload_name, request.content.read(),
+            media_type, upload_name, request.content,
             content_length, requester.user
         )