Skip to content

Commit 155a09d

Browse files
committed
never liked the pseudo shortcut this was. Also deactivating nagle's algorithm as I believe it doesn't help most of the time with short websocket messages
1 parent 2d21b86 commit 155a09d

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

ws4py/client/__init__.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,14 @@
1313
__all__ = ['WebSocketBaseClient']
1414

1515
class WebSocketBaseClient(WebSocket):
16-
def __init__(self, url, protocols, extensions, heartbeat_freq=None):
16+
def __init__(self, url, protocols=None, extensions=None, heartbeat_freq=None):
1717
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, 0)
18-
WebSocket.__init__(self, sock, protocols=protocols, extensions=extensions,
18+
19+
sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
20+
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
21+
22+
WebSocket.__init__(self, sock, protocols=protocols,
23+
extensions=extensions,
1924
heartbeat_freq=heartbeat_freq)
2025
self.stream.always_mask = True
2126
self.stream.expect_masking = False
@@ -70,7 +75,7 @@ def _parse_url(self):
7075
def close(self, code=1000, reason=''):
7176
if not self.client_terminated:
7277
self.client_terminated = True
73-
self.sender(self.stream.close(code=code, reason=reason).single(mask=True))
78+
self.sock.sendall(self.stream.close(code=code, reason=reason).single(mask=True))
7479

7580
def connect(self):
7681
#self.sock.settimeout(3)
@@ -81,7 +86,7 @@ def connect(self):
8186

8287
self.sock.connect((self.host, int(self.port)))
8388

84-
self.sender(self.handshake_request)
89+
self.sock.sendall(self.handshake_request)
8590

8691
response = enc('')
8792
doubleCLRF = enc('\r\n\r\n')

0 commit comments

Comments
 (0)