···

       
1
       
1
       
-
       
From e991ac8f2037d78140e417cc9a9486223eb3e786 Mon Sep 17 00:00:00 2001

     

       
2
       
2
       
-
       
From: "J. Nick Koston" <nick@koston.org>

     

       
3
       
3
       
-
       
Date: Thu, 5 Dec 2024 22:33:03 -0600

     

       
4
       
4
       
-
       
Subject: [PATCH] gh-127655: Ensure `_SelectorSocketTransport.writelines`

     

       
5
       
5
       
-
       
 pauses the protocol if needed (#127656)

     

       
6
       
6
       
-
       


     

       
7
       
7
       
-
       
Ensure `_SelectorSocketTransport.writelines` pauses the protocol if it reaches the high water mark as needed.

     

       
8
       
8
       
-
       


     

       
9
       
9
       
-
       
Co-authored-by: Kumar Aditya <kumaraditya@python.org>

     

       
10
       
10
       
-
       


     

       
11
       
11
       
-
       
diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py

     

       
12
       
12
       
-
       
index f94bf10b4225e7..f1ab9b12d69a5d 100644

     

       
13
       
13
       
-
       
--- a/Lib/asyncio/selector_events.py

     

       
14
       
14
       
-
       
+++ b/Lib/asyncio/selector_events.py

     

       
15
       
15
       
-
       
@@ -1175,6 +1175,7 @@ def writelines(self, list_of_data):

     

       
16
       
16
       
-
       
         # If the entire buffer couldn't be written, register a write handler

     

       
17
       
17
       
-
       
         if self._buffer:

     

       
18
       
18
       
-
       
             self._loop._add_writer(self._sock_fd, self._write_ready)

     

       
19
       
19
       
-
       
+            self._maybe_pause_protocol()

     

       
20
       
20
       
-
       
 

     

       
21
       
21
       
-
       
     def can_write_eof(self):

     

       
22
       
22
       
-
       
         return True

     

       
23
       
23
       
-
       
diff --git a/Lib/test/test_asyncio/test_selector_events.py b/Lib/test/test_asyncio/test_selector_events.py

     

       
24
       
24
       
-
       
index aaeda33dd0c677..efca30f37414f9 100644

     

       
25
       
25
       
-
       
--- a/Lib/test/test_asyncio/test_selector_events.py

     

       
26
       
26
       
-
       
+++ b/Lib/test/test_asyncio/test_selector_events.py

     

       
27
       
27
       
-
       
@@ -805,6 +805,18 @@ def test_writelines_send_partial(self):

     

       
28
       
28
       
-
       
         self.assertTrue(self.sock.send.called)

     

       
29
       
29
       
-
       
         self.assertTrue(self.loop.writers)

     

       
30
       
30
       
-
       
 

     

       
31
       
31
       
-
       
+    def test_writelines_pauses_protocol(self):

     

       
32
       
32
       
-
       
+        data = memoryview(b'data')

     

       
33
       
33
       
-
       
+        self.sock.send.return_value = 2

     

       
34
       
34
       
-
       
+        self.sock.send.fileno.return_value = 7

     

       
35
       
35
       
-
       
+

     

       
36
       
36
       
-
       
+        transport = self.socket_transport()

     

       
37
       
37
       
-
       
+        transport._high_water = 1

     

       
38
       
38
       
-
       
+        transport.writelines([data])

     

       
39
       
39
       
-
       
+        self.assertTrue(self.protocol.pause_writing.called)

     

       
40
       
40
       
-
       
+        self.assertTrue(self.sock.send.called)

     

       
41
       
41
       
-
       
+        self.assertTrue(self.loop.writers)

     

       
42
       
42
       
-
       
+

     

       
43
       
43
       
-
       
     @unittest.skipUnless(selector_events._HAS_SENDMSG, 'no sendmsg')

     

       
44
       
44
       
-
       
     def test_write_sendmsg_full(self):

     

       
45
       
45
       
-
       
         data = memoryview(b'data')

     

···

       
254
       
254
       
 
       
    # (since it will do a futile invocation of gcc (!) to find

     

       
255
       
255
       
 
       
    # libuuid, slowing down program startup a lot).

     

       
256
       
256
       
 
       
    noldconfigPatch

     

       
257
       
257
       
-
       
  ] ++ optionals (!isPy312 && !isPy313) [

     

       
257
       
257
       
+
       
  ] ++ optionals (pythonOlder "3.12") [

     

       
258
       
258
       
 
       
    # https://www.cve.org/CVERecord?id=CVE-2025-0938

     

       
259
       
259
       
 
       
    ./CVE-2025-0938.patch

     

       
260
       
260
       
 
       
  ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isFreeBSD) [

     
···

       
299
       
299
       
 
       
  ] ++ optionals (pythonOlder "3.12") [

     

       
300
       
300
       
 
       
    # https://github.com/python/cpython/issues/90656

     

       
301
       
301
       
 
       
    ./loongarch-support.patch

     

       
302
       
302
       
-
       
  ] ++ optionals isPy314 [

     

       
303
       
303
       
-
       
    ./3.12/CVE-2024-12254.patch

     

       
304
       
302
       
 
       
  ] ++ optionals (pythonAtLeast "3.11" && pythonOlder "3.13") [

     

       
305
       
303
       
 
       
    # backport fix for https://github.com/python/cpython/issues/95855

     

       
306
       
304
       
 
       
    ./platform-triplet-detection.patch

     

···

       
100
       
100
       
 
       
      major = "3";

     

       
101
       
101
       
 
       
      minor = "14";

     

       
102
       
102
       
 
       
      patch = "0";

     

       
103
       
103
       
-
       
      suffix = "a4";

     

       
103
       
103
       
+
       
      suffix = "a5";

     

       
104
       
104
       
 
       
    };

     

       
105
       
105
       
-
       
    hash = "sha256-wk8HiBhzwdRgIoeVymyoyZEw4wx3PJFGPTDX6o/w5ws=";

     

       
105
       
105
       
+
       
    hash = "sha256-dOg/Jt4eT7nu8bVkks/5JQiDS7cawT9cWAQ4zp8JNoI=";

     

       
106
       
106
       
 
       
    inherit passthruFun;

     

       
107
       
107
       
 
       
  };

     

       
108
       
108
       
 
       
  # Minimal versions of Python (built without optional dependencies)