Skip to content

Commit

Permalink
Update version for Swoole 4.7.1 (#4372)
Browse files Browse the repository at this point in the history 
* Update version for Swoole 4.7.1

* Optimize code

* Update package.xml

* Added introducing a new concurrency mode (#4330)

Co-authored-by: matyhtf <mikan.tenny@gmail.com>
Co-authored-by: 沈唁 <52o@qq52o.cn>
Co-authored-by: Bruce Dou <doubaokun@gmail.com>
  • Loading branch information
@huanghantao @matyhtf
@sy-records @doubaokun
4 people authored Aug 14, 2021
1 parent 27fee7f commit a2ef8c0
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 42 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PROJECT(libswoole)

ENABLE_LANGUAGE(ASM)
set(SWOOLE_VERSION 4.7.1-dev)
set(SWOOLE_VERSION 4.7.1)

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -g")
Expand Down
4 changes: 2 additions & 2 deletions include/swoole.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -703,8 +703,8 @@ SW_API const char *swoole_strerror(int code);
SW_API void swoole_throw_error(int code);
SW_API void swoole_set_log_level(int level);
SW_API void swoole_set_trace_flags(int flags);
SW_API void swoole_set_dns_server(const std::string server);
SW_API void swoole_set_hosts_path(char *hosts_file);
SW_API void swoole_set_dns_server(const std::string &server);
SW_API void swoole_set_hosts_path(const std::string &hosts_file);
SW_API std::pair<std::string, int> swoole_get_dns_server();
SW_API bool swoole_load_resolv_conf();

Expand Down
4 changes: 2 additions & 2 deletions include/swoole_version.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
#define SWOOLE_MAJOR_VERSION 4
#define SWOOLE_MINOR_VERSION 7
#define SWOOLE_RELEASE_VERSION 1
#define SWOOLE_EXTRA_VERSION "dev"
#define SWOOLE_VERSION "4.7.1-dev"
#define SWOOLE_EXTRA_VERSION ""
#define SWOOLE_VERSION "4.7.1"
#define SWOOLE_VERSION_ID 40701
#define SWOOLE_API_VERSION_ID 0x202108a

Expand Down
54 changes: 21 additions & 33 deletions package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@
<email>lufei@php.net</email>
<active>yes</active>
</developer>
<date>2021-07-16</date>
<time>16:00:00</time>
<date>2021-08-13</date>
<time>15:00:00</time>
<version>
<release>4.7.0</release>
<release>4.7.1</release>
<api>4.0</api>
</version>
<stability>
Expand All @@ -60,42 +60,24 @@
</stability>
<license uri="http://www.apache.org/licenses/LICENSE-2.0.html">Apache2.0</license>
<notes>
New APIs
New feature
---
* Added Process\Pool::detach() (#4221) (@matyhtf)
* Added onDisconnect callback for Swoole\Server (#4230) (@matyhtf)
* Added Coroutine::cancel() (#4247) (#4249) (@matyhtf)
* Added http_compression/body_decompression options for Http Client (#4299) (@matyhtf)
* Introduce a new concurrency mode (#4330) (@doubaokun)

Enhancement
---
* Supported mysql client prepare field type identification (#4238) (@Yurunsoft)
* Supported c-ares, Refactor DNS (#4275) (@matyhtf)
* Supported setting different idle time for each port (#4290) (@matyhtf)
* Supported SW_DISPATCH_CO_CONN_LB and SW_DISPATCH_CO_REQ_LB for Swoole\Server dispatch_mode (#4318) (@matyhtf)
* Supported timeout for Swoole\ConnectionPool::get (swoole/library#108) (@leocavalcante)
* Supported CURLOPT_PRIVATE for Hook Curl (swoole/library#112) (@sy-records)
* Optimized PDOStatementProxy::setFetchMode function prototype (swoole/library#109) (@yespire)
* Supported query /etc/hosts for System::dnsLookup (#4341) (#4349) (@zmyWL) (@NathanFreeman)
* Supported boost context suppoprt for mips64 support (#4358) (@dixyes)
* Supported CURLOPT_RESOLVE option for SWOOLE_HOOK_CURL (swoole/library#107) (@sy-records)
* Support CURLOPT_NOPROGRESS for SWOOLE_HOOK_CURL (swoole/library#117) (@sy-records)

Fixed
---
* Fixed uncaught thread creation exception when creating a large number of coroutines (swoole/swoole-src@8ce5041) (@matyhtf)
* Fixed the "make install" missing php_swoole.h header file (#4239) (@sy-records)
* Fixed EVENT_HANDSHAKE BC (#4248) (@sy-records)
* Fixed SW_LOCK_CHECK_RETURN (#4302) (@zmyWL)
* Fixed problems with Swoole\Atomic\Long M1 chip (swoole/swoole-src@e6fae2e) (@matyhtf)
* Fixed missing return value of Coroutine\go (swoole/library@1ed49db) (@matyhtf)
* Fixed StringObject consistency between other methods and its immutability (swoole/library#111) (@leocavalcante)
* Fixed StringObject substr error (swoole/library#113) (@sy-records)

Kernel
---
* Did not hook disabled functions (#4283) (@twose)

Test
---
* Added Cygwin build (#4222) (@sy-records)
* Added alpine 3.13 and 3.14 into building test (#4309) (@limingxinleo)
* Fixed memory error on shutdown (PHP-8.1) (#4325) (@twose)
* Fixed not serializable classes for 8.1.0beta1 (#4335) (@remicollet)
* Fixed multiple coroutines recursively creating directories (#4337) (@NathanFreeman)
* Fixed native curl bugs (#4360) (@matyhtf)
* Fixed PDOStatement::bindParam() expects parameter 1 to be string (swoole/library#116) (@sy-records)
</notes>
<contents>
<dir name="/">
Expand Down Expand Up @@ -482,12 +464,12 @@
<file role="doc" name="examples/ssl/websocket_client.html" />
<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" />
<file role="doc" name="examples/table/simulation.php" />
<file role="doc" name="examples/table/usage.php" />
<file role="doc" name="examples/task/http.php" />
<file role="doc" name="examples/task/msg_push.php" />
<file role="doc" name="examples/task/shared_client.php" />
Expand Down Expand Up @@ -969,6 +951,7 @@
<file role="test" name="tests/swoole_coroutine/dnslookup_4.phpt" />
<file role="test" name="tests/swoole_coroutine/dnslookup_5.phpt" />
<file role="test" name="tests/swoole_coroutine/dnslookup_ipv6.phpt" />
<file role="test" name="tests/swoole_coroutine/dnslookup_query_hosts.phpt" />
<file role="test" name="tests/swoole_coroutine/empty.phpt" />
<file role="test" name="tests/swoole_coroutine/eval.phpt" />
<file role="test" name="tests/swoole_coroutine/exception.phpt" />
Expand Down Expand Up @@ -1151,6 +1134,7 @@
<file role="test" name="tests/swoole_curl/template" />
<file role="test" name="tests/swoole_curl/timer_coredump.phpt" />
<file role="test" name="tests/swoole_curl/upload/1.phpt" />
<file role="test" name="tests/swoole_curl/upload/2.phpt" />
<file role="test" name="tests/swoole_curl/upload/curl_testdata1.txt" />
<file role="test" name="tests/swoole_curl/upload/curl_testdata2.txt" />
<file role="test" name="tests/swoole_curl/yield_in_callback.phpt" />
Expand Down Expand Up @@ -1228,6 +1212,7 @@
<file role="test" name="tests/swoole_http2_server/compression.phpt" />
<file role="test" name="tests/swoole_http2_server/goaway.phpt" />
<file role="test" name="tests/swoole_http2_server/http2_headers.phpt" />
<file role="test" name="tests/swoole_http2_server/issue_4365.phpt" />
<file role="test" name="tests/swoole_http2_server/nghttp2_big_data.phpt" />
<file role="test" name="tests/swoole_http2_server/no_compression.phpt" />
<file role="test" name="tests/swoole_http2_server/ping.phpt" />
Expand Down Expand Up @@ -1594,6 +1579,7 @@
<file role="test" name="tests/swoole_runtime/enable_crypto.phpt" />
<file role="test" name="tests/swoole_runtime/file_hook/a.inc" />
<file role="test" name="tests/swoole_runtime/file_hook/b.inc" />
<file role="test" name="tests/swoole_runtime/file_hook/bug_4327.phpt" />
<file role="test" name="tests/swoole_runtime/file_hook/bug_ftell_2g.phpt" />
<file role="test" name="tests/swoole_runtime/file_hook/bug_scandir.phpt" />
<file role="test" name="tests/swoole_runtime/file_hook/co_fread.phpt" />
Expand Down Expand Up @@ -2006,6 +1992,7 @@
<file role="src" name="thirdparty/boost/asm/jump_i386_sysv_macho_gas.S" />
<file role="src" name="thirdparty/boost/asm/jump_i386_x86_64_sysv_macho_gas.S" />
<file role="src" name="thirdparty/boost/asm/jump_mips32_o32_elf_gas.S" />
<file role="src" name="thirdparty/boost/asm/jump_mips64_n64_elf_gas.S" />
<file role="src" name="thirdparty/boost/asm/jump_ppc32_ppc64_sysv_macho_gas.S" />
<file role="src" name="thirdparty/boost/asm/jump_ppc32_sysv_elf_gas.S" />
<file role="src" name="thirdparty/boost/asm/jump_ppc32_sysv_macho_gas.S" />
Expand All @@ -2031,6 +2018,7 @@
<file role="src" name="thirdparty/boost/asm/make_i386_sysv_macho_gas.S" />
<file role="src" name="thirdparty/boost/asm/make_i386_x86_64_sysv_macho_gas.S" />
<file role="src" name="thirdparty/boost/asm/make_mips32_o32_elf_gas.S" />
<file role="src" name="thirdparty/boost/asm/make_mips64_n64_elf_gas.S" />
<file role="src" name="thirdparty/boost/asm/make_ppc32_ppc64_sysv_macho_gas.S" />
<file role="src" name="thirdparty/boost/asm/make_ppc32_sysv_elf_gas.S" />
<file role="src" name="thirdparty/boost/asm/make_ppc32_sysv_macho_gas.S" />
Expand Down
2 changes: 1 addition & 1 deletion src/core/base.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ SW_API void swoole_set_trace_flags(int flags) {
SwooleG.trace_flags = flags;
}

SW_API void swoole_set_dns_server(const std::string server) {
SW_API void swoole_set_dns_server(const std::string &server) {
char *_port;
int dns_server_port = SW_DNS_SERVER_PORT;
char dns_server_host[32];
Expand Down
2 changes: 1 addition & 1 deletion src/network/dns.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ bool swoole_load_resolv_conf() {
return true;
}

void swoole_set_hosts_path(const char *hosts_file) {
void swoole_set_hosts_path(const std::string &hosts_file) {
SwooleG.dns_hosts_path = hosts_file;
}

Expand Down
3 changes: 1 addition & 2 deletions tests/swoole_runtime/file_hook/bug_4327.phpt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--TEST--
mkdir failed when coroutines: bug #4372
swoole_runtime/file_hook: bug #4372
--SKIPIF--
<?php
require __DIR__ . '/../../include/skipif.inc';
Expand Down Expand Up @@ -48,7 +48,6 @@ Swoole\Runtime::enableCoroutine(false);
createDirectories();
createDirectories("file://");
?>

--EXPECT--
SUCCESS
SUCCESS
Expand Down

0 comments on commit a2ef8c0

Please sign in to comment.