From: Florian Diebold <flodiebold@gmail.com>
Date: Sun, 17 Jul 2011 19:25:05 +0000 (+0200)
Subject: Send the data of the ping frame back in the pong, as specified.
X-Git-Tag: v2.1.0~78^2~3^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b202daa6e67a89d096d9cf49038835e4ee8f14f3;p=thirdparty%2Ftornado.git

Send the data of the ping frame back in the pong, as specified.
---

diff --git a/tornado/websocket.py b/tornado/websocket.py
index f23da07a2..d9c779a6e 100644
--- a/tornado/websocket.py
+++ b/tornado/websocket.py
@@ -480,7 +480,7 @@ class WebSocketProtocol8(WebSocketProtocol):
             self.stream.close()
         elif opcode == 0x9:
             # Ping
-            self._write_frame(True, 0xA, b(""))
+            self._write_frame(True, 0xA, data)
         elif opcode == 0xA:
             # Pong
             pass