Merge 181f9e8 into f324205

cyclone/websocket.py

@@ -101,7 +101,7 @@ def messageReceived(self, message):
         """Gets called when a message is received from the peer."""
         pass
 
-    def sendMessage(self, message):
+    def sendMessage(self, message, isBinary = False):
         """Sends the given message to the client of this Web Socket.
 
         The message may be either a string or a dict (which will be
@@ -112,7 +112,11 @@ def sendMessage(self, message):
         if isinstance(message, unicode):
             message = message.encode("utf-8")
         assert isinstance(message, str)
-        self.ws_protocol.sendMessage(message)
+        if isBinary:
+            code = 0x82
+        else:
+            code = 0x81
+        self.ws_protocol.sendMessage(message, code = code)
 
     def _rawDataReceived(self, data):
         self.ws_protocol.handleRawData(data)
@@ -192,8 +196,10 @@ def acceptConnection(self):
         # simply "Origin".
         if 'Origin' in self.request.headers:
             origin = self.request.headers['Origin']
-        else:
+        elif 'Sec-Websocket-Origin' in self.request.headers:
             origin = self.request.headers['Sec-Websocket-Origin']
+        else:
+            origin = "UNKNOWN"
 
         key = self.request.headers['Sec-Websocket-Key']
         accept = base64.b64encode(hashlib.sha1("%s%s" %