From d575e571fda1786c7517e867abbb3b933de19144 Mon Sep 17 00:00:00 2001
From: Joel Martin <github@martintribe.org>
Date: Tue, 14 Aug 2012 15:12:48 -0500
Subject: [PATCH] Fix split out handshake parsing for Hixie.

Need the scheme to be accessible when constructing the response for
Hixie clients.
---
 websocket.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/websocket.py b/websocket.py
index 96156b9..11f718c 100644
--- a/websocket.py
+++ b/websocket.py
@@ -618,7 +618,7 @@ Sec-WebSocket-Accept: %s\r
             self.base64 = True
 
             response = self.server_handshake_hixie % (pre,
-                    h['Origin'], pre, scheme, h['Host'], path)
+                    h['Origin'], pre, self.scheme, h['Host'], path)
 
             if 'base64' in protocols:
                 response += "%sWebSocket-Protocol: base64\r\n" % pre
@@ -690,7 +690,7 @@ Sec-WebSocket-Accept: %s\r
                 else:
                     raise
 
-            scheme = "wss"
+            self.scheme = "wss"
             stype = "SSL/TLS (wss://)"
 
         elif self.ssl_only:
@@ -698,7 +698,7 @@ Sec-WebSocket-Accept: %s\r
 
         else:
             retsock = sock
-            scheme = "ws"
+            self.scheme = "ws"
             stype = "Plain non-SSL (ws://)"
 
         wsh = WSRequestHandler(retsock, address, not self.web)