Skip to content

Commit

Permalink
Update version for Swoole 4.5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@twose
twose committed May 28, 2020
1 parent fc0a2a5 commit 348b5ad
Show file tree
Hide file tree
Showing 6 changed files with 96 additions and 55 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.5.1)
SET(SWOOLE_VERSION 4.5.2)

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -g")
Expand Down
6 changes: 3 additions & 3 deletions include/swoole_version.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@

#define SWOOLE_MAJOR_VERSION 4
#define SWOOLE_MINOR_VERSION 5
#define SWOOLE_RELEASE_VERSION 1
#define SWOOLE_RELEASE_VERSION 2
#define SWOOLE_EXTRA_VERSION ""
#define SWOOLE_VERSION "4.5.1"
#define SWOOLE_VERSION_ID 40501
#define SWOOLE_VERSION "4.5.2"
#define SWOOLE_VERSION_ID 40502
#define SWOOLE_API_VERSION_ID 0x202003a

#define SWOOLE_BUG_REPORT \
Expand Down
56 changes: 29 additions & 27 deletions package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
<email>[email protected]</email>
<active>yes</active>
</developer>
<date>2020-05-11</date>
<time>14:00:00</time>
<date>2020-05-28</date>
<time>17:00:00</time>
<version>
<release>4.5.1</release>
<release>4.5.2</release>
<api>4.0</api>
</version>
<stability>
Expand All @@ -56,32 +56,27 @@
<notes>
Enhancement
---
+ Support socket context bindto in hook (#3275) (#3278) (@codinghuang)
+ Support dns resolve in client::sendto (#3292) (@codinghuang)
+ Process->exit(0) will call os.exit directly (a732fe56) (@matyhtf)
+ Support `log_date_format` to change format of log date, `log_date_with_microseconds` to show micro-time in log (baf895bc) (@matyhtf)
+ Support CURLOPT_CAINFO and CURLOPT_CAPATH (swoole/library#32) (@sy-records)
+ Support CURLOPT_FORBID_REUSE (swoole/library#33) (@sy-records)
+ Support `Server->set(['log_rotation' => SWOOLE_LOG_ROTATION_DAILY])` to generate log file by date (#3311) (@matyhtf)
+ Support `swoole_async_set(['wait_signal' => true])`, reactor will not exit if there is signal listener (#3314) (@matyhtf)
+ Support `Server->sendfile` to send empty file (#3318) (@twose)
+ Improve worker idle warning (#3328) (@huanghantao)
+ Improve configuration parser about Host (for HTTPS proxy) (#3343) (@twose)
+ SSL use ecdh auto (#3316) (@matyhtf)
+ SSL quiet shutdown when client close (#3342) (@huanghantao)

Fixed
---
* Fixed 32-bit build (#3276) (#3277) (@remicollet) (@twose)
* Fixed missing error info (#3280) (@codinghuang)
* Fixed potential bugs in Table (d7b87b65) (@matyhtf)
* Fixed null ptr error in Server (defensive programming) (#3304) (#3305) (@twose)
* Fixed heartbeat timeout null ptr error (#3307) (@twose)
* Fixed mysqli options error (swoole/library#35)
* Fixed response header parsing when there is no space after the colon in the response header (swoole/library#27) (@Yurunsoft)

Deprecated
---
- Mark Coroutine\System::(fread/fgets/fwrite) as deprecated, please use runtime hook instead (it should have been included in v4.5.0) (c7c9bb40) (@twose)
* Fixed `Server->taskWait` on OSX (#3330) (@matyhtf)
* Fixed MQTT protocol bug (8dbf506b) (@guoxinhua) (2ae8eb32) (@twose)
* Fixed Content-Length int overflow (#3346) (@twose)
* Fixed packet length checker of PRI (#3348) (@twose)
* Fixed CURLOPT_POSTFIELDS (swoole/library@ed192f64) (@twose)
* Fixed the latest connection can not be released before accept new one (swoole/library@1ef79339) (@twose)

Kernel
---
+ Use zend_object_alloc (cf1afb25) (@twose)
+ Add more options for log (#3296) (@matyhtf)
+ Improve code and add more tests (swoole/library) (@deminy)
* Socket zero copy feature (#3327) (@twose)
* Use swoole_get_last_error/swoole_set_last_error to replace global vars (e25f262a) (@matyhtf) (#3315) (@huanghantao)
</notes>
<contents>
<dir name="/">
Expand All @@ -105,6 +100,7 @@
<file role="src" name="core-tests/samples/s1.cc" />
<file role="src" name="core-tests/src/client/client.cpp" />
<file role="src" name="core-tests/src/core/log.cpp" />
<file role="src" name="core-tests/src/core/time.cpp" />
<file role="src" name="core-tests/src/coroutine/async.cpp" />
<file role="src" name="core-tests/src/coroutine/base.cpp" />
<file role="src" name="core-tests/src/coroutine/channel.cpp" />
Expand Down Expand Up @@ -529,8 +525,8 @@
<file role="src" name="src/core/heap.cc" />
<file role="src" name="src/core/log.cc" />
<file role="src" name="src/core/ring_queue.cc" />
<file role="src" name="src/core/socket.cc" />
<file role="src" name="src/core/string.cc" />
<file role="src" name="src/core/timer.cc" />
<file role="src" name="src/coroutine/base.cc" />
<file role="src" name="src/coroutine/channel.cc" />
<file role="src" name="src/coroutine/context.cc" />
Expand All @@ -556,15 +552,15 @@
<file role="src" name="src/memory/table.cc" />
<file role="src" name="src/network/client.cc" />
<file role="src" name="src/network/dns.cc" />
<file role="src" name="src/network/process_pool.cc" />
<file role="src" name="src/network/socket.cc" />
<file role="src" name="src/network/stream.cc" />
<file role="src" name="src/network/thread_pool.cc" />
<file role="src" name="src/network/timer.cc" />
<file role="src" name="src/os/async_thread.cc" />
<file role="src" name="src/os/base.cc" />
<file role="src" name="src/os/msg_queue.cc" />
<file role="src" name="src/os/process_pool.cc" />
<file role="src" name="src/os/sendfile.cc" />
<file role="src" name="src/os/signal.cc" />
<file role="src" name="src/os/thread_pool.cc" />
<file role="src" name="src/os/timer.cc" />
<file role="src" name="src/os/wait.cc" />
<file role="src" name="src/pipe/base.cc" />
Expand Down Expand Up @@ -706,6 +702,7 @@
<file role="test" name="tests/include/lib/src/CurlManager.php" />
<file role="test" name="tests/include/lib/src/DbWrapper.php" />
<file role="test" name="tests/include/lib/src/LengthServer.php" />
<file role="test" name="tests/include/lib/src/MQTT/Helper.php" />
<file role="test" name="tests/include/lib/src/MysqlPool.php" />
<file role="test" name="tests/include/lib/src/ProcessManager.php" />
<file role="test" name="tests/include/lib/src/RandStr.php" />
Expand Down Expand Up @@ -1015,6 +1012,7 @@
<file role="test" name="tests/swoole_http2_client_coro/error.phpt" />
<file role="test" name="tests/swoole_http2_client_coro/goaway.phpt" />
<file role="test" name="tests/swoole_http2_client_coro/headers.phpt" />
<file role="test" name="tests/swoole_http2_client_coro/host.phpt" />
<file role="test" name="tests/swoole_http2_client_coro/huge_headers.phpt" />
<file role="test" name="tests/swoole_http2_client_coro/issues_2374.phpt" />
<file role="test" name="tests/swoole_http2_client_coro/multi.phpt" />
Expand Down Expand Up @@ -1136,6 +1134,7 @@
<file role="test" name="tests/swoole_http_server/rawCookie.phpt" />
<file role="test" name="tests/swoole_http_server/redirect.phpt" />
<file role="test" name="tests/swoole_http_server/response_create.phpt" />
<file role="test" name="tests/swoole_http_server/send_empty_file.phpt" />
<file role="test" name="tests/swoole_http_server/send_yield.phpt" />
<file role="test" name="tests/swoole_http_server/sendfile.phpt" />
<file role="test" name="tests/swoole_http_server/static_handler.phpt" />
Expand Down Expand Up @@ -1304,6 +1303,7 @@
<file role="test" name="tests/swoole_process/swoole_process_wait.phpt" />
<file role="test" name="tests/swoole_process/swoole_process_write.phpt" />
<file role="test" name="tests/swoole_process/timeout.phpt" />
<file role="test" name="tests/swoole_process/wait_signal.phpt" />
<file role="test" name="tests/swoole_process/write_in_worker.phpt" />
<file role="test" name="tests/swoole_process_pool/bug_2652.phpt" />
<file role="test" name="tests/swoole_process_pool/enable_coroutine.phpt" />
Expand Down Expand Up @@ -1491,6 +1491,7 @@
<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/mqtt/length_offset.phpt" />
<file role="test" name="tests/swoole_server/object/getManagerPid.phpt" />
<file role="test" name="tests/swoole_server/object/getMasterPid.phpt" />
<file role="test" name="tests/swoole_server/object/getWorkerId.phpt" />
Expand Down Expand Up @@ -1546,6 +1547,7 @@
<file role="test" name="tests/swoole_server/task/kill_01.phpt" />
<file role="test" name="tests/swoole_server/task/kill_02.phpt" />
<file role="test" name="tests/swoole_server/task/kill_task_worker_02.phpt" />
<file role="test" name="tests/swoole_server/task/scheduler_warning.phpt" />
<file role="test" name="tests/swoole_server/task/task_callback.phpt" />
<file role="test" name="tests/swoole_server/task/task_co.phpt" />
<file role="test" name="tests/swoole_server/task/task_enable_coroutine.phpt" />
Expand Down
81 changes: 60 additions & 21 deletions php_swoole_library.h
View file
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: 023b832113193732b3e6d57a78489a0ab71cce87 */
/* $Id: 612b7a470a7339ecd6913034386df573cbba8c70 */

static const char* swoole_library_source_constants =
"\n"
Expand Down Expand Up @@ -131,6 +131,8 @@ static const char* swoole_library_source_core_constant =
"\n"
" public const OPTION_LOG_DATE_WITH_MICROSECONDS = 'log_date_with_microseconds';\n"
"\n"
" public const OPTION_LOG_ROTATION = 'log_rotation';\n"
"\n"
" public const OPTION_DISPLAY_ERRORS = 'display_errors';\n"
"\n"
" public const OPTION_DNS_SERVER = 'dns_server';\n"
Expand All @@ -139,6 +141,8 @@ static const char* swoole_library_source_core_constant =
"\n"
" public const OPTION_ENABLE_SIGNALFD = 'enable_signalfd';\n"
"\n"
" public const OPTION_WAIT_SIGNAL = 'wait_signal';\n"
"\n"
" public const OPTION_DNS_CACHE_REFRESH_TIME = 'dns_cache_refresh_time';\n"
"\n"
" public const OPTION_SOCKET_BUFFER_SIZE = 'socket_buffer_size';\n"
Expand Down Expand Up @@ -1594,6 +1598,7 @@ static const char* swoole_library_source_core_coroutine_server =
"\n"
" while ($this->running) {\n"
" /** @var Socket $conn */\n"
" $conn = null;\n"
" $conn = $socket->accept();\n"
" if ($conn) {\n"
" $conn->setProtocol($this->setting);\n"
Expand Down Expand Up @@ -3786,9 +3791,11 @@ static const char* swoole_library_source_core_curl_handler =
" $client->setMethod($this->method);\n"
" }\n"
" /*\n"
" * Infile\n"
" * Data\n"
" */\n"
" if ($this->infile) {\n"
" // Infile\n"
" // Notice: we make its priority higher than postData but raw cURL will send both of them\n"
" $data = '';\n"
" while (true) {\n"
" $nLength = $this->infileSize - strlen($data);\n"
Expand All @@ -3801,33 +3808,33 @@ static const char* swoole_library_source_core_curl_handler =
" $data .= fread($this->infile, $nLength);\n"
" }\n"
" $client->setData($data);\n"
" // Notice: although we reset it, raw cURL never do this\n"
" $this->infile = null;\n"
" $this->infileSize = PHP_INT_MAX;\n"
" }\n"
" /*\n"
" * Upload File\n"
" */\n"
" if ($this->postData and is_array($this->postData)) {\n"
" foreach ($this->postData as $k => $v) {\n"
" if ($v instanceof CURLFile) {\n"
" $client->addFile($v->getFilename(), $k, $v->getMimeType() ?: 'application/octet-stream', $v->getPostFilename());\n"
" unset($this->postData[$k]);\n"
" } else {\n"
" // POST data\n"
" if ($this->postData) {\n"
" if (is_string($this->postData)) {\n"
" if (empty($this->headers['Content-Type'])) {\n"
" $this->headers['Content-Type'] = 'application/x-www-form-urlencoded';\n"
" }\n"
" } elseif (is_array($this->postData)) {\n"
" foreach ($this->postData as $k => $v) {\n"
" if ($v instanceof CURLFile) {\n"
" $client->addFile($v->getFilename(), $k, $v->getMimeType() ?: 'application/octet-stream', $v->getPostFilename());\n"
" unset($this->postData[$k]);\n"
" }\n"
" }\n"
" }\n"
" }\n"
" }\n"
" /*\n"
" * Post Data\n"
" */\n"
" if ($this->postData) {\n"
" if (is_string($this->postData) and empty($this->headers['Content-Type'])) {\n"
" $this->headers['Content-Type'] = 'application/x-www-form-urlencoded';\n"
" }\n"
" $client->setData($this->postData);\n"
" $this->postData = [];\n"
" }\n"
" /*\n"
" * Http Headers\n"
" * Headers\n"
" */\n"
" // Notice: setHeaders must be placed last, because headers may be changed by other parts\n"
" // As much as possible to ensure that Host is the first header.\n"
" // See: http://tools.ietf.org/html/rfc7230#section-5.4\n"
" $this->headers['Host'] = $this->urlInfo['host'];\n"
" // remove empty headers (keep same with raw cURL)\n"
" foreach ($this->headers as $headerName => $headerValue) {\n"
Expand Down Expand Up @@ -6251,6 +6258,37 @@ static const char* swoole_library_source_core_coroutine_fast_cgi_proxy =
" }\n"
"}\n";

static const char* swoole_library_source_core_coroutine_functions =
"\n"
"/**\n"
" * This file is part of Swoole.\n"
" *\n"
" * @link https://www.swoole.com\n"
" * @contact [email protected]\n"
" * @license https://github.com/swoole/library/blob/master/LICENSE\n"
" */\n"
"\n"
"declare(strict_types=1);\n"
"\n"
"namespace Swoole\\Coroutine;\n"
"\n"
"use Swoole\\Coroutine;\n"
"\n"
"function batch(array $tasks, float $timeout = -1): array\n"
"{\n"
" $wg = new WaitGroup();\n"
" $wg->add(count($tasks));\n"
" foreach ($tasks as $id => $task) {\n"
" Coroutine::create(function () use ($wg, &$tasks, $id, $task) {\n"
" $tasks[$id] = null;\n"
" $tasks[$id] = $task();\n"
" $wg->done();\n"
" });\n"
" }\n"
" $wg->wait($timeout);\n"
" return $tasks;\n"
"}\n";

static const char* swoole_library_source_ext_curl =
"\n"
"/**\n"
Expand Down Expand Up @@ -6499,6 +6537,7 @@ static void php_swoole_load_library()
zend::eval(swoole_library_source_core_coroutine_fast_cgi_client, "@swoole-src/library/core/Coroutine/FastCGI/Client.php");
zend::eval(swoole_library_source_core_coroutine_fast_cgi_client_exception, "@swoole-src/library/core/Coroutine/FastCGI/Client/Exception.php");
zend::eval(swoole_library_source_core_coroutine_fast_cgi_proxy, "@swoole-src/library/core/Coroutine/FastCGI/Proxy.php");
zend::eval(swoole_library_source_core_coroutine_functions, "@swoole-src/library/core/Coroutine/functions.php");
zend::eval(swoole_library_source_ext_curl, "@swoole-src/library/ext/curl.php");
zend::eval(swoole_library_source_functions, "@swoole-src/library/functions.php");
zend::eval(swoole_library_source_alias, "@swoole-src/library/alias.php");
Expand Down
2 changes: 1 addition & 1 deletion tests/swoole_server/mqtt/length_offset.phpt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ $pm->childFirst();
$pm->run();
?>
--EXPECT--
686
686
4 changes: 2 additions & 2 deletions tests/swoole_server/task/scheduler_warning.phpt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--TEST--
task: scheduler warning
swoole_server/task: scheduler warning
--SKIPIF--
<?php require __DIR__ . '/../../include/skipif.inc'; ?>
--FILE--
Expand Down Expand Up @@ -46,4 +46,4 @@ $pm->childFirst();
$pm->run();
?>
--EXPECTF--
[%s] WARNING swServer_master_onTimer (ERRNO %d): No idle task worker is available
[%s] WARNING swServer_master_onTimer (ERRNO %d): No idle task worker is available

0 comments on commit 348b5ad

Please sign in to comment.