ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-19 13:07:56 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Finish up limited_content() timeout code.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2022-11-07 11:26:11 -05:00
parent ce59ddc1ea
commit f8b9607fc2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/allmydata/storage/http_client.py
View File

@ -164,6 +164,7 @@ def limited_content(
d.addCallback(lambda _: treq.collect(response, collector))
def done(_):
timeout.cancel()
collector.f.seek(0)
return collector.f
@ -539,7 +540,7 @@ def read_share_chunk(
raise ValueError("Server sent more than we asked for?!")
# It might also send less than we asked for. That's (probably) OK, e.g.
# if we went past the end of the file.
body = yield limited_content(response, supposed_length)
body = yield limited_content(response, supposed_length, client._clock)
body.seek(0, SEEK_END)
actual_length = body.tell()
if actual_length != supposed_length: