← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/smart.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/smart.py
518
518
 
519
519
    def accept_and_serve(self):
520
520
        conn, client_addr = self._server_socket.accept()
 
521
        # For WIN32, where the timeout value from the listening socket
 
522
        # propogates to the newly accepted socket.
 
523
        conn.setblocking(True)
521
524
        conn.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
522
525
        from_client = conn.makefile('r')
523
526
        to_client = conn.makefile('w')