diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-06-25 00:13:19 +0000 |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-06-25 00:13:19 +0000 |
| commit | 4b261d20735b4c868f5efe6b18aaaf747fdbe982 (patch) | |
| tree | 643db40155c79a4805d22538f27c16a3c97388d8 | |
| parent | eb8e851c1ddd10ad4531e52cef52bc4494b3e7fe (diff) | |
| download | cpython-git-4b261d20735b4c868f5efe6b18aaaf747fdbe982.tar.gz | |
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.
........
................
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/_ssl.c | 1 |
2 files changed, 3 insertions, 1 deletions
@@ -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 52fd3f96bb..ecd081e726 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); |