Skip to content

Commit

Permalink
Update version for Swoole 4.4.16
Browse files Browse the repository at this point in the history
  • Loading branch information
@twose
twose committed Feb 19, 2020
1 parent 9f64949 commit d1a0dc5
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 29 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.4.15)
SET(SWOOLE_VERSION 4.4.16)
SET(SWOOLE_CLFLAGS pthread rt dl ssl crypt crypto)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
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 @@ -103,8 +103,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 16
#define SWOOLE_EXTRA_VERSION "alpha"
#define SWOOLE_VERSION "4.4.16-alpha"
#define SWOOLE_EXTRA_VERSION ""
#define SWOOLE_VERSION "4.4.16"
#define SWOOLE_VERSION_ID 40416
#define SWOOLE_BUG_REPORT \
"A bug occurred in Swoole-v" SWOOLE_VERSION ", please report it.\n"\
Expand Down
44 changes: 25 additions & 19 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-01-14</date>
<time>21:00:00</time>
<date>2020-02-19</date>
<time>12:00:00</time>
<version>
<release>4.4.15</release>
<release>4.4.16</release>
<api>4.0</api>
</version>
<stability>
Expand All @@ -56,25 +56,25 @@
<notes>
Enhancement
---
+ Bad websocket handshake request will respond 400 (fdc1cb67) (@twose)
+ Disable accept when have too many connections (dd9fbf2f) (@matyhtf)
+ Binary security of package_eof (#3054) (@twose)
+ Support HTTP chunked request (#3055) (@twose)
+ Unified naming style and improve accessibility of Curl\Handler properties (library/curl) (@twose)
+ Now you can get [Supported Versions of Swoole](https://github.com/swoole/swoole-src/blob/master/SUPPORTED.md) (@twose)
+ More friendly error messages (0412f442) (09a48835) (@twose)
+ Prevent endless loops that may occur in some special systems (069a0092) (@matyhtf)
+ Add driver in PDOConfig (swoole/library#8) (@jcheron)

Fixed
---
* Fixed Http\Response->close (d30e3269) (@twose)
* Fixed possible memory overflow (2212e091) (@twose)
* Fixed memory error when MSHUTDOWN (undestroyed reactor) (78d6dd73) (@twose)
* Fixed handler of event HUP (#3046) (@matyhtf) (@twose)
* Fixed exit code 1 (f982b817) (@matyhtf) (@twose) (@qiqizjl)
* Fixed missing "unhook curl_multi_getcontent" (7b2e960e) (@twose)
* Fixed Coroutine HTTP2 Server memory error (d90eebe6) (@twose)
* Fixed http_context_send_data (#3059) (@twose)
* Fixed send_yield in BASE mode (edbb654d) (1b8096e9) (@twose)
* Refactor HTTP2 Server to fix some bugs (#3061) (@twose)
* Fixed behaviour of CURLOPT_POSTFIELDS, CURLOPT_HTTPHEADER, curl_close (library/curl) (@twose)
* Fixed http2_session.default_ctx double free (bddbb9b1) (@twose)
* Fixed uninitialized http_context (ce77c641) (@twose)
* Fixed typo in Table (may lead to memory errors) (db4eec17) (@twose)
* Fixed status error when kill USR2 and no set task_num (e4378278) (@GXhua)
* Fixed incomplete raw-content of HTTP request (#3079) (#3085) (@hantaohuang)
* Fixed static handler (when the file content is empty, server should respond 404) (#3084) (@Yurunsoft)
* Fixed http_compression_level not work (16f9274e) (@twose)
* Fixed null pointer error of Coroutine HTTP2 Server caused by no handle (ed680989) (@twose)
* Fixed option socket_dontwait not work (27589376) (@matyhtf)
* Fixed double zend::eval (#3099) (@GXhua)
* Fixed HTTP2 Server null pointer error (respond after connection is closed) (#3110) (@twose)
* Fixed PDOStatementProxy::setFetchMode missing arguments (swoole/library#13) (@jcheron)
</notes>
<contents>
<dir name="/">
Expand All @@ -83,6 +83,7 @@
<file role="doc" name="LICENSE" />
<file role="doc" name="README-CN.md" />
<file role="doc" name="README.md" />
<file role="doc" name="SUPPORTED.md" />
<file role="src" name="benchmark/ab.sh" />
<file role="src" name="benchmark/aio.php" />
<file role="src" name="benchmark/benchmark.php" />
Expand Down Expand Up @@ -295,6 +296,7 @@
<file role="doc" name="examples/http/curl.php" />
<file role="doc" name="examples/http/detach.php" />
<file role="doc" name="examples/http/download.php" />
<file role="doc" name="examples/http/empty.txt" />
<file role="doc" name="examples/http/http_proxy.php" />
<file role="doc" name="examples/http/http_proxy_auth.php" />
<file role="doc" name="examples/http/https_proxy.php" />
Expand Down Expand Up @@ -1088,6 +1090,7 @@
<file role="test" name="tests/swoole_http_server/bug_2786.phpt" />
<file role="test" name="tests/swoole_http_server/bug_2947.phpt" />
<file role="test" name="tests/swoole_http_server/bug_2988.phpt" />
<file role="test" name="tests/swoole_http_server/bug_compression_level.phpt" />
<file role="test" name="tests/swoole_http_server/bug_get_request_data_after_end.phpt" />
<file role="test" name="tests/swoole_http_server/callback_new_obj_method.phpt" />
<file role="test" name="tests/swoole_http_server/callback_new_static_method.phpt" />
Expand Down Expand Up @@ -1144,6 +1147,7 @@
<file role="test" name="tests/swoole_http_server_coro/bad_request.phpt" />
<file role="test" name="tests/swoole_http_server_coro/bug_2682.phpt" />
<file role="test" name="tests/swoole_http_server_coro/bug_3025.phpt" />
<file role="test" name="tests/swoole_http_server_coro/bug_no_handle.phpt" />
<file role="test" name="tests/swoole_http_server_coro/error_404.phpt" />
<file role="test" name="tests/swoole_http_server_coro/handle.phpt" />
<file role="test" name="tests/swoole_http_server_coro/http2.phpt" />
Expand All @@ -1153,6 +1157,7 @@
<file role="test" name="tests/swoole_http_server_coro/pipeline.phpt" />
<file role="test" name="tests/swoole_http_server_coro/post_array.phpt" />
<file role="test" name="tests/swoole_http_server_coro/random_port.phpt" />
<file role="test" name="tests/swoole_http_server_coro/rawContent_get_big_data.phpt" />
<file role="test" name="tests/swoole_http_server_coro/reuse_port.phpt" />
<file role="test" name="tests/swoole_http_server_coro/sendfile.phpt" />
<file role="test" name="tests/swoole_http_server_coro/tcp_nodelay.phpt" />
Expand Down Expand Up @@ -1202,6 +1207,7 @@
<file role="test" name="tests/swoole_library/exec/exec/1.phpt" />
<file role="test" name="tests/swoole_library/exec/exec/2.phpt" />
<file role="test" name="tests/swoole_library/exec/shell_exec/1.phpt" />
<file role="test" name="tests/swoole_library/multibyte_string_object/base.phpt" />
<file role="test" name="tests/swoole_library/string_object/base.phpt" />
<file role="test" name="tests/swoole_library/wait_group/normal.phpt" />
<file role="test" name="tests/swoole_library/wait_group/timeout.phpt" />
Expand Down
49 changes: 42 additions & 7 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: d680e785317f1e29bb259a3debab0b29eee314fb */
/* $Id: b5c9cede8c6150feba50d0e28d56de355fa69d16 */

static const char* swoole_library_source_constants =
"\n"
Expand Down Expand Up @@ -369,10 +369,10 @@ static const char* swoole_library_source_core_constant =
"\n"
" public const OPTION_HTTP_COMPRESSION = 'http_compression';\n"
"\n"
" public const OPTION_HTTP_GZIP_LEVEL = 'http_gzip_level';\n"
"\n"
" public const OPTION_HTTP_COMPRESSION_LEVEL = 'http_compression_level';\n"
"\n"
" public const OPTION_HTTP_GZIP_LEVEL = 'http_gzip_level';\n"
"\n"
" public const OPTION_UPLOAD_TMP_DIR = 'upload_tmp_dir';\n"
"\n"
" public const OPTION_ENABLE_STATIC_HANDLER = 'enable_static_handler';\n"
Expand Down Expand Up @@ -568,6 +568,7 @@ static const char* swoole_library_source_core_string_object =
" }\n"
"\n"
" /**\n"
" * @param null|int $count\n"
" * @return static\n"
" */\n"
" public function replace(string $search, string $replace, &$count = null)\n"
Expand Down Expand Up @@ -863,15 +864,15 @@ static const char* swoole_library_source_core_array_object =
" * @param mixed $key\n"
" * @param mixed $value\n"
" */\n"
" public function offsetSet($key, $value)\n"
" public function offsetSet($key, $value): void\n"
" {\n"
" $this->array[$key] = $value;\n"
" }\n"
"\n"
" /**\n"
" * @param mixed $key\n"
" */\n"
" public function offsetUnset($key)\n"
" public function offsetUnset($key): void\n"
" {\n"
" unset($this->array[$key]);\n"
" }\n"
Expand Down Expand Up @@ -1364,7 +1365,7 @@ static const char* swoole_library_source_core_object_proxy =
" return $this->__object->{$name};\n"
" }\n"
"\n"
" public function __set(string $name, $value)\n"
" public function __set(string $name, $value): void\n"
" {\n"
" $this->__object->{$name} = $value;\n"
" }\n"
Expand Down Expand Up @@ -2188,6 +2189,13 @@ static const char* swoole_library_source_core_database_pdo_config =
"\n"
"class PDOConfig\n"
"{\n"
" public const DRIVER_MYSQL = 'mysql';\n"
"\n"
" public const DRIVER_PGSQL = 'pgsql';\n"
"\n"
" /** @var string */\n"
" protected $driver = self::DRIVER_MYSQL;\n"
"\n"
" /** @var string */\n"
" protected $host = '127.0.0.1';\n"
"\n"
Expand All @@ -2212,6 +2220,17 @@ static const char* swoole_library_source_core_database_pdo_config =
" /** @var array */\n"
" protected $options = [];\n"
"\n"
" public function getDriver(): string\n"
" {\n"
" return $this->driver;\n"
" }\n"
"\n"
" public function withDriver(string $driver): self\n"
" {\n"
" $this->driver = $driver;\n"
" return $this;\n"
" }\n"
"\n"
" public function getHost(): string\n"
" {\n"
" return $this->host;\n"
Expand Down Expand Up @@ -2304,6 +2323,19 @@ static const char* swoole_library_source_core_database_pdo_config =
" $this->options = $options;\n"
" return $this;\n"
" }\n"
"\n"
" /**\n"
" * Returns the list of available drivers\n"
" *\n"
" * @return string[]\n"
" */\n"
" public static function getAvailableDrivers()\n"
" {\n"
" return [\n"
" self::DRIVER_MYSQL,\n"
" self::DRIVER_PGSQL,\n"
" ];\n"
" }\n"
"}\n";

static const char* swoole_library_source_core_database_pdo_pool =
Expand Down Expand Up @@ -2340,7 +2372,7 @@ static const char* swoole_library_source_core_database_pdo_pool =
" $this->config = $config;\n"
" parent::__construct(function () {\n"
" return new PDO(\n"
" 'mysql:' .\n"
" \"{$this->config->getDriver()}:\" .\n"
" (\n"
" $this->config->hasUnixSocket() ?\n"
" \"unix_socket={$this->config->getUnixSocket()};\" :\n"
Expand Down Expand Up @@ -2586,6 +2618,9 @@ static const char* swoole_library_source_core_database_pdo_statement_proxy =
" public function setFetchMode(int $mode, $classNameObject = null, array $ctorarfg = []): bool\n"
" {\n"
" $this->setFetchModeContext = [$mode, $classNameObject, $ctorarfg];\n"
" if (!isset($classNameObject)) {\n"
" return $this->__object->setFetchMode($mode);\n"
" }\n"
" return $this->__object->setFetchMode($mode, $classNameObject, $ctorarfg);\n"
" }\n"
"\n"
Expand Down

0 comments on commit d1a0dc5

Please sign in to comment.