From d2d8f6e29be2d6d2a23f61d2c1af6164b0c9e958 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Thu, 2 Jan 2025 10:54:04 -0600
Subject: [PATCH 1/3] PYTHON-5019 Fix mod_wsgi tests (#2039)

---
 .evergreen/install-dependencies.sh | 3 ---
 .evergreen/scripts/ensure-hatch.sh | 4 ++++
 .evergreen/setup-spawn-host.sh     | 6 ++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.evergreen/install-dependencies.sh b/.evergreen/install-dependencies.sh
index d90ff4ab4..e6dceb33f 100755
--- a/.evergreen/install-dependencies.sh
+++ b/.evergreen/install-dependencies.sh
@@ -7,9 +7,6 @@ cp ${PROJECT_DIRECTORY}/test/certificates/* ${DRIVERS_TOOLS}/.evergreen/x509gen/
 # Replace MongoOrchestration's client certificate.
 cp ${PROJECT_DIRECTORY}/test/certificates/client.pem ${MONGO_ORCHESTRATION_HOME}/lib/client.pem
 
-# Ensure hatch is installed.
-bash ${PROJECT_DIRECTORY}/.evergreen/scripts/ensure-hatch.sh
-
 if [ -w /etc/hosts ]; then
   SUDO=""
 else
diff --git a/.evergreen/scripts/ensure-hatch.sh b/.evergreen/scripts/ensure-hatch.sh
index a57b70512..e63d98bb6 100755
--- a/.evergreen/scripts/ensure-hatch.sh
+++ b/.evergreen/scripts/ensure-hatch.sh
@@ -2,6 +2,9 @@
 
 set -eu
 
+HERE=$(dirname ${BASH_SOURCE:-$0})
+pushd "$(dirname "$(dirname $HERE)")" > /dev/null
+
 # Ensure hatch is available.
 if [ ! -x "$(command -v hatch)" ]; then
   # Install a virtual env with "hatch"
@@ -53,3 +56,4 @@ if [ ! -x "$(command -v hatch)" ]; then
   echo "Installing hatch... done."
 fi
 hatch --version
+popd > /dev/null
diff --git a/.evergreen/setup-spawn-host.sh b/.evergreen/setup-spawn-host.sh
index 4de2153d5..1a526c762 100755
--- a/.evergreen/setup-spawn-host.sh
+++ b/.evergreen/setup-spawn-host.sh
@@ -8,9 +8,11 @@ if [ -z "$1" ]
 fi
 
 target=$1
+remote_dir=/home/ec2-user/mongo-python-driver
 
 echo "Copying files to $target..."
-rsync -az -e ssh --exclude '.git' --filter=':- .gitignore' -r . $target:/home/ec2-user/mongo-python-driver
+rsync -az -e ssh --exclude '.git' --filter=':- .gitignore' -r . $target:$remote_dir
 echo "Copying files to $target... done"
 
-ssh $target /home/ec2-user/mongo-python-driver/.evergreen/scripts/setup-system.sh
+ssh $target $remote_dir/.evergreen/scripts/setup-system.sh
+ssh $target "PYTHON_BINARY=${PYTHON_BINARY:-} $remote_dir/.evergreen/scripts/ensure-hatch.sh"

From 1b3f04c59996379dbaca8ace17e1b49e88432ce3 Mon Sep 17 00:00:00 2001
From: Shane Harvey <shnhrv@gmail.com>
Date: Thu, 2 Jan 2025 10:26:33 -0800
Subject: [PATCH 2/3] PYTHON-5020 Fix behavior of network timeouts on pyopenssl
 connections (#2037)

---
 pymongo/pyopenssl_context.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pymongo/pyopenssl_context.py b/pymongo/pyopenssl_context.py
index 50d8680a7..a320e9492 100644
--- a/pymongo/pyopenssl_context.py
+++ b/pymongo/pyopenssl_context.py
@@ -125,7 +125,8 @@ class _sslConn(_SSL.Connection):
             try:
                 return call(*args, **kwargs)
             except BLOCKING_IO_ERRORS as exc:
-                if is_async:
+                # Do not retry if the connection is in non-blocking mode.
+                if is_async or timeout == 0:
                     raise exc
                 # Check for closed socket.
                 if self.fileno() == -1:

From 163514bce1c71c4f0d785575d9da5a8b4dea9141 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Thu, 2 Jan 2025 12:29:20 -0600
Subject: [PATCH 3/3] PYTHON-5016 Fix initial sync in spawn host script (#2038)

---
 .evergreen/sync-spawn-host.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.evergreen/sync-spawn-host.sh b/.evergreen/sync-spawn-host.sh
index 4c3e276d4..3d6c96890 100755
--- a/.evergreen/sync-spawn-host.sh
+++ b/.evergreen/sync-spawn-host.sh
@@ -8,6 +8,7 @@ fi
 target=$1
 
 echo "Syncing files to $target..."
+rsync -haz -e ssh --exclude '.git' --filter=':- .gitignore' -r . $target:/home/ec2-user/mongo-python-driver
 # shellcheck disable=SC2034
 fswatch -o . | while read f; do rsync -hazv -e ssh --exclude '.git' --filter=':- .gitignore' -r . $target:/home/ec2-user/mongo-python-driver; done
 echo "Syncing files to $target... done."