diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-06-25 00:07:34 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-06-25 00:07:34 (GMT) |
| commit | 6186bfb735c90c22035d8b29a0e97ae39bd12d5b (patch) | |
| tree | a6c7a2513e854a7f52979b930f911d41c3c391f1 | |
| parent | 25e8ec47244b405083b5fe7b353560666cabff44 (diff) | |
| download | cpython-6186bfb735c90c22035d8b29a0e97ae39bd12d5b.zip cpython-6186bfb735c90c22035d8b29a0e97ae39bd12d5b.tar.gz cpython-6186bfb735c90c22035d8b29a0e97ae39bd12d5b.tar.bz2 | |
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
@@ -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 31bf626..5428c7a 100644 --- 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); |