diff options
| author | David Baker <dbkr@matrix.org> | 2014-12-02 13:50:05 +0000 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-12-02 13:50:05 +0000 |
| commit | 7642d95d5e90bab130b33dc27f10e347072e0294 (patch) | |
| tree | 08c618bc5daeceb90bb8a47e3800b88c12d83427 /synapse/http/content_repository.py | |
| parent | More work on pushers. Attempt to do HTTP pokes. Not sure if the actual HTTP p... (diff) | |
| parent | Add non-working jitsi meet bridge (diff) | |
| download | synapse-7642d95d5e90bab130b33dc27f10e347072e0294.tar.xz | |
Merge branch 'develop' into pushers
Diffstat (limited to 'synapse/http/content_repository.py')
| -rw-r--r-- | synapse/http/content_repository.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/http/content_repository.py b/synapse/http/content_repository.py index 7e046dfe49..64ecb5346e 100644 --- a/synapse/http/content_repository.py +++ b/synapse/http/content_repository.py @@ -181,7 +181,7 @@ class ContentRepoResource(resource.Resource): fname = yield self.map_request_to_name(request) - # TODO I have a suspcious feeling this is just going to block + # TODO I have a suspicious feeling this is just going to block with open(fname, "wb") as f: f.write(request.content.read()) @@ -190,7 +190,7 @@ class ContentRepoResource(resource.Resource): # FIXME: we can't assume what the repo's public mounted path is # ...plus self-signed SSL won't work to remote clients anyway # ...and we can't assume that it's SSL anyway, as we might want to - # server it via the non-SSL listener... + # serve it via the non-SSL listener... url = "%s/_matrix/content/%s" % ( self.external_addr, file_name ) |