wip

Author: blink1073

pymongo/asynchronous/encryption.py

@@ -213,7 +213,7 @@ async def kms_request(self, kms_context: MongoCryptKmsContext) -> None:
                     address, exc, msg_prefix=msg_prefix, timeout_details=_get_timeout_details(opts)
                 )
             finally:
-                conn.close_conn(None)
+                await conn.close_conn(None)
         except MongoCryptError:
             raise  # Propagate MongoCryptError errors directly.
         except Exception as exc:

pymongo/network_layer.py

@@ -503,6 +503,12 @@ def connection_made(self, transport: BaseTransport) -> None:
 
     async def read(self, bytes_needed: int) -> bytes:
         """Read the requested bytes from this connection."""
+        if self.transport:
+            try:
+                self.transport.resume_reading()
+            # Known bug in SSL Protocols, fixed in Python 3.11: https://github.com/python/cpython/issues/89322
+            except AttributeError:
+                raise OSError("connection is already closed") from None
         if self.transport and self.transport.is_closing():
             raise OSError("connection is already closed")
         self._pending_reads.append(bytes_needed)
@@ -552,11 +558,11 @@ def buffer_updated(self, nbytes: int) -> None:
             buffer_remaining = len(buffer.buffer) - buffer.start_index
             # if we didn't exhaust the buffer, read the partial data and put it back.
             if buffer_remaining > n_remaining:
-                n_remaining = 0
                 output_buf[out_index : n_remaining + out_index] = buffer.buffer[
                     buffer.start_index : buffer.start_index + n_remaining
                 ]
                 buffer.start_index += n_remaining
+                n_remaining = 0
                 self._buffers.appendleft(buffer)
             # otherwise exhaust the buffer and return it to the pool.
             else: