From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 25 Jun 2010 00:09:05 +0000 (+0000)
Subject: Merged revisions 82210 via svnmerge from
X-Git-Tag: v2.6.6rc1~175
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4f0e644bcec625d3bb7964d391ddd363083f2d1;p=thirdparty%2FPython%2Fcpython.git

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 832f7dfb817a..1bd24d32fa7b 100644
--- 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 c02703dab89d..6ed1a9fd47fb 100644
--- 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);