mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 17:55:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

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

Browse source 
(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
Download patch file Download diff file Expand all files Collapse all files

4
Lib/asyncio/base_events.py
View file

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

3
Lib/test/test_asyncio/test_sendfile.py
View file

@ -86,7 +86,8 @@ class MyProto(asyncio.Protocol):
class SendfileBase: 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. # Reduce socket buffer size to test on relative small data sets.
BUF_SIZE = 4 * 1024 # 4 KiB BUF_SIZE = 4 * 1024 # 4 KiB

2
Misc/NEWS.d/next/Library/2019-06-14-13-25-56.bpo-37279.OHlW6l.rst Normal file
View file

@ -0,0 +1,2 @@
Fix asyncio sendfile support when sendfile sends extra data in fallback
mode.