From eed887b478d259503995d2e48122e9ff6a6fc4bf Mon Sep 17 00:00:00 2001 From: Louis Liu Date: Wed, 7 May 2014 16:56:18 +0800 Subject: send cookie in options. example: create_connection(url, cookie="name=kerker; age=23;") --- websocket/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/websocket/__init__.py b/websocket/__init__.py index 397381d..51b39da 100644 --- a/websocket/__init__.py +++ b/websocket/__init__.py @@ -554,6 +554,9 @@ class WebSocket(object): else: headers.append("Origin: http://%s" % hostport) + if "cookie" in options: + headers.append("Cookie: %s" % options["cookie"]) + key = _create_sec_websocket_key() headers.append("Sec-WebSocket-Key: %s" % key) headers.append("Sec-WebSocket-Version: %s" % VERSION) -- cgit v1.2.1 From c1a5d0d04cdbe5b54e88838828daadf7196a7cb8 Mon Sep 17 00:00:00 2001 From: Louis Liu Date: Wed, 7 May 2014 17:53:41 +0800 Subject: Bug fix: socket always connects to port 80. --- websocket/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/websocket/__init__.py b/websocket/__init__.py index 51b39da..cfa6f87 100644 --- a/websocket/__init__.py +++ b/websocket/__init__.py @@ -489,7 +489,7 @@ class WebSocket(object): hostname, port, resource, is_secure = _parse_url(url) proxy_host, proxy_port = options.get("http_proxy_host", None), options.get("http_proxy_port", 0) if not proxy_host: - addrinfo_list = socket.getaddrinfo(hostname, 80, 0, 0, socket.SOL_TCP) + addrinfo_list = socket.getaddrinfo(hostname, port, 0, 0, socket.SOL_TCP) else: proxy_port = proxy_port and proxy_port or 80 addrinfo_list = socket.getaddrinfo(proxy_host, proxy_port, 0, 0, socket.SOL_TCP) @@ -506,6 +506,7 @@ class WebSocket(object): self.sock.setsockopt(*opts) # TODO: we need to support proxy address = addrinfo_list[0][4] + print(address) self.sock.connect(address) if proxy_host: -- cgit v1.2.1 From a7c9d807b6e81bde0ec587649cfdd2ec4a924081 Mon Sep 17 00:00:00 2001 From: Louis Liu Date: Wed, 7 May 2014 17:56:17 +0800 Subject: remove debug codes.. --- websocket/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/websocket/__init__.py b/websocket/__init__.py index cfa6f87..41474bf 100644 --- a/websocket/__init__.py +++ b/websocket/__init__.py @@ -506,7 +506,6 @@ class WebSocket(object): self.sock.setsockopt(*opts) # TODO: we need to support proxy address = addrinfo_list[0][4] - print(address) self.sock.connect(address) if proxy_host: -- cgit v1.2.1