diff options
| author | Andrew Svetlov <andrew.svetlov@gmail.com> | 2019-06-15 14:56:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-15 14:56:27 +0300 |
| commit | e5d67f1e31381d28b24f6e1c0f8388d9bf0bfc5f (patch) | |
| tree | 372af80a729cbe0871dac49360b63bdd3ebc7a06 | |
| parent | 30cac20101717e7cbb13db470787f8437bd98b04 (diff) | |
| download | cpython-git-e5d67f1e31381d28b24f6e1c0f8388d9bf0bfc5f.tar.gz | |
[3.7] bpo-37279: Fix asyncio sendfile support when extra data are sent in fallback mode. (GH-14075). (GH-14103)
(cherry picked from commit ef2152354f03a165c5e3adb53e2276934fabd50a)
Co-authored-by: Andrew Svetlov <andrew.svetlov@gmail.com>
| -rw-r--r-- | Lib/asyncio/base_events.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_asyncio/test_events.py | 3 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2019-06-14-13-25-56.bpo-37279.OHlW6l.rst | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py index a9660ca108..52134372fa 100644 --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -827,7 +827,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: @@ -1082,7 +1082,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'): diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py index 9466111b8e..d2c1d7c8a6 100644 --- a/Lib/test/test_asyncio/test_events.py +++ b/Lib/test/test_asyncio/test_events.py @@ -2117,7 +2117,8 @@ class SubprocessTestsMixin: 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 0000000000..d740b9b62b --- /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. |