Update version for Swoole 4.4.6

swoole · Sep 18, 2019 · 53e46cd · 53e46cd
1 parent 60e3806
commit 53e46cd
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 22 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 PROJECT(libswoole)
 
 ENABLE_LANGUAGE(ASM)
-SET(SWOOLE_VERSION 4.4.5)
+SET(SWOOLE_VERSION 4.4.6)
 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    6
-#define SWOOLE_EXTRA_VERSION      "alpha"
-#define SWOOLE_VERSION            "4.4.6-alpha"
+#define SWOOLE_EXTRA_VERSION      ""
+#define SWOOLE_VERSION            "4.4.6"
 #define SWOOLE_VERSION_ID         40406
 #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
@@ -136,11 +136,13 @@ class Constant
     const OPTION_TASK_IPC_MODE = 'task_ipc_mode';
     const OPTION_TASK_TMPDIR = 'task_tmpdir';
     const OPTION_TASK_MAX_REQUEST = 'task_max_request';
+    const OPTION_TASK_MAX_REQUEST_GRACE = 'task_max_request_grace';
     const OPTION_MAX_CONNECTION = 'max_connection';
     const OPTION_MAX_CONN = 'max_conn';
     const OPTION_HEARTBEAT_CHECK_INTERVAL = 'heartbeat_check_interval';
     const OPTION_HEARTBEAT_IDLE_TIME = 'heartbeat_idle_time';
     const OPTION_MAX_REQUEST = 'max_request';
+    const OPTION_MAX_REQUEST_GRACE = 'max_request_grace';
     const OPTION_RELOAD_ASYNC = 'reload_async';
     const OPTION_OPEN_CPU_AFFINITY = 'open_cpu_affinity';
     const OPTION_CPU_AFFINITY_IGNORE = 'cpu_affinity_ignore';

diff --git a/package.xml b/package.xml
@@ -42,10 +42,10 @@
         <email>[email protected]</email>
         <active>yes</active>
     </developer>
-    <date>2019-08-30</date>
+    <date>2019-09-18</date>
     <time>21:00:00</time>
     <version>
-        <release>4.4.5</release>
+        <release>4.4.6</release>
         <api>4.0</api>
     </version>
     <stability>
@@ -56,22 +56,24 @@
     <notes>
         Enhancement
         ---
