[Python-checkins] r82213 - in python/branches/release31-maint: Misc/NEWS Modules/_ssl.c

[antoine.pitrou]

Author: antoine.pitrou
Date: Fri Jun 25 02:13:19 2010
New Revision: 82213

Log:
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.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Misc/NEWS
   python/branches/release31-maint/Modules/_ssl.c

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Fri Jun 25 02:13:19 2010
@@ -72,6 +72,9 @@
 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.

Modified: python/branches/release31-maint/Modules/_ssl.c
==============================================================================
--- python/branches/release31-maint/Modules/_ssl.c	(original)
+++ python/branches/release31-maint/Modules/_ssl.c	Fri Jun 25 02:13:19 2010
@@ -500,7 +500,6 @@
     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);