commit 65ec8ae47fa4bb0a3c2ef815ca1b03f3519398bc
author Antoine Pitrou <solipsis@pitrou.net> Sun May 16 19:56:32 2010 +0000
committer Antoine Pitrou <solipsis@pitrou.net> Sun May 16 19:56:32 2010 +0000
tree b7cc83b7967ae302d213326f35d68ffa8bf3abc6
parent 467f28de03bea1c27c33d6c0eb214b56cc837557

Fix (hopefully) the remaining test_ssl buildbot failures

Modules/_ssl.c

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 96d79b3..39fec7b 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -1462,6 +1462,10 @@
         return NULL;
     ret = SSL_CTX_set_cipher_list(self->ctx, cipherlist);
     if (ret == 0) {
+        /* Clearing the error queue is necessary on some OpenSSL versions,
+           otherwise the error will be reported again when another SSL call
+           is done. */
+        ERR_clear_error();
         PyErr_SetString(PySSLErrorObject,
                         "No cipher can be selected.");
         return NULL;