Skip to content

Commit 3698a36

Browse files
committed
Update version for Swoole 4.4.7
1 parent 8eae9c6 commit 3698a36

File tree

6 files changed

+19
-21
lines changed

6 files changed

+19
-21
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PROJECT(libswoole)
22

33
ENABLE_LANGUAGE(ASM)
4-
SET(SWOOLE_VERSION 4.4.6)
4+
SET(SWOOLE_VERSION 4.4.7)
55
SET(SWOOLE_CLFLAGS pthread rt dl ssl crypt crypto)
66
set(CMAKE_CXX_STANDARD 11)
77
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")

config.m4

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,7 @@ if test "$PHP_SWOOLE" != "no"; then
420420
src/coroutine/hook.cc \
421421
src/coroutine/socket.cc \
422422
src/coroutine/system.cc \
423+
src/coroutine/thread_context.cc \
423424
src/coroutine/ucontext.cc \
424425
src/lock/atomic.c \
425426
src/lock/cond.c \

include/swoole.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ int clock_gettime(clock_id_t which_clock, struct timespec *t);
107107
#define SWOOLE_MAJOR_VERSION 4
108108
#define SWOOLE_MINOR_VERSION 4
109109
#define SWOOLE_RELEASE_VERSION 7
110-
#define SWOOLE_EXTRA_VERSION "alpha"
111-
#define SWOOLE_VERSION "4.4.7-alpha"
110+
#define SWOOLE_EXTRA_VERSION ""
111+
#define SWOOLE_VERSION "4.4.7"
112112
#define SWOOLE_VERSION_ID 40407
113113
#define SWOOLE_BUG_REPORT \
114114
"A bug occurred in Swoole-v" SWOOLE_VERSION ", please report it.\n"\

package.xml

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
<email>[email protected]</email>
4343
<active>yes</active>
4444
</developer>
45-
<date>2019-09-18</date>
46-
<time>21:00:00</time>
45+
<date>2019-09-25</date>
46+
<time>16:00:00</time>
4747
<version>
48-
<release>4.4.6</release>
48+
<release>4.4.7</release>
4949
<api>4.0</api>
5050
</version>
5151
<stability>
@@ -56,24 +56,15 @@
5656
<notes>
5757
Enhancement
5858
---
59-
+ Support max_request_grace (#2784) (#2808) (#2809) (@sshymko)
60-
+ Add SameSite Cookie (@2815) (@Yurunsoft)
61-
+ Support curl_multi_getcontent, CURLOPT_AUTOREFERER for curl hook, add ignore options (#2817) (@2818) (@2819) (@limingxinleo)
62-
+ Support CURLOPT_SSLVERSION and CURLINFO_HEADER_OUT (f2b4c93) (@matyhtf)
63-
+ AIO thread safe (@matyhtf)
64-
+ Optimize numeric type conversion (aa20913) (@twose)
65-
+ Compatibly with diseval extension for library (8b7eb16) (@GXhua)
59+
+ Support thread context (9214411c) (@matyhtf)
60+
+ Generate a warning if the channel has producers or consumers when the program exits (b9f37d9c) (@twose)
6661

6762
Fixed
6863
---
69-
* Fixed missing http headers (#2786) (@doubaokun)
70-
* Defensive programming for signal callback (@twose)
71-
* Fixed getProcess memory error (#2801) (@matyhtf)
72-
* Fixed compilation on MacOS (@matyhtf)
73-
* Fixed Coroutine\System methods (97c1444) (@twose)
74-
* Fixed AIO thread task stuck (@matyhtf)
75-
* Fixed HTTP2 HEADER_TABLE_SIZE (@twose)
76-
* Fixed spurious waking of socket (d0b659a) (@matyhtf)
64+
* Fixed reactor send bug (a1dc95f5) (@matyhtf)
65+
* Fixed event init bug (907c84b3) (@matyhtf)
66+
* Fixed crash on Cygwin (cfb74793) (@matyhtf)
67+
* Fixed wrong length of string (c4f97993) (@twose)
7768
</notes>
7869
<contents>
7970
<dir name="/">
@@ -130,6 +121,7 @@
130121
<file role="src" name="core-tests/samples/s1.cc" />
131122
<file role="src" name="core-tests/server/tcp.php" />
132123
<file role="src" name="core-tests/src/client.cpp" />
124+
<file role="src" name="core-tests/src/coroutine/async.cpp" />
133125
<file role="src" name="core-tests/src/coroutine/base.cpp" />
134126
<file role="src" name="core-tests/src/coroutine/channel.cpp" />
135127
<file role="src" name="core-tests/src/coroutine/gethostbyname.cpp" />
@@ -270,6 +262,7 @@
270262
<file role="doc" name="examples/coroutine/waitgroup.php" />
271263
<file role="doc" name="examples/coroutine/websocket/client.php" />
272264
<file role="doc" name="examples/coroutine/websocket/server.php" />
265+
<file role="doc" name="examples/cpp/co.cc" />
273266
<file role="doc" name="examples/cpp/mt_co.cc" />
274267
<file role="doc" name="examples/cpp/test_server.c" />
275268
<file role="doc" name="examples/db_pool.php" />
@@ -560,6 +553,7 @@
560553
<file role="src" name="src/coroutine/hook.cc" />
561554
<file role="src" name="src/coroutine/socket.cc" />
562555
<file role="src" name="src/coroutine/system.cc" />
556+
<file role="src" name="src/coroutine/thread_context.cc" />
563557
<file role="src" name="src/coroutine/ucontext.cc" />
564558
<file role="src" name="src/lock/atomic.c" />
565559
<file role="src" name="src/lock/cond.c" />

src/core/error.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ const char* swoole_strerror(int code)
122122
return "Aio bad request";
123123
case SW_ERROR_AIO_CANCELED:
124124
return "Aio canceled";
125+
case SW_ERROR_AIO_TIMEOUT:
126+
return "Aio timeout";
125127
case SW_ERROR_CLIENT_NO_CONNECTION:
126128
return "Client no connection";
127129
case SW_ERROR_SOCKET_CLOSED:

swoole.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,7 @@ PHP_MINIT_FUNCTION(swoole)
449449
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_HTTP2_STREAM_NOT_FOUND", SW_ERROR_HTTP2_STREAM_NOT_FOUND);
450450
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_AIO_BAD_REQUEST", SW_ERROR_AIO_BAD_REQUEST);
451451
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_AIO_CANCELED", SW_ERROR_AIO_CANCELED);
452+
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_AIO_TIMEOUT", SW_ERROR_AIO_TIMEOUT);
452453
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_CLIENT_NO_CONNECTION", SW_ERROR_CLIENT_NO_CONNECTION);
453454
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SOCKET_CLOSED", SW_ERROR_SOCKET_CLOSED);
454455
SW_REGISTER_LONG_CONSTANT("SWOOLE_ERROR_SOCKS5_UNSUPPORT_VERSION", SW_ERROR_SOCKS5_UNSUPPORT_VERSION);

0 commit comments

Comments
 (0)