← Back to branch summary

~ubuntu-branches/ubuntu/natty/python2.6/natty-security

« back to all changes in this revision

Viewing changes to Modules/_ssl.c

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-07-02 10:54:17 UTC
  • mfrom: (10.1.21 sid)
  • Revision ID: james.westby@ubuntu.com-20100702105417-3a70t966vh62djgg
Tags: 2.6.5+20100628-2ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Priority for python2.6-minimal is required instead of optional
  - python2.6-minimal and python2.6 Conflict python-central
    (<< 0.6.11ubuntu6)

Show diffs side-by-side

added added

removed removed

Lines of Context:
Modules/_ssl.c
488
488
    } while (err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE);
489
489
    if (ret < 1)
490
490
        return PySSL_SetError(self, ret, __FILE__, __LINE__);
491
 
    self->ssl->debug = 1;
492
491
 
493
492
    if (self->peer_cert)
494
493
        X509_free (self->peer_cert);