Optimize websocket status detection, and still use onMessage callback to process events after handshake failure or closing. Fix GH-5845

Author: matyhtf

ext-src/swoole_http_response.cc

@@ -865,7 +865,7 @@ void HttpContext::end(zval *zdata, zval *return_value) {
                 conn->websocket_status = websocket::STATUS_ACTIVE;
             } else {
                 /* connection should be closed when handshake failed */
-                conn->websocket_status = websocket::STATUS_NONE;
+                conn->websocket_status = websocket::STATUS_HANDSHAKE_FAILED;
                 keepalive = 0;
             }
         }

ext-src/swoole_http_server.cc

@@ -69,7 +69,7 @@ int php_swoole_http_server_onReceive(Server *serv, RecvData *req) {
         return php_swoole_server_onReceive(serv, req);
     }
     // websocket client
-    if (conn->websocket_status == WebSocket::STATUS_ACTIVE) {
+    if (conn->websocket_status >= WebSocket::STATUS_HANDSHAKE) {
         return swoole_websocket_onMessage(serv, req);
     }
 

ext-src/swoole_websocket_server.cc

@@ -650,6 +650,7 @@ void php_swoole_websocket_server_minit(int module_number) {
     SW_REGISTER_LONG_CONSTANT("WEBSOCKET_STATUS_FRAME", WebSocket::STATUS_ACTIVE);
     SW_REGISTER_LONG_CONSTANT("WEBSOCKET_STATUS_ACTIVE", WebSocket::STATUS_ACTIVE);
     SW_REGISTER_LONG_CONSTANT("WEBSOCKET_STATUS_CLOSING", WebSocket::STATUS_CLOSING);
+    SW_REGISTER_LONG_CONSTANT("WEBSOCKET_STATUS_HANDSHAKE_FAILED", WebSocket::STATUS_HANDSHAKE_FAILED);
     // all opcodes
     SW_REGISTER_LONG_CONSTANT("WEBSOCKET_OPCODE_CONTINUATION", WebSocket::OPCODE_CONTINUATION);
     SW_REGISTER_LONG_CONSTANT("WEBSOCKET_OPCODE_TEXT", WebSocket::OPCODE_TEXT);

include/swoole_websocket.h

@@ -40,6 +40,7 @@ enum Status {
     STATUS_HANDSHAKE = 2,
     STATUS_ACTIVE = 3,
     STATUS_CLOSING = 4,
+	STATUS_HANDSHAKE_FAILED = 5,
 };
 
 enum Flag {