mirror of https://github.com/python/cpython
bpo-37279: Fix asyncio sendfile support when extra data are sent in fallback mode. (GH-14075)
This commit is contained in:
parent
7efc526e5c
commit
ef2152354f
|
@ -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'):
|
||||
|
|
|
@ -86,7 +86,8 @@ class MyProto(asyncio.Protocol):
|
|||
|
||||
class SendfileBase:
|
||||
|
||||
DATA = b"SendfileBaseData" * (1024 * 8) # 128 KiB
|
||||
# 128 KiB plus small unaligned to buffer chunk
|
||||
DATA = b"SendfileBaseData" * (1024 * 8 + 1)
|
||||
|
||||
# Reduce socket buffer size to test on relative small data sets.
|
||||
BUF_SIZE = 4 * 1024 # 4 KiB
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
Fix asyncio sendfile support when sendfile sends extra data in fallback
|
||||
mode.
|
Loading…
Reference in New Issue