release version

Author: matyhtf

.github/ISSUE_TEMPLATE

@@ -1,4 +1,4 @@
-Please answer these questions before submitting your issue. Thanks!
+Please answer these questions before submitting your issue.
 
 1. What did you do? If possible, provide a simple script for reproducing the error.
 

CMakeLists.txt

@@ -1,7 +1,7 @@
 PROJECT(libswoole)
 
 ENABLE_LANGUAGE(ASM)
-set(SWOOLE_VERSION 4.8.4)
+set(SWOOLE_VERSION 4.8.5)
 
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -g")

ext-src/php_swoole.cc

@@ -625,6 +625,7 @@ PHP_MINIT_FUNCTION(swoole) {
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_PACKAGE_LENGTH_TOO_LARGE", SW_ERROR_PACKAGE_LENGTH_TOO_LARGE);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_PACKAGE_LENGTH_NOT_FOUND", SW_ERROR_PACKAGE_LENGTH_NOT_FOUND);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_DATA_LENGTH_TOO_LARGE", SW_ERROR_DATA_LENGTH_TOO_LARGE);
+    SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_PACKAGE_MALFORMED_DATA", SW_ERROR_PACKAGE_MALFORMED_DATA);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_TASK_PACKAGE_TOO_BIG", SW_ERROR_TASK_PACKAGE_TOO_BIG);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_TASK_DISPATCH_FAIL", SW_ERROR_TASK_DISPATCH_FAIL);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_TASK_TIMEOUT", SW_ERROR_TASK_TIMEOUT);
@@ -652,6 +653,8 @@ PHP_MINIT_FUNCTION(swoole) {
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_WEBSOCKET_UNCONNECTED", SW_ERROR_WEBSOCKET_UNCONNECTED);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_WEBSOCKET_HANDSHAKE_FAILED", SW_ERROR_WEBSOCKET_HANDSHAKE_FAILED);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_WEBSOCKET_PACK_FAILED", SW_ERROR_WEBSOCKET_PACK_FAILED);
+    SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_WEBSOCKET_UNPACK_FAILED", SW_ERROR_WEBSOCKET_UNPACK_FAILED);
+    SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_WEBSOCKET_INCOMPLETE_PACKET", SW_ERROR_WEBSOCKET_INCOMPLETE_PACKET);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SERVER_MUST_CREATED_BEFORE_CLIENT", SW_ERROR_SERVER_MUST_CREATED_BEFORE_CLIENT);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SERVER_TOO_MANY_SOCKET", SW_ERROR_SERVER_TOO_MANY_SOCKET);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SERVER_WORKER_TERMINATED", SW_ERROR_SERVER_WORKER_TERMINATED);

include/swoole_version.h

@@ -20,10 +20,10 @@
 
 #define SWOOLE_MAJOR_VERSION 4
 #define SWOOLE_MINOR_VERSION 8
-#define SWOOLE_RELEASE_VERSION 4
+#define SWOOLE_RELEASE_VERSION 5
 #define SWOOLE_EXTRA_VERSION ""
-#define SWOOLE_VERSION "4.8.4"
-#define SWOOLE_VERSION_ID 40804
+#define SWOOLE_VERSION "4.8.5"
+#define SWOOLE_VERSION_ID 40805
 #define SWOOLE_API_VERSION_ID 0x202109a
 
 #define SWOOLE_BUG_REPORT                                                                                              \

package.xml

@@ -51,10 +51,10 @@
         <email>[email protected]</email>
         <active>yes</active>
     </developer>
-    <date>2021-12-16</date>
-    <time>17:00:00</time>
+    <date>2021-12-24</date>
+    <time>18:00:00</time>
     <version>
-        <release>4.8.4</release>
+        <release>4.8.5</release>
         <api>4.0</api>
     </version>
     <stability>
@@ -63,9 +63,8 @@
     </stability>
     <license uri="http://www.apache.org/licenses/LICENSE-2.0.html">Apache2.0</license>
     <notes>
-        - Fixed compatibility of sockets hook with PHP-8.1
-        - Fixed compatibility of Table with PHP-8.1
-        - Fixed bug #4519
+        - Revert parameter type of Table
+        - Fix crash when received wrong data with websocket protocol
     </notes>
     <contents>
         <dir name="/">
@@ -676,8 +675,6 @@
             <file role="src" name="src/server/worker.cc" />
             <file role="src" name="src/wrapper/event.cc" />
             <file role="src" name="src/wrapper/timer.cc" />
-            <file role="src" name="stubs/php_swoole_table.stub.php" />
-            <file role="src" name="stubs/php_swoole_table_arginfo.h" />
             <file role="src" name="stubs/php_swoole_table_legacy_arginfo.h" />
             <file role="src" name="swoole-logo.svg" />
             <file role="test" name="tests/CONTRIBUTION" />
@@ -2053,6 +2050,7 @@
             <file role="test" name="tests/swoole_websocket_server/get_small_requests.phpt" />
             <file role="test" name="tests/swoole_websocket_server/greeter.phpt" />
             <file role="test" name="tests/swoole_websocket_server/listener.phpt" />
+            <file role="test" name="tests/swoole_websocket_server/malformed_data.phpt" />
             <file role="test" name="tests/swoole_websocket_server/memory.phpt" />
             <file role="test" name="tests/swoole_websocket_server/message_size.phpt" />
             <file role="test" name="tests/swoole_websocket_server/onDisconnct.phpt" />

src/core/error.cc

@@ -114,6 +114,8 @@ const char *swoole_strerror(int code) {
         return "Package length not found";
     case SW_ERROR_DATA_LENGTH_TOO_LARGE:
         return "Data length too large";
+    case SW_ERROR_PACKAGE_MALFORMED_DATA:
+        return "Package malformed data";
     case SW_ERROR_TASK_PACKAGE_TOO_BIG:
         return "Task package too big";
     case SW_ERROR_TASK_DISPATCH_FAIL:
@@ -168,6 +170,10 @@ const char *swoole_strerror(int code) {
         return "Websocket handshake failed";
     case SW_ERROR_WEBSOCKET_PACK_FAILED:
         return "Websocket pack failed";
+    case SW_ERROR_WEBSOCKET_UNPACK_FAILED:
+        return "Websocket unpack failed";
+    case SW_ERROR_WEBSOCKET_INCOMPLETE_PACKET:
+        return "Websocket incomplete packet";
     case SW_ERROR_SERVER_MUST_CREATED_BEFORE_CLIENT:
         return "Server must created before client";
     case SW_ERROR_SERVER_TOO_MANY_SOCKET: