Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sync in changes from matrixfederationclient

This commit is contained in:
Matthew Hodgson 2016-03-31 12:42:27 +01:00
parent a8a5dd3b44
commit 0d3d7de6fc
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
synapse/http/client.py
View File

@ -244,7 +244,7 @@ class SimpleHttpClient(object):
# The two should be factored out. # The two should be factored out.
@defer.inlineCallbacks @defer.inlineCallbacks
def get_file(self, url, output_stream, args={}, max_size=None): def get_file(self, url, output_stream, max_size=None):
"""GETs a file from a given URL """GETs a file from a given URL
Args: Args:
url (str): The URL to GET url (str): The URL to GET
@ -299,7 +299,11 @@ class _ReadBodyToFileProtocol(protocol.Protocol):
self.stream.write(data) self.stream.write(data)
self.length += len(data) self.length += len(data)
if self.max_size is not None and self.length >= self.max_size: if self.max_size is not None and self.length >= self.max_size:
logger.warn("Requested URL is too large > %r bytes" % (self.max_size,)) self.deferred.errback(SynapseError(
502,
"Requested file is too large > %r bytes" % (self.max_size,),
Codes.TOO_LARGE,
))
self.deferred = defer.Deferred() self.deferred = defer.Deferred()
self.transport.loseConnection() self.transport.loseConnection()