-        + Better Reactor (@matyhtf)
-        + Better AIO (@twose)
-        + Better Redis (3608f4c2) (@twose)
-        + Handle Empty upload files (#2779) (@sshymko)
-        + Add File uploads array parser (#2773) (@sshymko)
-        + Support PURGE (#2754) (#2764) (@sshymko)
-        + Allow HTTP methods like GETX POSTX PUTX etc (#2772) (@doubaokun)
-        + Reduce the default max_wait_time to 3 (ed5c838) (@twose)
+        + Support max_request_grace (#2784) (#2808) (#2809) (@sshymko)
+        + Add SameSite Cookie (@2815) (@Yurunsoft)
+        + Support curl_multi_getcontent, CURLOPT_AUTOREFERER for curl hook, add ignore options (#2817) (@2818) (@2819) (@limingxinleo)
+        + Support CURLOPT_SSLVERSION and CURLINFO_HEADER_OUT (f2b4c93) (@matyhtf)
+        + AIO thread safe (@matyhtf)
+        + Optimize numeric type conversion (aa20913) (@twose)
+        + Compatibly with diseval extension for library (8b7eb16) (@GXhua)
 
         Fixed
         ---
-        * Fix AIO memory error (@twose)
-        * Fix compilation without zlib (f5a03366) (@twose)
-        * Fix timeout param of stream (c8275989) (@twose)
-        * Fix missing http headers (#2789) (@doubaokun)
-        * Fix client type (#2771) (@doubaokun)
+        * Fixed missing http headers (#2786) (@doubaokun)
+        * Defensive programming for signal callback (@twose)
+        * Fixed getProcess memory error (#2801) (@matyhtf)
+        * Fixed compilation on MacOS (@matyhtf)
+        * Fixed Coroutine\System methods (97c1444) (@twose)
+        * Fixed AIO thread task stuck (@matyhtf)
+        * Fixed HTTP2 HEADER_TABLE_SIZE (@twose)
+        * Fixed spurious waking of socket (d0b659a) (@matyhtf)
     </notes>
     <contents>
         <dir name="/">
@@ -432,6 +434,7 @@
             <file role="doc" name="examples/ssl/websocket_server.php" />
             <file role="doc" name="examples/swoole_http_client.php" />
             <file role="doc" name="examples/table/array.php" />
+            <file role="doc" name="examples/table/deadlock.php" />
             <file role="doc" name="examples/table/iterator.php" />
             <file role="doc" name="examples/table/server.php" />
             <file role="doc" name="examples/table/set.php" />
@@ -505,13 +508,15 @@
             <file role="src" name="include/socks5.h" />
             <file role="src" name="include/swoole.h" />
             <file role="src" name="include/swoole_api.h" />
+            <file role="src" name="include/swoole_config.h" />
             <file role="src" name="include/swoole_cxx.h" />
             <file role="src" name="include/table.h" />
             <file role="src" name="include/uthash.h" />
             <file role="src" name="include/websocket.h" />
             <file role="src" name="include/wrapper/base.hpp" />
             <file role="src" name="include/wrapper/client.hpp" />
             <file role="src" name="include/wrapper/server.hpp" />
+            <file role="doc" name="library/README.md" />
             <file role="src" name="library/alias.php" />
             <file role="src" name="library/alias_ns.php" />
             <file role="src" name="library/config.inc" />
@@ -624,7 +629,6 @@
             <file role="src" name="swoole_channel_coro.cc" />
             <file role="src" name="swoole_client.cc" />
             <file role="src" name="swoole_client_coro.cc" />
-            <file role="src" name="swoole_config.h" />
             <file role="src" name="swoole_coroutine.cc" />
             <file role="src" name="swoole_coroutine.h" />
             <file role="src" name="swoole_coroutine_scheduler.cc" />
@@ -1120,6 +1124,7 @@
             <file role="test" name="tests/swoole_http_server/co_switching.phpt" />
             <file role="test" name="tests/swoole_http_server/compression.phpt" />
             <file role="test" name="tests/swoole_http_server/cookie_delete.phpt" />
+            <file role="test" name="tests/swoole_http_server/cookie_samesite.phpt" />
             <file role="test" name="tests/swoole_http_server/cookie_vs_rawcookie.phpt" />
             <file role="test" name="tests/swoole_http_server/cookies.phpt" />
             <file role="test" name="tests/swoole_http_server/data_parse.phpt" />
@@ -1187,6 +1192,8 @@
             <file role="test" name="tests/swoole_library/curl/basic/21.phpt" />
             <file role="test" name="tests/swoole_library/curl/basic/22.phpt" />
             <file role="test" name="tests/swoole_library/curl/basic/23.phpt" />
+            <file role="test" name="tests/swoole_library/curl/basic/24.phpt" />
+            <file role="test" name="tests/swoole_library/curl/basic/25.phpt" />
             <file role="test" name="tests/swoole_library/curl/basic/3.phpt" />
             <file role="test" name="tests/swoole_library/curl/basic/4.phpt" />
             <file role="test" name="tests/swoole_library/curl/basic/5.phpt" />
@@ -1197,6 +1204,11 @@
             <file role="test" name="tests/swoole_library/curl/setopt/3.phpt" />
             <file role="test" name="tests/swoole_library/curl/setopt/4.phpt" />
             <file role="test" name="tests/swoole_library/curl/setopt/5_skip.phpt" />
+            <file role="test" name="tests/swoole_library/curl/setopt/filetime_1.phpt" />
+            <file role="test" name="tests/swoole_library/curl/setopt/filetime_2.phpt" />
+            <file role="test" name="tests/swoole_library/curl/setopt/header_out.phpt" />
+            <file role="test" name="tests/swoole_library/curl/setopt/nobody.phpt" />
+            <file role="test" name="tests/swoole_library/curl/ssl/version.phpt" />
             <file role="test" name="tests/swoole_library/curl/template" />
             <file role="test" name="tests/swoole_library/curl/upload/1.phpt" />
             <file role="test" name="tests/swoole_library/curl/upload/curl_testdata1.txt" />
@@ -1287,6 +1299,7 @@
             <file role="test" name="tests/swoole_process_pool/bug_2652.phpt" />
             <file role="test" name="tests/swoole_process_pool/enable_coroutine.phpt" />
             <file role="test" name="tests/swoole_process_pool/enable_coroutine2.phpt" />
+            <file role="test" name="tests/swoole_process_pool/export_socket.phpt" />
             <file role="test" name="tests/swoole_process_pool/getprocess_1.phpt" />
             <file role="test" name="tests/swoole_process_pool/getprocess_2.phpt" />
             <file role="test" name="tests/swoole_process_pool/master_pid.phpt" />
@@ -1457,6 +1470,9 @@
             <file role="test" name="tests/swoole_server/length_protocol.phpt" />
             <file role="test" name="tests/swoole_server/listen_fail.phpt" />
             <file role="test" name="tests/swoole_server/max_request.phpt" />
+            <file role="test" name="tests/swoole_server/max_request_grace_disabled.phpt" />
+            <file role="test" name="tests/swoole_server/max_request_grace_enabled.phpt" />
+            <file role="test" name="tests/swoole_server/max_request_threshold.phpt" />
             <file role="test" name="tests/swoole_server/pid_file.phpt" />
             <file role="test" name="tests/swoole_server/protect.phpt" />
             <file role="test" name="tests/swoole_server/protect_false.phpt" />
@@ -1581,6 +1597,8 @@
             <file role="test" name="tests/swoole_timer/master_base.phpt" />
             <file role="test" name="tests/swoole_timer/next_round.phpt" />
             <file role="test" name="tests/swoole_timer/not_exist.phpt" />
+            <file role="test" name="tests/swoole_timer/reinit_1.phpt" />
+            <file role="test" name="tests/swoole_timer/reinit_2.phpt" />
             <file role="test" name="tests/swoole_timer/stats.phpt" />
             <file role="test" name="tests/swoole_timer/swoole_timer_after.phpt" />
             <file role="test" name="tests/swoole_timer/task_worker.phpt" />

diff --git a/php_swoole_library.h b/php_swoole_library.h
@@ -270,7 +270,7 @@ static const char* swoole_library_source_core_curl_handler =
     "    public $method = 'GET';\n"
     "    public $headers = [];\n"
     "\n"
-    "    public $transfer = null;\n"
+    "    public $transfer;\n"
     "\n"
     "    public $errCode = 0;\n"
     "    public $errMsg = '';\n"
@@ -562,6 +562,15 @@ static const char* swoole_library_source_core_curl_handler =
     "            case CURLOPT_SSLVERSION:\n"
     "            case CURLOPT_NOSIGNAL:\n"
     "            case CURLOPT_FRESH_CONNECT:\n"
+    "            /**\n"
+    "             * From PHP 5.1.3, this option has no effect: the raw output will always be returned when CURLOPT_RETURNTRANSFER is used.\n"
+    "             */\n"
+    "            case CURLOPT_BINARYTRANSFER:\n"
+    "            /**\n"
+    "             * TODO\n"
+    "             */\n"
+    "            case CURLOPT_VERBOSE:\n"
+    "            case CURLOPT_DNS_CACHE_TIMEOUT:\n"
     "                break;\n"
     "            /**\n"
     "             * SSL\n"
@@ -983,11 +992,13 @@ static const char* swoole_library_source_core_constant =
     "    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"
+    "    const OPTION_TASK_MAX_REQUEST_GRACE = 'task_max_request_grace';\n"
     "    const OPTION_MAX_CONNECTION = 'max_connection';\n"
     "    const OPTION_MAX_CONN = 'max_conn';\n"
     "    const OPTION_HEARTBEAT_CHECK_INTERVAL = 'heartbeat_check_interval';\n"
     "    const OPTION_HEARTBEAT_IDLE_TIME = 'heartbeat_idle_time';\n"
     "    const OPTION_MAX_REQUEST = 'max_request';\n"
+    "    const OPTION_MAX_REQUEST_GRACE = 'max_request_grace';\n"
     "    const OPTION_RELOAD_ASYNC = 'reload_async';\n"
     "    const OPTION_OPEN_CPU_AFFINITY = 'open_cpu_affinity';\n"
     "    const OPTION_CPU_AFFINITY_IGNORE = 'cpu_affinity_ignore';\n"

diff --git a/tests/swoole_library/curl/basic/25.phpt b/tests/swoole_library/curl/basic/25.phpt
@@ -50,4 +50,4 @@ $cm->run(function ($host) {
 *** Testing curl method curl_multi_getcontent ***
 Hello World!
 Hello World!
-===DONE===
+===DONE===
diff --git a/tests/swoole_library/curl/setopt/header_out.phpt b/tests/swoole_library/curl/setopt/header_out.phpt
@@ -38,4 +38,4 @@ $cm->run(function ($host) {
 
 ?>
 --EXPECT--
-END
+END
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,4 +38,4 @@ $cm->run(function ($host) { @@
     ?>
     --EXPECT--
-    END
+    END