From 4b261d20735b4c868f5efe6b18aaaf747fdbe982 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Fri, 25 Jun 2010 00:13:19 +0000 Subject: [PATCH] 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. ........ ................ --- Misc/NEWS | 3 +++ Modules/_ssl.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index 0a1dffd409e..da04708e15c 100644 --- 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 52fd3f96bbe..ecd081e726a 100644 --- 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);