Merge branch 'master' of https://github.com/louisliutw/websocket-client into louisliutw-master

1 files changed, 4 insertions, 1 deletions

diff --git a/websocket/__init__.py b/websocket/__init__.py
index d5efe4b..c10a241 100644
--- a/websocket/__init__.py
+++ b/websocket/__init__.py
@@ -490,7 +490,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)
@@ -555,6 +555,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)