Some other fixups.

Author: ZeroIntensity

Lib/test/test_ssl.py

@@ -4630,6 +4630,7 @@ def test_thread_recv_while_main_thread_sends(self):
         # that the recv() call held.
         data = b"1" * 50
         event = threading.Event()
+        import time
         def background(sock):
             event.set()
             received = sock.recv(50)
@@ -4646,8 +4647,8 @@ def background(sock):
                     thread = threading.Thread(target=background,
                                               args=(sock,), daemon=True)
                     thread.start()
-                    # Use two events to prevent some race conditions here.
                     event.wait()
+                    time.sleep(0)
                     sock.sendall(b"1" * 50)
                     thread.join()
                     if cm.exc_value is not None:

Modules/_ssl.c

@@ -990,11 +990,12 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
         BIO_set_nbio(SSL_get_wbio(self->ssl), 1);
     }
 
-    // No other threads can have access to this, so no need to lock it.
+    Py_BEGIN_ALLOW_THREADS;
     if (socket_type == PY_SSL_CLIENT)
         SSL_set_connect_state(self->ssl);
     else
         SSL_set_accept_state(self->ssl);
+    Py_END_ALLOW_THREADS;
 
     self->socket_type = socket_type;
     if (sock != NULL) {