Merged revisions 82211 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r82211 | antoine.pitrou | 2010-06-25 02:07:34 +0200 (ven., 25 juin 2010) | 10 lines

  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 0a1dffd409e9adf8d714a6583004e504745b8225..da04708e15c02cd080c7a953cb271c1bab81a80c 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -72,6 +72,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 52fd3f96bbe7fb8e4df7bb9aaf7241758e0526fd..ecd081e726aa945e90cfb017f3fd1d565c55e7fb 100644 (file)
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -500,7 +500,6 @@ static PyObject *PySSL_SSLdo_handshake(PySSLObject *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);