Merged revisions 82210 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82210 | antoine.pitrou | 2010-06-25 02:03:21 +0200 (ven., 25 juin 2010) | 4 lines

  Issue #9075: In the ssl module, remove the setting of a `debug` flag
  on an OpenSSL structure.
........

diff --git a/Misc/NEWS b/Misc/NEWS
index 832f7dfb817ae0924bbe456f5e607f6a136548fd..1bd24d32fa7bdc4730e2221c0cdb1a6827338d98 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -73,6 +73,9 @@ C-API
 Library
 -------
 
+- Issue #9075: In the ssl module, remove the setting of a ``debug`` flag
+  on an OpenSSL structure.
+
 - Issue #5610: feedparser no longer eats extra characters at the end of
   a body part if the body part ends with a \r\n.
 

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index c02703dab89d515e1a172de0681371f5257df0db..6ed1a9fd47fbac65c2f996de77e2ccb75cd5d0fc 100644 (file)
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -488,7 +488,6 @@ static PyObject *PySSL_SSLdo_handshake(PySSLObject *self)
     } while (err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE);
     if (ret < 1)
         return PySSL_SetError(self, ret, __FILE__, __LINE__);
-    self->ssl->debug = 1;
 
     if (self->peer_cert)
         X509_free (self->peer_cert);