Update version for Swoole 4.4.8

swoole · Oct 15, 2019 · 9719296 · 9719296
1 parent 91a9e03
commit 9719296
Show file tree

Hide file tree

Showing 18 changed files with 61 additions and 52 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 PROJECT(libswoole)
 
 ENABLE_LANGUAGE(ASM)
-SET(SWOOLE_VERSION 4.4.7)
+SET(SWOOLE_VERSION 4.4.8)
 SET(SWOOLE_CLFLAGS pthread rt dl ssl crypt crypto)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")

diff --git a/include/swoole.h b/include/swoole.h
@@ -107,8 +107,8 @@ int clock_gettime(clock_id_t which_clock, struct timespec *t);
 #define SWOOLE_MAJOR_VERSION      4
 #define SWOOLE_MINOR_VERSION      4
 #define SWOOLE_RELEASE_VERSION    8
-#define SWOOLE_EXTRA_VERSION      "alpha"
-#define SWOOLE_VERSION            "4.4.7-alpha"
+#define SWOOLE_EXTRA_VERSION      ""
+#define SWOOLE_VERSION            "4.4.8"
 #define SWOOLE_VERSION_ID         40408
 #define SWOOLE_BUG_REPORT \
     "A bug occurred in Swoole-v" SWOOLE_VERSION ", please report it.\n"\

diff --git a/library/core/Constant.php b/library/core/Constant.php
@@ -40,6 +40,7 @@ class Constant
     const OPTION_ENABLE_COROUTINE = 'enable_coroutine';
     const OPTION_ENABLE_REUSE_PORT = 'enable_reuse_port';
     const OPTION_SSL_METHOD = 'ssl_method';
+    const OPTION_SSL_PROTOCOLS = 'ssl_protocols';
     const OPTION_SSL_COMPRESS = 'ssl_compress';
     const OPTION_SSL_CERT_FILE = 'ssl_cert_file';
     const OPTION_SSL_KEY_FILE = 'ssl_key_file';
@@ -119,9 +120,9 @@ class Constant
     const OPTION_WORKER_NUM = 'worker_num';
     const OPTION_MAX_WAIT_TIME = 'max_wait_time';
     const OPTION_MAX_CORO_NUM = 'max_coro_num';
-    const OPTION_SEND_YIELD = 'send_yield';
     const OPTION_SEND_TIMEOUT = 'send_timeout';
     const OPTION_DISPATCH_MODE = 'dispatch_mode';
+    const OPTION_SEND_YIELD = 'send_yield';
     const OPTION_DISPATCH_FUNC = 'dispatch_func';
     const OPTION_LOG_FILE = 'log_file';
     const OPTION_DISCARD_TIMEOUT_REQUEST = 'discard_timeout_request';
@@ -130,9 +131,6 @@ class Constant
     const OPTION_TASK_USE_OBJECT = 'task_use_object';
     const OPTION_TASK_ENABLE_COROUTINE = 'task_enable_coroutine';
     const OPTION_TASK_WORKER_NUM = 'task_worker_num';
-    const OPTION_TRACE_EVENT_WORKER = 'trace_event_worker';
-    const OPTION_REQUEST_SLOWLOG_TIMEOUT = 'request_slowlog_timeout';
-    const OPTION_REQUEST_SLOWLOG_FILE = 'request_slowlog_file';
     const OPTION_TASK_IPC_MODE = 'task_ipc_mode';
     const OPTION_TASK_TMPDIR = 'task_tmpdir';
     const OPTION_TASK_MAX_REQUEST = 'task_max_request';

diff --git a/package.xml b/package.xml
@@ -42,10 +42,10 @@
         <email>[email protected]</email>
         <active>yes</active>
     </developer>
-    <date>2019-09-25</date>
-    <time>16:00:00</time>
+    <date>2019-10-15</date>
+    <time>20:00:00</time>
     <version>
-        <release>4.4.7</release>
+        <release>4.4.8</release>
         <api>4.0</api>
     </version>
     <stability>
@@ -54,17 +54,36 @@
     </stability>
     <license uri="http://www.apache.org/licenses/LICENSE-2.0.html">Apache2.0</license>
     <notes>
