Release version 4.8.7

swoole · Feb 18, 2022 · 1fb0fce · 1fb0fce
1 parent 5eac78a
commit 1fb0fce
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 PROJECT(libswoole)
 
 ENABLE_LANGUAGE(ASM)
-set(SWOOLE_VERSION 4.8.6)
+set(SWOOLE_VERSION 4.8.7)
 
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -g")

diff --git a/ext-src/php_swoole.cc b/ext-src/php_swoole.cc
@@ -667,6 +667,7 @@ PHP_MINIT_FUNCTION(swoole) {
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SERVER_INVALID_REQUEST", SW_ERROR_SERVER_INVALID_REQUEST);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SERVER_CONNECT_FAIL", SW_ERROR_SERVER_CONNECT_FAIL);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SERVER_INVALID_COMMAND", SW_ERROR_SERVER_INVALID_COMMAND);
+    SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SERVER_IS_NOT_REGULAR_FILE", SW_ERROR_SERVER_IS_NOT_REGULAR_FILE);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SERVER_WORKER_EXIT_TIMEOUT", SW_ERROR_SERVER_WORKER_EXIT_TIMEOUT);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SERVER_WORKER_ABNORMAL_PIPE_DATA", SW_ERROR_SERVER_WORKER_ABNORMAL_PIPE_DATA);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SERVER_WORKER_UNPROCESSED_DATA", SW_ERROR_SERVER_WORKER_UNPROCESSED_DATA);

diff --git a/include/swoole_version.h b/include/swoole_version.h
@@ -20,10 +20,10 @@
 
 #define SWOOLE_MAJOR_VERSION 4
 #define SWOOLE_MINOR_VERSION 8
-#define SWOOLE_RELEASE_VERSION 6
+#define SWOOLE_RELEASE_VERSION 7
 #define SWOOLE_EXTRA_VERSION ""
-#define SWOOLE_VERSION "4.8.6"
-#define SWOOLE_VERSION_ID 40806
+#define SWOOLE_VERSION "4.8.7"
+#define SWOOLE_VERSION_ID 40807
 #define SWOOLE_API_VERSION_ID 0x202109a
 
 #define SWOOLE_BUG_REPORT                                                                                              \

diff --git a/package.xml b/package.xml
@@ -51,10 +51,10 @@
         <email>[email protected]</email>
         <active>yes</active>
     </developer>
-    <date>2022-01-11</date>
-    <time>18:00:00</time>
+    <date>2022-02-18</date>
+    <time>14:00:00</time>
     <version>
-        <release>4.8.6</release>
+        <release>4.8.7</release>
         <api>4.0</api>
     </version>
     <stability>
@@ -63,8 +63,10 @@
     </stability>
     <license uri="http://www.apache.org/licenses/LICENSE-2.0.html">Apache2.0</license>
     <notes>
-        - Added prefix to boost/context API names
-        - Optimized configure options
+        - Added curl_share supports
+        - Fixed symbol undefined on arm32 platform
+        - Fixed clock_gettime() compatibility
+        - Fixed issue where server sending fails with PROCESS mode when kernel lacks large block of memory
     </notes>
     <contents>
         <dir name="/">
@@ -1137,6 +1139,8 @@
             <file role="test" name="tests/swoole_curl/setopt/header_out.phpt" />
             <file role="test" name="tests/swoole_curl/setopt/infile.phpt" />
             <file role="test" name="tests/swoole_curl/setopt/nobody.phpt" />
+            <file role="test" name="tests/swoole_curl/share/1.phpt" />
+            <file role="test" name="tests/swoole_curl/share/5.phpt" />
             <file role="test" name="tests/swoole_curl/sleep.phpt" />
             <file role="test" name="tests/swoole_curl/ssl/version.phpt" />
             <file role="test" name="tests/swoole_curl/symfony-noco.phpt" />
@@ -1362,6 +1366,8 @@
             <file role="test" name="tests/swoole_http_server/send_empty_file.phpt" />
             <file role="test" name="tests/swoole_http_server/send_yield.phpt" />
             <file role="test" name="tests/swoole_http_server/sendfile.phpt" />
+            <file role="test" name="tests/swoole_http_server/sendfile_dir.phpt" />
+            <file role="test" name="tests/swoole_http_server/sendfile_link.phpt" />
             <file role="test" name="tests/swoole_http_server/sendfile_no_keepalive.phpt" />
             <file role="test" name="tests/swoole_http_server/sendfile_with_dispatch_mode_7.phpt" />
             <file role="test" name="tests/swoole_http_server/sendfile_with_ssl.phpt" />
@@ -1847,6 +1853,7 @@
             <file role="test" name="tests/swoole_server/sendMessage_02.phpt" />
             <file role="test" name="tests/swoole_server/sendMessage_in_manager.phpt" />
             <file role="test" name="tests/swoole_server/send_2.phpt" />
+            <file role="test" name="tests/swoole_server/send_2m.phpt" />
             <file role="test" name="tests/swoole_server/send_2m_in_task_worker.phpt" />
             <file role="test" name="tests/swoole_server/send_2m_in_user_process.phpt" />
             <file role="test" name="tests/swoole_server/send_3.phpt" />

diff --git a/src/core/error.cc b/src/core/error.cc
@@ -198,6 +198,8 @@ const char *swoole_strerror(int code) {
         return "Server connect fail";
     case SW_ERROR_SERVER_INVALID_COMMAND:
         return "Server invalid command";
+    case SW_ERROR_SERVER_IS_NOT_REGULAR_FILE:
+        return "Server is not regular file";
     case SW_ERROR_SERVER_WORKER_EXIT_TIMEOUT:
         return "Server worker exit timeout";
     case SW_ERROR_SERVER_WORKER_ABNORMAL_PIPE_DATA:

diff --git a/tests/swoole_curl/share/1.phpt b/tests/swoole_curl/share/1.phpt
@@ -1,5 +1,7 @@
 --TEST--
-Basic curl_share test
+swoole_curl/share: Basic curl_share test
+--SKIPIF--
+<?php require __DIR__ . '/../../include/skipif.inc'; ?>
 --FILE--
 <?php
 require __DIR__ . '/../../include/bootstrap.php';

diff --git a/tests/swoole_curl/share/5.phpt b/tests/swoole_curl/share/5.phpt
@@ -1,5 +1,7 @@
 --TEST--
-Basic curl_share test
+swoole_curl/share: Basic curl_share test
+--SKIPIF--
+<?php require __DIR__ . '/../../include/skipif.inc'; ?>
 --FILE--
 <?php
 require __DIR__ . '/../../include/bootstrap.php';