Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PROJECT(libswoole)

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

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -g")
Expand Down
22 changes: 11 additions & 11 deletions ext-src/php_swoole_library.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Generated by build-library.php, Please DO NOT modify!
*/

/* $Id: 2d8eaab25259a67bdb984f605d463d0bfb147c3c */
/* $Id: c0b3306481ecd77cc88ab51ba15403bcc33319a9 */

static const char* swoole_library_source_constants =
"\n"
Expand Down Expand Up @@ -1905,13 +1905,11 @@ static const char* swoole_library_source_core_coroutine_http_functions =
"use Swoole\\Coroutine\\Http\\Client\\Exception;\n"
"\n"
"/**\n"
" * @param $url\n"
" * @param $data\n"
" * @param mixed $method\n"
" * @param mixed $data\n"
" * @throws Exception\n"
" * @return mixed\n"
" */\n"
"function request($url, $method, $data = null, array $options = null, array $headers = null, array $cookies = null)\n"
"function request(string $url, string $method, $data = null, array $options = null, array $headers = null, array $cookies = null)\n"
"{\n"
" $info = parse_url($url);\n"
" if ($info['scheme'] == 'http') {\n"
Expand All @@ -1934,29 +1932,31 @@ static const char* swoole_library_source_core_coroutine_http_functions =
" if (is_array($cookies)) {\n"
" $client->setCookies($options);\n"
" }\n"
" if ($client->get($info['path'] . '?' . $info['query'])) {\n"
" $request_url = swoole_array_default_value($info, 'path', '/');\n"
" if (!empty($info['query'])) {\n"
" $request_url .= '?' . $info['query'];\n"
" }\n"
" if ($client->execute($request_url)) {\n"
" return $client;\n"
" }\n"
" return false;\n"
"}\n"
"\n"
"/**\n"
" * @param $url\n"
" * @param $data\n"
" * @param mixed $data\n"
" * @throws Exception\n"
" * @return Client|false|mixed\n"
" */\n"
"function post($url, $data, array $options = null, array $headers = null, array $cookies = null)\n"
"function post(string $url, $data, array $options = null, array $headers = null, array $cookies = null)\n"
"{\n"
" return request($url, 'POST', $data, $options, $headers, $cookies);\n"
"}\n"
"\n"
"/**\n"
" * @param $url\n"
" * @throws Exception\n"
" * @return Client|false|mixed\n"
" */\n"
"function get($url, array $options = null, array $headers = null, array $cookies = null)\n"
"function get(string $url, array $options = null, array $headers = null, array $cookies = null)\n"
"{\n"
" return request($url, 'GET', null, $options, $headers, $cookies);\n"
"}\n";
Expand Down
4 changes: 2 additions & 2 deletions include/swoole_version.h
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 6
#define SWOOLE_RELEASE_VERSION 4
#define SWOOLE_EXTRA_VERSION "dev"
#define SWOOLE_VERSION "4.6.4-dev"
#define SWOOLE_EXTRA_VERSION ""
#define SWOOLE_VERSION "4.6.4"
#define SWOOLE_VERSION_ID 40604
#define SWOOLE_API_VERSION_ID 0x202012a

Expand Down
43 changes: 23 additions & 20 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
<email>shenzhe163@gmail.com</email>
<active>yes</active>
</developer>
<date>2021-02-08</date>
<time>09:00:00</time>
<date>2021-03-11</date>
<time>20:00:00</time>
<version>
<release>4.6.3</release>
<release>4.6.4</release>
<api>4.0</api>
</version>
<stability>
Expand All @@ -54,28 +54,24 @@
</stability>
<license uri="http://www.apache.org/licenses/LICENSE-2.0.html">Apache2.0</license>
<notes>
New APIs
---
+ Added Swoole\Coroutine\go function (swoole/library@92fd0de) (@matyhtf)

