Merge branch 'fwiesel-python3.4-on-macos'

This commit is contained in:
Tatsuhiro Tsujikawa 2015-05-26 00:48:42 +09:00
commit cbb10aa80f
1 changed files with 4 additions and 1 deletions

View File

@ -1238,7 +1238,10 @@ if asyncio:
self.transport = transport
sock = self.transport.get_extra_info('socket')
sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
try:
sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
except OSError as e:
logging.info('failed to set tcp-nodelay: %s', str(e))
ssl_ctx = self.transport.get_extra_info('sslcontext')
if ssl_ctx:
protocol = sock.selected_npn_protocol()