forked from pool/python39
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
|
From 1b3f6523a5c83323cdc44031b33a1c062e5dc698 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Xi Ruoyao <xry111@xry111.site>
|
||
|
|
Date: Fri, 7 Jun 2024 23:51:32 +0800
|
||
|
|
Subject: [PATCH] gh-120226: Fix
|
||
|
|
test_sendfile_close_peer_in_the_middle_of_receiving on Linux >= 6.10
|
||
|
|
(GH-120227)
|
||
|
|
|
||
|
|
The worst case is that the kernel buffers 17 pages with a page size of 64k.
|
||
|
|
(cherry picked from commit a7584245661102a5768c643fbd7db8395fd3c90e)
|
||
|
|
|
||
|
|
Co-authored-by: Xi Ruoyao <xry111@xry111.site>
|
||
|
|
---
|
||
|
|
Lib/test/test_asyncio/test_sendfile.py | 11 ++++-------
|
||
|
|
1 file changed, 4 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
--- a/Lib/test/test_asyncio/test_sendfile.py
|
||
|
|
+++ b/Lib/test/test_asyncio/test_sendfile.py
|
||
|
|
@@ -87,13 +87,10 @@ class MyProto(asyncio.Protocol):
|
||
|
|
|
||
|
|
class SendfileBase:
|
||
|
|
|
||
|
|
- # 256 KiB plus small unaligned to buffer chunk
|
||
|
|
- # Newer versions of Windows seems to have increased its internal
|
||
|
|
- # buffer and tries to send as much of the data as it can as it
|
||
|
|
- # has some form of buffering for this which is less than 256KiB
|
||
|
|
- # on newer server versions and Windows 11.
|
||
|
|
- # So DATA should be larger than 256 KiB to make this test reliable.
|
||
|
|
- DATA = b"x" * (1024 * 256 + 1)
|
||
|
|
+ # Linux >= 6.10 seems buffering up to 17 pages of data.
|
||
|
|
+ # So DATA should be large enough to make this test reliable even with a
|
||
|
|
+ # 64 KiB page configuration.
|
||
|
|
+ DATA = b"x" * (1024 * 17 * 64 + 1)
|
||
|
|
# Reduce socket buffer size to test on relative small data sets.
|
||
|
|
BUF_SIZE = 4 * 1024 # 4 KiB
|
||
|
|
|