Merged revisions 80603 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r80603 | antoine.pitrou | 2010-04-29 00:57:15 +0200 (jeu., 29 avril 2010) | 3 lines

  Fix test failure with -bb
........
This commit is contained in:
Antoine Pitrou 2010-04-28 22:58:16 +00:00
parent fd3c7bdd5b
commit b199796f97
1 changed files with 2 additions and 2 deletions

View File

@ -342,14 +342,14 @@ else:
self.close()
return
elif (self.server.starttls_server and
stripped == 'STARTTLS'):
stripped == b'STARTTLS'):
if support.verbose and self.server.connectionchatty:
sys.stdout.write(" server: read STARTTLS from client, sending OK...\n")
self.write(b"OK\n")
if not self.wrap_conn():
return
elif (self.server.starttls_server and self.sslconn
and stripped == 'ENDTLS'):
and stripped == b'ENDTLS'):
if support.verbose and self.server.connectionchatty:
sys.stdout.write(" server: read ENDTLS from client, sending OK...\n")
self.write(b"OK\n")