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 1073cd6b57925020840163c26b623078b1b0b721..b099046cee0facf705718f126cb59afbb7861077 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -454,6 +454,9 @@ C-API
 Library
 -------
 
+- Issue #9075: In the ssl module, remove the setting of a ``debug`` flag
+  on an OpenSSL structure.
+
 - Issue #8682: The ssl module now temporary increments the reference count of
   a socket object got through ``PyWeakref_GetObject``, so as to avoid possible
   deallocation while the object is still being used.

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 31bf6263683b5f08f05c0625f4e7f280fc21c99e..5428c7a8b87a5957afa881e36480e7c9e4dece3f 100644 (file)
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -380,7 +380,6 @@ static PyObject *PySSL_SSLdo_handshake(PySSLSocket *self)
     Py_DECREF(sock);
     if (ret < 1)
         return PySSL_SetError(self, ret, __FILE__, __LINE__);
-    self->ssl->debug = 1;
 
     if (self->peer_cert)
         X509_free (self->peer_cert);