From: Ben Darnell <ben@bendarnell.com>
Date: Tue, 21 Feb 2017 00:22:58 +0000 (-0500)
Subject: Merge commit 'pull/origin/1938' into ws-ping
X-Git-Tag: v4.5.0~30^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4215304d8ff0ba55a0aee7783d9e11f22cfe460;p=thirdparty%2Ftornado.git

Merge commit 'pull/origin/1938' into ws-ping
---

a4215304d8ff0ba55a0aee7783d9e11f22cfe460
diff --cc tornado/websocket.py
index 3f9c5f5d0,1d89b73d8..dcd7e73a3
--- a/tornado/websocket.py
+++ b/tornado/websocket.py
@@@ -867,9 -856,9 +881,10 @@@ class WebSocketProtocol13(WebSocketProt
          elif opcode == 0x9:
              # Ping
              self._write_frame(True, 0xA, data)
+             self._run_callback(self.handler.on_ping, data)
          elif opcode == 0xA:
              # Pong
 +            self.last_pong = IOLoop.current().time()
              self._run_callback(self.handler.on_pong, data)
          else:
              self._abort()