+        Deprecated
+        ---
+        - Move async Swoole\Client to [ext-async](https://github.com/swoole/ext-async)
+
         Enhancement
         ---
-        + Support thread context (9214411c) (@matyhtf)
-        + Generate a warning if the channel has producers or consumers when the program exits (b9f37d9c) (@twose)
+        + Support Http\Response close (#2861) (@matyhtf)
+        + Support Process::daemon() redirection of IO (#2871) (@matyhtf)
+        * Add Swoole\Server\Task::pack (#2872) (#2874) (@matyhtf)
+        + Support ssl_protocols option (74499276) (@matyhtf)
+        + Add document of bug reports (ba1c078f) (@twose)
 
         Fixed
         ---
-        * Fixed reactor send bug (a1dc95f5) (@matyhtf)
-        * Fixed event init bug (907c84b3) (@matyhtf)
-        * Fixed crash on Cygwin (cfb74793) (@matyhtf)
-        * Fixed wrong length of string (c4f97993) (@twose)
+        * Fixed random bytes added to response status code (#2856) (@twose)
+        * Fixed naming conflicts with php gdbinit (2a2447ec) (@shiguangqi)
+        * Fixed build without PCRE JIT on OSX (2a4c447e) (@twose)
+        * Fixed Websocket\Server class entry of property declaration (1f197daf) (@twose)
+        * Fixed coroutine bound error checker of Co\Http\Client (2619cdd8) (@twose)
+        * Fixed gdb debugger in docker (ec815288) (@twose)
+        * Fixed MySQL close error (#2869) (@twose)
+        * Fixed Cygwin with process (#2868) (#2876) (@matyhtf)
+        * Fixed tls_host_name not found (d1968c26) (@twose)
+        * Fixed SSL renegotiation (#2847) (d8b87ebb) (@matyhtf)
+        * Fixed HTTP2 client empty data (37b12d72) (775aefed) (@twose)
+        * Fixed send yield hang (#2885) (@matyhtf) (@twose)
+        * Fixed null fci_cache (#2881) (@twose)
+        * Fixed server mode on CYGWIN (#2868) (@matyhtf)
+        * Fixed select null (5e23dd96) (@twose)
+        * Fixed #2643 #2868 (#2888) (@matyhtf)
     </notes>
     <contents>
         <dir name="/">
@@ -261,6 +280,7 @@
             <file role="doc" name="examples/coroutine/util/resume003.php" />
             <file role="doc" name="examples/coroutine/waitgroup.php" />
             <file role="doc" name="examples/coroutine/websocket/client.php" />
+            <file role="doc" name="examples/coroutine/websocket/co_server.php" />
             <file role="doc" name="examples/coroutine/websocket/server.php" />
             <file role="doc" name="examples/cpp/co.cc" />
             <file role="doc" name="examples/cpp/mt_co.cc" />
@@ -331,6 +351,7 @@
             <file role="doc" name="examples/process/client.php" />
             <file role="doc" name="examples/process/client3.php" />
             <file role="doc" name="examples/process/close.php" />
+            <file role="doc" name="examples/process/daemon.php" />
             <file role="doc" name="examples/process/echo.py" />
             <file role="doc" name="examples/process/exec.php" />
             <file role="doc" name="examples/process/func_timeout.php" />
@@ -612,7 +633,6 @@
             <file role="src" name="src/server/static_handler.cc" />
             <file role="src" name="src/server/task_worker.cc" />
             <file role="src" name="src/server/worker.cc" />
-            <file role="src" name="src/wrapper/client.cc" />
             <file role="src" name="src/wrapper/event.cc" />
             <file role="src" name="src/wrapper/server.cc" />
             <file role="src" name="src/wrapper/timer.cc" />
@@ -783,25 +803,6 @@
             <file role="test" name="tests/swoole_channel_coro/push_timeout3.phpt" />
             <file role="test" name="tests/swoole_channel_coro/push_timeout4.phpt" />
             <file role="test" name="tests/swoole_channel_coro/type.phpt" />
-            <file role="test" name="tests/swoole_client_async/big_package_memory_leak.phpt" />
-            <file role="test" name="tests/swoole_client_async/buffer_full.phpt" />
-            <file role="test" name="tests/swoole_client_async/connect_dns.phpt" />
-            <file role="test" name="tests/swoole_client_async/connect_refuse.phpt" />
-            <file role="test" name="tests/swoole_client_async/connect_refuse_udg.phpt" />
-            <file role="test" name="tests/swoole_client_async/connect_refuse_unix.phpt" />
-            <file role="test" name="tests/swoole_client_async/connect_timeout.phpt" />
-            <file role="test" name="tests/swoole_client_async/connect_twice.phpt" />
-            <file role="test" name="tests/swoole_client_async/eof.phpt" />
-            <file role="test" name="tests/swoole_client_async/eof_close.phpt" />
-            <file role="test" name="tests/swoole_client_async/getSocket_bug.phpt" />
-            <file role="test" name="tests/swoole_client_async/getpeername.phpt" />
-            <file role="test" name="tests/swoole_client_async/getsockname.phpt" />
-            <file role="test" name="tests/swoole_client_async/length_protocol.phpt" />
-            <file role="test" name="tests/swoole_client_async/length_protocol_func.phpt" />
-            <file role="test" name="tests/swoole_client_async/port_invalid.phpt" />
-            <file role="test" name="tests/swoole_client_async/sendfile.phpt" />
-            <file role="test" name="tests/swoole_client_async/sleep_wake.phpt" />
-            <file role="test" name="tests/swoole_client_async/swoole_client.phpt" />
             <file role="test" name="tests/swoole_client_coro/bug_2346.phpt" />
             <file role="test" name="tests/swoole_client_coro/close.phpt" />
             <file role="test" name="tests/swoole_client_coro/close_in_other_co.phpt" />
@@ -837,6 +838,8 @@
             <file role="test" name="tests/swoole_client_coro/timeout.phpt" />
             <file role="test" name="tests/swoole_client_coro/udp_client.phpt" />
             <file role="test" name="tests/swoole_client_coro/udp_recv_failed.phpt" />
+            <file role="test" name="tests/swoole_client_coro/unsock_dgram.phpt" />
+            <file role="test" name="tests/swoole_client_coro/unsock_stream.phpt" />
             <file role="test" name="tests/swoole_client_sync/connect_1.phpt" />
             <file role="test" name="tests/swoole_client_sync/connect_2.phpt" />
             <file role="test" name="tests/swoole_client_sync/connect_3.phpt" />
@@ -854,6 +857,7 @@
             <file role="test" name="tests/swoole_client_sync/recv_in_task.phpt" />
             <file role="test" name="tests/swoole_client_sync/recv_timeout.phpt" />
             <file role="test" name="tests/swoole_client_sync/select.phpt" />
+            <file role="test" name="tests/swoole_client_sync/select_null.phpt" />
             <file role="test" name="tests/swoole_client_sync/send_recv.phpt" />
             <file role="test" name="tests/swoole_client_sync/sendfile.phpt" />
             <file role="test" name="tests/swoole_client_sync/ssl_recv_timeout.phpt" />
@@ -1037,6 +1041,7 @@
             <file role="test" name="tests/swoole_http2_client_coro/issues_2374.phpt" />
             <file role="test" name="tests/swoole_http2_client_coro/multi.phpt" />
             <file role="test" name="tests/swoole_http2_client_coro/no-gzip.phpt" />
+            <file role="test" name="tests/swoole_http2_client_coro/number.phpt" />
             <file role="test" name="tests/swoole_http2_client_coro/ping.phpt" />
             <file role="test" name="tests/swoole_http2_client_coro/post.phpt" />
             <file role="test" name="tests/swoole_http2_client_coro/send-cookies.phpt" />
@@ -1246,6 +1251,7 @@
             <file role="test" name="tests/swoole_mysql_coro/procedure_with_query.phpt" />
             <file role="test" name="tests/swoole_mysql_coro/procedure_with_query_and_prepare.phpt" />
             <file role="test" name="tests/swoole_mysql_coro/query.phpt" />
+            <file role="test" name="tests/swoole_mysql_coro/query_multifield.phpt" />
             <file role="test" name="tests/swoole_mysql_coro/query_timeout.phpt" />
             <file role="test" name="tests/swoole_mysql_coro/readonly.phpt" />
             <file role="test" name="tests/swoole_mysql_coro/simple_query.phpt" />
@@ -1261,6 +1267,7 @@
             <file role="test" name="tests/swoole_process/alarm.phpt" />
             <file role="test" name="tests/swoole_process/coro/ipc.phpt" />
             <file role="test" name="tests/swoole_process/coro/start.phpt" />
+            <file role="test" name="tests/swoole_process/daemon.phpt" />
             <file role="test" name="tests/swoole_process/echo.py" />
             <file role="test" name="tests/swoole_process/enable_coroutine.phpt" />
             <file role="test" name="tests/swoole_process/exception.phpt" />
@@ -1473,7 +1480,6 @@
             <file role="test" name="tests/swoole_server/reload_async.phpt" />
             <file role="test" name="tests/swoole_server/reload_base.phpt" />
             <file role="test" name="tests/swoole_server/reload_process.phpt" />
-            <file role="test" name="tests/swoole_server/request_slowlog.phpt" />
             <file role="test" name="tests/swoole_server/sendMessage.phpt" />
             <file role="test" name="tests/swoole_server/sendMessage_02.phpt" />
             <file role="test" name="tests/swoole_server/send_2.phpt" />
@@ -1519,6 +1525,7 @@
             <file role="test" name="tests/swoole_server/task/task_ipc_mode_2.phpt" />
             <file role="test" name="tests/swoole_server/task/task_ipc_mode_3.phpt" />
             <file role="test" name="tests/swoole_server/task/task_max_request.phpt" />
+            <file role="test" name="tests/swoole_server/task/task_pack.phpt" />
             <file role="test" name="tests/swoole_server/task/task_queue.phpt" />
             <file role="test" name="tests/swoole_server/task/task_wait.phpt" />
             <file role="test" name="tests/swoole_server/task/without_onfinish.phpt" />

diff --git a/php_swoole_library.h b/php_swoole_library.h
@@ -896,6 +896,7 @@ static const char* swoole_library_source_core_constant =
     "    const OPTION_ENABLE_COROUTINE = 'enable_coroutine';\n"
     "    const OPTION_ENABLE_REUSE_PORT = 'enable_reuse_port';\n"
     "    const OPTION_SSL_METHOD = 'ssl_method';\n"
+    "    const OPTION_SSL_PROTOCOLS = 'ssl_protocols';\n"
     "    const OPTION_SSL_COMPRESS = 'ssl_compress';\n"
     "    const OPTION_SSL_CERT_FILE = 'ssl_cert_file';\n"
     "    const OPTION_SSL_KEY_FILE = 'ssl_key_file';\n"
@@ -975,9 +976,9 @@ static const char* swoole_library_source_core_constant =
     "    const OPTION_WORKER_NUM = 'worker_num';\n"
     "    const OPTION_MAX_WAIT_TIME = 'max_wait_time';\n"
     "    const OPTION_MAX_CORO_NUM = 'max_coro_num';\n"
-    "    const OPTION_SEND_YIELD = 'send_yield';\n"
     "    const OPTION_SEND_TIMEOUT = 'send_timeout';\n"
     "    const OPTION_DISPATCH_MODE = 'dispatch_mode';\n"
+    "    const OPTION_SEND_YIELD = 'send_yield';\n"
     "    const OPTION_DISPATCH_FUNC = 'dispatch_func';\n"
     "    const OPTION_LOG_FILE = 'log_file';\n"
     "    const OPTION_DISCARD_TIMEOUT_REQUEST = 'discard_timeout_request';\n"
@@ -986,9 +987,6 @@ static const char* swoole_library_source_core_constant =
     "    const OPTION_TASK_USE_OBJECT = 'task_use_object';\n"
     "    const OPTION_TASK_ENABLE_COROUTINE = 'task_enable_coroutine';\n"
     "    const OPTION_TASK_WORKER_NUM = 'task_worker_num';\n"
-    "    const OPTION_TRACE_EVENT_WORKER = 'trace_event_worker';\n"
-    "    const OPTION_REQUEST_SLOWLOG_TIMEOUT = 'request_slowlog_timeout';\n"
-    "    const OPTION_REQUEST_SLOWLOG_FILE = 'request_slowlog_file';\n"
     "    const OPTION_TASK_IPC_MODE = 'task_ipc_mode';\n"
     "    const OPTION_TASK_TMPDIR = 'task_tmpdir';\n"
     "    const OPTION_TASK_MAX_REQUEST = 'task_max_request';\n"

diff --git a/src/core/error.cc b/src/core/error.cc
@@ -88,6 +88,8 @@ const char* swoole_strerror(int code)
         return "Session discard timeout data";
     case SW_ERROR_OUTPUT_BUFFER_OVERFLOW:
         return "Output buffer overflow";
+    case SW_ERROR_OUTPUT_SEND_YIELD:
+        return "Output send yield";
     case SW_ERROR_SSL_NOT_READY:
         return "SSL not ready";
     case SW_ERROR_SSL_CANNOT_USE_SENFILE:
@@ -100,6 +102,8 @@ const char* swoole_strerror(int code)
         return "SSL bad client";
     case SW_ERROR_SSL_BAD_PROTOCOL:
         return "SSL bad protocol";
+    case SW_ERROR_SSL_RESET:
+        return "SSL reset";
     case SW_ERROR_PACKAGE_LENGTH_TOO_LARGE:
         return "Package length too large";
     case SW_ERROR_PACKAGE_LENGTH_NOT_FOUND:

diff --git a/swoole.cc b/swoole.cc
@@ -432,12 +432,14 @@ PHP_MINIT_FUNCTION(swoole)
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SESSION_INVALID_ID", SW_ERROR_SESSION_INVALID_ID);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SESSION_DISCARD_TIMEOUT_DATA", SW_ERROR_SESSION_DISCARD_TIMEOUT_DATA);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_OUTPUT_BUFFER_OVERFLOW", SW_ERROR_OUTPUT_BUFFER_OVERFLOW);
+    SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_OUTPUT_SEND_YIELD", SW_ERROR_OUTPUT_SEND_YIELD);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SSL_NOT_READY", SW_ERROR_SSL_NOT_READY);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SSL_CANNOT_USE_SENFILE", SW_ERROR_SSL_CANNOT_USE_SENFILE);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SSL_EMPTY_PEER_CERTIFICATE", SW_ERROR_SSL_EMPTY_PEER_CERTIFICATE);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SSL_VEFIRY_FAILED", SW_ERROR_SSL_VEFIRY_FAILED);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SSL_BAD_CLIENT", SW_ERROR_SSL_BAD_CLIENT);
     SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SSL_BAD_PROTOCOL", SW_ERROR_SSL_BAD_PROTOCOL);
+    SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SSL_RESET", SW_ERROR_SSL_RESET);
     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);

diff --git a/tests/swoole_server/ssl_verify_03.phpt b/tests/swoole_server/ssl_verify_03.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Server: ssl server verify client failed
+swoole_server: ssl server verify client failed
 --SKIPIF--
 <?php
 require __DIR__ . '/../include/skipif.inc';

diff --git a/tests/swoole_server/task/kill_01.phpt b/tests/swoole_server/task/kill_01.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Server/task: kill task worker [SWOOLE_BASE]
+swoole_server/task: kill task worker [SWOOLE_BASE]
 --SKIPIF--
 <?php
 require __DIR__ . '/../../include/skipif.inc';

diff --git a/tests/swoole_server/task/kill_02.phpt b/tests/swoole_server/task/kill_02.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Server/task: kill task worker 01 [SWOOLE_BASE]
+swoole_server/task: kill task worker 01 [SWOOLE_BASE]
 --SKIPIF--
 <?php
 require __DIR__ . '/../../include/skipif.inc';

diff --git a/tests/swoole_server/task/kill_task_worker_02.phpt b/tests/swoole_server/task/kill_task_worker_02.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Server/task: kill task worker [SWOOLE_PROCESS]
+swoole_server/task: kill task worker [SWOOLE_PROCESS]
 --SKIPIF--
 <?php
 require __DIR__ . '/../../include/skipif.inc';

diff --git a/tests/swoole_server/task/task_callback.phpt b/tests/swoole_server/task/task_callback.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Server/task: task callback
+swoole_server/task: task callback
 --SKIPIF--
 <?php require __DIR__ . '/../../include/skipif.inc'; ?>
 --FILE--

diff --git a/tests/swoole_server/task/task_in_task_worker.phpt b/tests/swoole_server/task/task_in_task_worker.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Server/task: task in task worker
+swoole_server/task: task in task worker
 --SKIPIF--
 <?php require __DIR__ . '/../../include/skipif.inc'; ?>
 --FILE--

diff --git a/tests/swoole_server/task/task_pack.phpt b/tests/swoole_server/task/task_pack.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Server/task: task pack
+swoole_server/task: task pack
 --SKIPIF--
 <?php require __DIR__ . '/../../include/skipif.inc';
 skip_if_function_not_exist('msg_get_queue');

diff --git a/tests/swoole_server/task/task_queue.phpt b/tests/swoole_server/task/task_queue.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Server/task: task queue
+swoole_server/task: task queue
 --SKIPIF--
 <?php require __DIR__ . '/../../include/skipif.inc'; ?>
 --FILE--

diff --git a/tests/swoole_server/taskWaitMulti.phpt b/tests/swoole_server/taskWaitMulti.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Server: taskWaitMulti
+swoole_server: taskWaitMulti
 --SKIPIF--
 <?php require __DIR__ . '/../include/skipif.inc'; ?>
 --FILE--

diff --git a/tests/swoole_server/wrong_eof_setting.phpt b/tests/swoole_server/wrong_eof_setting.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Server: wrong eof setting
+swoole_server: wrong eof setting
 --SKIPIF--
 <?php require __DIR__ . '/../include/skipif.inc'; ?>
 --FILE--

diff --git a/tests/swoole_server_port/multi_port.phpt b/tests/swoole_server_port/multi_port.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Server_port: swoole server port
+swoole_server_port: swoole server port
 --SKIPIF--
 <?php require __DIR__ . '/../include/skipif.inc'; ?>
 --FILE--