bpo-37279: Fix asyncio sendfile support when extra data are sent in fallback mode. (GH-14075)

(cherry picked from commit ef2152354f)

Co-authored-by: Andrew Svetlov <andrew.svetlov@gmail.com>
This commit is contained in:
Miss Islington (bot) 2019-06-15 04:24:16 -07:00 committed by GitHub
parent 3fde750cc4
commit bb07321c6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions

View file

@ -861,7 +861,7 @@ class BaseEventLoop(events.AbstractEventLoop):
read = await self.run_in_executor(None, file.readinto, view)
if not read:
break # EOF
await self.sock_sendall(sock, view)
await self.sock_sendall(sock, view[:read])
total_sent += read
return total_sent
finally:
@ -1145,7 +1145,7 @@ class BaseEventLoop(events.AbstractEventLoop):
if not read:
return total_sent # EOF
await proto.drain()
transp.write(view)
transp.write(view[:read])
total_sent += read
finally:
if total_sent > 0 and hasattr(file, 'seek'):