Skip to content

Commit

Permalink
Release version
Browse files Browse the repository at this point in the history
  • Loading branch information
matyhtf committed Nov 7, 2022
1 parent e27d701 commit be7eb2e
Show file tree
Hide file tree
Showing 11 changed files with 151 additions and 135 deletions.
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 5.0.1-dev)
set(SWOOLE_VERSION 5.0.1)

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -g")
Expand Down
69 changes: 36 additions & 33 deletions ext-src/php_swoole_library.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
+----------------------------------------------------------------------+
*/

/* $Id: cc2a5d35674acd1609d060529ea4298b4fcde292 */
/* $Id: eefdb2208fbc4dbd1a028b1a226516c89ec0b864 */

static const char* swoole_library_source_constants =
"\n"
Expand Down Expand Up @@ -3787,13 +3787,13 @@ static const char* swoole_library_source_core_curl_handler =
" case CURLOPT_PRIVATE:\n"
" $this->info['private'] = $value;\n"
" break;\n"
" \n"
" \n"
" case CURLOPT_VERBOSE:\n"
" \n"
" case CURLOPT_SSLVERSION:\n"
" case CURLOPT_NOSIGNAL:\n"
" case CURLOPT_FRESH_CONNECT:\n"
" \n"
" \n"
" case CURLOPT_BINARYTRANSFER: \n"
" case CURLOPT_DNS_USE_GLOBAL_CACHE:\n"
" case CURLOPT_DNS_CACHE_TIMEOUT:\n"
Expand All @@ -3808,7 +3808,7 @@ static const char* swoole_library_source_core_curl_handler =
" case CURLOPT_PROXYHEADER:\n"
" case CURLOPT_HTTPPROXYTUNNEL:\n"
" break;\n"
" \n"
" \n"
" case CURLOPT_SSL_VERIFYHOST:\n"
" break;\n"
" case CURLOPT_SSL_VERIFYPEER:\n"
Expand All @@ -3831,7 +3831,7 @@ static const char* swoole_library_source_core_curl_handler =
" case CURLOPT_SSLKEYPASSWD:\n"
" $this->clientOptions[Constant::OPTION_SSL_PASSPHRASE] = $value;\n"
" break;\n"
" \n"
" \n"
" case CURLOPT_POST:\n"
" $this->method = 'POST';\n"
" break;\n"
Expand All @@ -3841,14 +3841,14 @@ static const char* swoole_library_source_core_curl_handler =
" $this->method = 'POST';\n"
" }\n"
" break;\n"
" \n"
" \n"
" case CURLOPT_SAFE_UPLOAD:\n"
" if (!$value) {\n"
" trigger_error('swoole_curl_setopt(): Disabling safe uploads is no longer supported', E_USER_WARNING);\n"
" return false;\n"
" }\n"
" break;\n"
" \n"
" \n"
" case CURLOPT_HTTPHEADER:\n"
" if (!is_array($value) and !is_iterable($value)) {\n"
" trigger_error('swoole_curl_setopt(): You must pass either an object or an array with the CURLOPT_HTTPHEADER argument', E_USER_WARNING);\n"
Expand Down Expand Up @@ -3895,7 +3895,7 @@ static const char* swoole_library_source_core_curl_handler =
" case CURLOPT_FAILONERROR:\n"
" $this->failOnError = $value;\n"
" break;\n"
" \n"
" \n"
" case CURLOPT_COOKIE:\n"
" $this->setHeader('Cookie', $value);\n"
" break;\n"
Expand Down Expand Up @@ -5109,7 +5109,7 @@ static const char* swoole_library_source_core_fast_cgi_request =
" public function __toString(): string\n"
" {\n"
" $body = $this->getBody();\n"
" $beginRequestFrame = new BeginRequest(FastCGI::RESPONDER, ($this->keepConn ? FastCGI::KEEP_CONN : 0));\n"
" $beginRequestFrame = new BeginRequest(FastCGI::RESPONDER, $this->keepConn ? FastCGI::KEEP_CONN : 0);\n"
" $paramsFrame = new Params($this->getParams());\n"
" $paramsEofFrame = new Params();\n"
" if (empty($body)) {\n"
Expand Down Expand Up @@ -6022,7 +6022,7 @@ static const char* swoole_library_source_core_coroutine_fast_cgi_proxy =
" $server = $userRequest->server;\n"
" $headers = $userRequest->header;\n"
" $pathInfo = $userRequest->server['path_info'];\n"
" $pathInfo = '/' . (ltrim($pathInfo, '/'));\n"
" $pathInfo = '/' . ltrim($pathInfo, '/');\n"
" if (strlen($this->index) !== 0) {\n"
" $extension = pathinfo($pathInfo, PATHINFO_EXTENSION);\n"
" if (empty($extension)) {\n"
Expand Down Expand Up @@ -6075,7 +6075,7 @@ static const char* swoole_library_source_core_coroutine_fast_cgi_proxy =
"\n"
" public function pass($userRequest, $userResponse): void\n"
" {\n"
" if (!($userRequest instanceof HttpRequest)) {\n"
" if (!$userRequest instanceof HttpRequest) {\n"
" $request = $this->translateRequest($userRequest);\n"
" } else {\n"
" $request = $userRequest;\n"
Expand Down Expand Up @@ -6121,6 +6121,7 @@ static const char* swoole_library_source_core_process_manager =
"namespace Swoole\\Process;\n"
"\n"
"use Swoole\\Constant;\n"
"\n"
"use function Swoole\\Coroutine\\run;\n"
"\n"
"class Manager\n"
Expand Down Expand Up @@ -7518,6 +7519,7 @@ static const char* swoole_library_source_core_server_helper =
"\n"
"use Swoole\\Server;\n"
"use Swoole\\Timer;\n"
"\n"
"use function Swoole\\Coroutine\\go;\n"
"\n"
"class Helper\n"
Expand Down Expand Up @@ -8123,6 +8125,7 @@ static const char* swoole_library_source_core_name_resolver_consul =
"namespace Swoole\\NameResolver;\n"
"\n"
"use Swoole\\NameResolver;\n"
"\n"
"use function Swoole\\Coroutine\\Http\\get;\n"
"use function Swoole\\Coroutine\\Http\\request;\n"
"\n"
Expand Down Expand Up @@ -8715,28 +8718,28 @@ static const char* swoole_library_source_functions =
" $type = $_f->get(1)->trim();\n"
"\n"
" switch ($type) {\n"
" case 'i':\n"
" case 'int':\n"
" $table->column($name, Swoole\\Table::TYPE_INT);\n"
" break;\n"
" case 'f':\n"
" case 'float':\n"
" $table->column($name, Swoole\\Table::TYPE_FLOAT);\n"
" break;\n"
" case 's':\n"
" case 'string':\n"
" if ($_f->count() < 3) {\n"
" throw new RuntimeException('need to give string length');\n"
" }\n"
" $length = intval($_f->get(2)->trim()->toString());\n"
" if ($length <= 0) {\n"
" throw new RuntimeException(\"invalid string length[{$length}]\");\n"
" }\n"
" $table->column($name, Swoole\\Table::TYPE_STRING, $length);\n"
" break;\n"
" default:\n"
" throw new RuntimeException(\"unknown field type[{$type}]\");\n"
" break;\n"
" case 'i':\n"
" case 'int':\n"
" $table->column($name, Swoole\\Table::TYPE_INT);\n"
" break;\n"
" case 'f':\n"
" case 'float':\n"
" $table->column($name, Swoole\\Table::TYPE_FLOAT);\n"
" break;\n"
" case 's':\n"
" case 'string':\n"
" if ($_f->count() < 3) {\n"
" throw new RuntimeException('need to give string length');\n"
" }\n"
" $length = (int) $_f->get(2)->trim()->toString();\n"
" if ($length <= 0) {\n"
" throw new RuntimeException(\"invalid string length[{$length}]\");\n"
" }\n"
" $table->column($name, Swoole\\Table::TYPE_STRING, $length);\n"
" break;\n"
" default:\n"
" throw new RuntimeException(\"unknown field type[{$type}]\");\n"
" break;\n"
" }\n"
" }\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 5
#define SWOOLE_MINOR_VERSION 0
#define SWOOLE_RELEASE_VERSION 1
#define SWOOLE_EXTRA_VERSION "dev"
#define SWOOLE_VERSION "5.0.1-dev"
#define SWOOLE_EXTRA_VERSION ""
#define SWOOLE_VERSION "5.0.1"
#define SWOOLE_VERSION_ID 50001
#define SWOOLE_API_VERSION_ID 0x202208a

Expand Down
Loading

0 comments on commit be7eb2e

Please sign in to comment.