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:
parent
fd3c7bdd5b
commit
b199796f97
|
@ -342,14 +342,14 @@ else:
|
||||||
self.close()
|
self.close()
|
||||||
return
|
return
|
||||||
elif (self.server.starttls_server and
|
elif (self.server.starttls_server and
|
||||||
stripped == 'STARTTLS'):
|
stripped == b'STARTTLS'):
|
||||||
if support.verbose and self.server.connectionchatty:
|
if support.verbose and self.server.connectionchatty:
|
||||||
sys.stdout.write(" server: read STARTTLS from client, sending OK...\n")
|
sys.stdout.write(" server: read STARTTLS from client, sending OK...\n")
|
||||||
self.write(b"OK\n")
|
self.write(b"OK\n")
|
||||||
if not self.wrap_conn():
|
if not self.wrap_conn():
|
||||||
return
|
return
|
||||||
elif (self.server.starttls_server and self.sslconn
|
elif (self.server.starttls_server and self.sslconn
|
||||||
and stripped == 'ENDTLS'):
|
and stripped == b'ENDTLS'):
|
||||||
if support.verbose and self.server.connectionchatty:
|
if support.verbose and self.server.connectionchatty:
|
||||||
sys.stdout.write(" server: read ENDTLS from client, sending OK...\n")
|
sys.stdout.write(" server: read ENDTLS from client, sending OK...\n")
|
||||||
self.write(b"OK\n")
|
self.write(b"OK\n")
|
||||||
|
|
Loading…
Reference in New Issue