summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--websocket/_handshake.py6
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e7d197..8281f1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@ ChangeLog
- websocket.enableTrace not working (#455)
- AttributeError: 'module' object has no attribute 'NullHandler' (#443)
- WebSocketBadStatusException "not enough arguments for format string" (#454)
+ - handshake should deal with None in headers (#432)
- 0.48.0
diff --git a/websocket/_handshake.py b/websocket/_handshake.py
index 242b0be..d9dae47 100644
--- a/websocket/_handshake.py
+++ b/websocket/_handshake.py
@@ -113,7 +113,11 @@ def _get_handshake_headers(resource, host, port, options):
if "header" in options:
header = options["header"]
if isinstance(header, dict):
- header = map(": ".join, header.items())
+ header = [
+ ": ".join([k, v])
+ for k, v in header.items()
+ if v is not None
+ ]
headers.extend(header)
server_cookie = CookieJar.get(host)