[Python-checkins] r84400 - python/branches/py3k/Modules/_ssl.c

[giampaolo.rodola]

Author: giampaolo.rodola
Date: Wed Sep  1 21:28:49 2010
New Revision: 84400

Log:
Issue #9693 - msg 115273: attempt to fix ssl module failures on certain OpenSSL versions by calling ERR_clear_error() before raising IOError

Modified:
   python/branches/py3k/Modules/_ssl.c

Modified: python/branches/py3k/Modules/_ssl.c
==============================================================================
--- python/branches/py3k/Modules/_ssl.c	(original)
+++ python/branches/py3k/Modules/_ssl.c	Wed Sep  1 21:28:49 2010
@@ -1603,6 +1603,7 @@
     PySSL_END_ALLOW_THREADS
     if (r != 1) {
         if (errno != 0) {
+            ERR_clear_error();
             PyErr_SetFromErrno(PyExc_IOError);
         }
         else {
@@ -1619,6 +1620,7 @@
     Py_XDECREF(certfile_bytes);
     if (r != 1) {
         if (errno != 0) {
+            ERR_clear_error();
             PyErr_SetFromErrno(PyExc_IOError);
         }
         else {
@@ -1686,6 +1688,7 @@
     Py_XDECREF(capath_bytes);
     if (r != 1) {
         if (errno != 0) {
+            ERR_clear_error();
             PyErr_SetFromErrno(PyExc_IOError);
         }
         else {