Merge pull request #506 from Torxed/master

1 files changed, 10 insertions, 2 deletions

diff --git a/websocket/_handshake.py b/websocket/_handshake.py
index 8740fef..809a8c9 100644
--- a/websocket/_handshake.py
+++ b/websocket/_handshake.py
@@ -115,8 +115,16 @@ def _get_handshake_headers(resource, host, port, options):
             headers.append("Origin: http://%s" % hostport)
 
     key = _create_sec_websocket_key()
-    headers.append("Sec-WebSocket-Key: %s" % key)
-    headers.append("Sec-WebSocket-Version: %s" % VERSION)
+    
+    # Append Sec-WebSocket-Key & Sec-WebSocket-Version if not manually specified
+    if not 'header' in options or 'Sec-WebSocket-Key' not in options['header']:
+        key = _create_sec_websocket_key()
+        headers.append("Sec-WebSocket-Key: %s" % key)
+    else:
+        key = options['header']['Sec-WebSocket-Key']
+
+    if not 'header' in options or 'Sec-WebSocket-Version' not in options['header']:
+        headers.append("Sec-WebSocket-Version: %s" % VERSION)
 
     subprotocols = options.get("subprotocols")
     if subprotocols: