Browse Source

fix logic in websocket server

Change-Id: I60353524c9262f32f926414e943f7a71d6ff76e0
zhangyuanlong 2 years ago
parent
commit
8a50d359e7

+ 1 - 1
Chapter06/code/WebSocketServer/net/EventLoop.cpp

@@ -44,7 +44,7 @@ currentActiveChannel_(NULL)
     createWakeupfd();
     
 #ifdef WIN32
-    wakeupChannel_.reset(new Channel(this, wakeupFdSend_));
+    wakeupChannel_.reset(new Channel(this, wakeupFdRecv_));
     poller_.reset(new SelectPoller(this));
     
 #else

+ 3 - 1
Chapter06/code/WebSocketServer/websocketsrc/MyWebSocketSession.cpp

@@ -445,7 +445,9 @@ void MyWebSocketSession::makeUpgradeResponse(const char* secWebSocketAccept, std
     response += "Connection: Upgrade\r\n"
                 "Sec-WebSocket-Version: 13\r\n";
     if (m_bClientCompressed)
-        response += "Sec-WebSocket-Extensions: permessage-deflate; client_no_context_takeover\r\nDate: ";
+        response += "Sec-WebSocket-Extensions: permessage-deflate; client_no_context_takeover\r\n";
+
+    response += "Date: ";
 
     char szNow[64];
     time_t now = time(NULL);