Enhancement
---
+ Added option compression_min_length for HTTP Server (#4033) (@matyhtf)
+ Allowed setting content-length HTTP header in application layer (#4041) (@doubaokun)
+ Supported ARM 64 build (#4057) (@devnexen)
+ Supported set open_http_protocol in Swoole TCP Server (#4063) (@matyhtf)
+ Supported ssl client only set certificate (swoole/swoole-src@91704ac) (@matyhtf)
+ Supported ssl client only set certificate (swoole/swoole-src@91704ac) (@matyhtf)
* Supported tcp_defer_accept option for FreeBSD (#4049) (@devnexen)

Fixed
---
* Fixed coredump when program reach file open limitation (swoole/swoole-src@709813f) (@matyhtf)
* Fixed JIT being disabled (#4029) (@twose)
* Fixed Response::create() bug (swoole/swoole-src@a630b5b) (@matyhtf)
* Fixed task process id false positives (#4040) (@doubaokun)
* Fixed coredump with native curl hook (#4042) (@Yurunsoft)
* Fixed README (#4046) (@asheroto)
* Fixed native-curl crash on PHP8 (#4045) (@matyhtf)

Kernel
---
* Optimized ssl_connect/ssl_shutdown (#4030) (@matyhtf)
* Fixed Proxy-Authorization missing when use Coroutine\Http\Client (swoole/swoole-src@edc0552) (@matyhtf)
* Fixed memory allocation issues with Swoole\Table (swoole/swoole-src@3e7770f) (@matyhtf)
* Fixed crash when Coroutine\Http2\Client connects concurrently (swoole/swoole-src@630536d) (@matyhtf)
* Fixed enable_ssl_encrypt with DTLS (swoole/swoole-src@842733b) (@matyhtf)
* Fixed Coroutine\Barrier mem leak (swoole/library#94) (@Appla) (@FMiS)
* Fixed the offset error caused by CURLOPT_PORT and CURLOPT_URL order (swoole/library#96) (@sy-records)
* Fixed Table::get($key, $field) when field type is float (swoole/swoole-src@08ea20c) (@matyhtf)
* Fixed Swoole\Table mem leaks (swoole/swoole-src@d78ca8c) (@matyhtf)
</notes>
<contents>
<dir name="/">
Expand Down Expand Up @@ -1077,6 +1073,7 @@
<file role="test" name="tests/swoole_global/unset_property_01.phpt" />
<file role="test" name="tests/swoole_global/unset_property_02.phpt" />
<file role="test" name="tests/swoole_global/unset_property_03.phpt" />
<file role="test" name="tests/swoole_http2_client_coro/connect_twice.phpt" />
<file role="test" name="tests/swoole_http2_client_coro/cookies.phpt" />
<file role="test" name="tests/swoole_http2_client_coro/error.phpt" />
<file role="test" name="tests/swoole_http2_client_coro/goaway.phpt" />
Expand Down Expand Up @@ -1543,6 +1540,8 @@
<file role="test" name="tests/swoole_runtime/sockets/tcp_server.phpt" />
<file role="test" name="tests/swoole_runtime/sockets/timeout.phpt" />
<file role="test" name="tests/swoole_runtime/sockets/udp.phpt" />
<file role="test" name="tests/swoole_runtime/ssl/local_cert.phpt" />
<file role="test" name="tests/swoole_runtime/ssl/without_key.phpt" />
<file role="test" name="tests/swoole_runtime/ssl_client.phpt" />
<file role="test" name="tests/swoole_runtime/ssl_server.phpt" />
<file role="test" name="tests/swoole_runtime/stdin.phpt" />
Expand Down Expand Up @@ -1590,6 +1589,7 @@
<file role="test" name="tests/swoole_server/bug_2639.phpt" />
<file role="test" name="tests/swoole_server/bug_2736.phpt" />
<file role="test" name="tests/swoole_server/bug_aio.phpt" />
<file role="test" name="tests/swoole_server/check_callback.phpt" />
<file role="test" name="tests/swoole_server/check_chunk_total_size.phpt" />
<file role="test" name="tests/swoole_server/close_force.phpt" />
<file role="test" name="tests/swoole_server/close_in_connect_callback.phpt" />
Expand Down Expand Up @@ -1825,6 +1825,7 @@
<file role="test" name="tests/swoole_table/big_size.phpt" />
<file role="test" name="tests/swoole_table/bug_2263.phpt" />
<file role="test" name="tests/swoole_table/bug_2290.phpt" />
<file role="test" name="tests/swoole_table/create_10k_object.phpt" />
<file role="test" name="tests/swoole_table/del.phpt" />
<file role="test" name="tests/swoole_table/foreach.phpt" />
<file role="test" name="tests/swoole_table/get_after_destroy.phpt" />
Expand Down Expand Up @@ -1995,12 +1996,14 @@
<file role="src" name="tools/export.php" />
<file role="src" name="tools/gen-data.php" />
<file role="src" name="tools/get-ip-info.php" />
<file role="src" name="tools/next-version.php" />
<file role="src" name="tools/option-generator.php" />
<file role="src" name="tools/pecl-package.php" />
<file role="src" name="tools/phpt-fixer.php" />
<file role="src" name="tools/rename.php" />
<file role="src" name="tools/send-http-data.php" />
<file role="src" name="tools/show-big-files.php" />
<file role="src" name="tools/templates/version.tpl.h" />
<file role="src" name="travis/.gitignore" />
<file role="doc" name="travis/README.md" />
<file role="src" name="travis/debug/swoole_info.php" />
Expand Down