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

Miss Islington (bot) webhook-mailer at python.org
Sat Jun 15 07:24:20 EDT 2019


https://github.com/python/cpython/commit/bb07321c6a7e1cbe597c3fc5fa275a85d0f50acb
commit: bb07321c6a7e1cbe597c3fc5fa275a85d0f50acb
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-06-15T04:24:16-07:00
summary:

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

(cherry picked from commit ef2152354f03a165c5e3adb53e2276934fabd50a)

Co-authored-by: Andrew Svetlov <andrew.svetlov at gmail.com>

files:
A Misc/NEWS.d/next/Library/2019-06-14-13-25-56.bpo-37279.OHlW6l.rst
M Lib/asyncio/base_events.py
M Lib/test/test_asyncio/test_sendfile.py

diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py
index e0025397fa8a..90de8587a3bb 100644
--- a/Lib/asyncio/base_events.py
+++ b/Lib/asyncio/base_events.py
@@ -861,7 +861,7 @@ def _getaddrinfo_debug(self, host, port, family, type, proto, flags):
                 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 @@ def _check_sendfile_params(self, sock, file, offset, count):
                 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'):
diff --git a/Lib/test/test_asyncio/test_sendfile.py b/Lib/test/test_asyncio/test_sendfile.py
index f148fe27e6ad..3b7f784c5ee3 100644
--- a/Lib/test/test_asyncio/test_sendfile.py
+++ b/Lib/test/test_asyncio/test_sendfile.py
@@ -86,7 +86,8 @@ def connection_lost(self, exc):
 
 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
diff --git a/Misc/NEWS.d/next/Library/2019-06-14-13-25-56.bpo-37279.OHlW6l.rst b/Misc/NEWS.d/next/Library/2019-06-14-13-25-56.bpo-37279.OHlW6l.rst
new file mode 100644
index 000000000000..d740b9b62b08
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-06-14-13-25-56.bpo-37279.OHlW6l.rst
@@ -0,0 +1,2 @@
+Fix asyncio sendfile support when sendfile sends extra data in fallback
+mode.



More information about the Python-checkins mailing list