Merge pull request #883 from Eximius/master

Fix Websocket pinging.
vibe-d · Oct 27, 2014 · 9264360 · 9264360
2 parents c1eaad3 + 537dfb4
commit 9264360
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/source/vibe/http/websockets.d b/source/vibe/http/websockets.d
@@ -503,8 +503,12 @@ final class IncomingWebSocketMessage : InputStream {
 					m_currentFrame = frame;
 					break;
 				case FrameOpcode.ping:
-					frame.opcode = FrameOpcode.pong;
-					frame.writeFrame(m_conn);
+					Frame pong;
+					pong.opcode = FrameOpcode.pong;
+					pong.fin = true;
+					pong.payload = frame.payload;
+
+					pong.writeFrame(m_conn);
 					break;
 				default:
 					throw new WebSocketException("unknown frame opcode");