Update version for Swoole 4.6.5 (#4139)

swoole · Apr 9, 2021 · a218e35 · a218e35
1 parent 7330c1a
commit a218e35
Show file tree

Hide file tree

Showing 26 changed files with 165 additions and 92 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 PROJECT(libswoole)
 
 ENABLE_LANGUAGE(ASM)
-set(SWOOLE_VERSION 4.6.5-dev)
+set(SWOOLE_VERSION 4.6.5)
 
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -g")

diff --git a/ext-src/php_swoole_library.h b/ext-src/php_swoole_library.h
@@ -2,7 +2,7 @@
  * Generated by build-library.php, Please DO NOT modify!
  */
 
-/* $Id: c0b3306481ecd77cc88ab51ba15403bcc33319a9 */
+/* $Id: c1d47051d7a949c0a76ca595f6d523faa2ecc3b9 */
 
 static const char* swoole_library_source_constants =
     "\n"
@@ -1613,6 +1613,11 @@ static const char* swoole_library_source_core_coroutine_wait_group =
     "        }\n"
     "        return true;\n"
     "    }\n"
+    "\n"
+    "    public function count(): int\n"
+    "    {\n"
+    "        return $this->count;\n"
+    "    }\n"
     "}\n";
 
 static const char* swoole_library_source_core_coroutine_server =
@@ -1927,10 +1932,10 @@ static const char* swoole_library_source_core_coroutine_http_functions =
     "        $client->set($options);\n"
     "    }\n"
     "    if (is_array($headers)) {\n"
-    "        $client->setHeaders($options);\n"
+    "        $client->setHeaders($headers);\n"
     "    }\n"
     "    if (is_array($cookies)) {\n"
-    "        $client->setCookies($options);\n"
+    "        $client->setCookies($cookies);\n"
     "    }\n"
     "    $request_url = swoole_array_default_value($info, 'path', '/');\n"
     "    if (!empty($info['query'])) {\n"

diff --git a/include/swoole_version.h b/include/swoole_version.h
@@ -21,8 +21,8 @@
 #define SWOOLE_MAJOR_VERSION 4
 #define SWOOLE_MINOR_VERSION 6
 #define SWOOLE_RELEASE_VERSION 5
-#define SWOOLE_EXTRA_VERSION "dev"
-#define SWOOLE_VERSION "4.6.5-dev"
+#define SWOOLE_EXTRA_VERSION ""
+#define SWOOLE_VERSION "4.6.5"
 #define SWOOLE_VERSION_ID 40605
 #define SWOOLE_API_VERSION_ID 0x202012a
 

diff --git a/package.xml b/package.xml
diff --git a/tests/swoole_curl/multi/bug48203_multi.phpt b/tests/swoole_curl/multi/bug48203_multi.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Variation of bug #48203 with curl_multi_exec (Crash when file pointers passed to curl are closed before calling curl_multi_exec)
+swoole_curl/multi: Variation of bug #48203 with curl_multi_exec (Crash when file pointers passed to curl are closed before calling curl_multi_exec)
 --SKIPIF--
 <?php
 require __DIR__ . '/../../include/skipif.inc';

diff --git a/tests/swoole_curl/multi/bug67643.phpt b/tests/swoole_curl/multi/bug67643.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
+swoole_curl/multi: Bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
 --SKIPIF--
+<?php require __DIR__ . '/../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('curl')) print 'skip';
 ?>

diff --git a/tests/swoole_curl/multi/bug71523.phpt b/tests/swoole_curl/multi/bug71523.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Bug #71523 (Copied handle with new option CURLOPT_HTTPHEADER crashes while curl_multi_exec)
+swoole_curl/multi: Bug #71523 (Copied handle with new option CURLOPT_HTTPHEADER crashes while curl_multi_exec)
 --SKIPIF--
+<?php require __DIR__ . '/../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded("curl")) {
     exit("skip curl extension not loaded");

diff --git a/tests/swoole_curl/multi/bug76675.phpt b/tests/swoole_curl/multi/bug76675.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Bug #76675 (Segfault with H2 server push write/writeheader handlers)
+swoole_curl/multi: Bug #76675 (Segfault with H2 server push write/writeheader handlers)
 --SKIPIF--
+<?php require __DIR__ . '/../../include/skipif.inc'; ?>
 <?php
 if (getenv("SKIP_ONLINE_TESTS")) {
     die("skip online test");

diff --git a/tests/swoole_curl/multi/bug77535.phpt b/tests/swoole_curl/multi/bug77535.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Bug #77535 (Invalid callback, h2 server push)
+swoole_curl/multi: Bug #77535 (Invalid callback, h2 server push)
 --SKIPIF--
+<?php require __DIR__ . '/../../include/skipif.inc'; ?>
 <?php
 if (getenv("SKIP_ONLINE_TESTS")) {
     die("skip online test");
@@ -90,5 +91,3 @@ MyHttpClient::addServerPushCallback
 MyHttpClient::sendRequest[2]
 MyHttpClient::sendRequest[3]
 Start handle request.
-
-
diff --git a/tests/swoole_curl/multi/bug77946.phpt b/tests/swoole_curl/multi/bug77946.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Bug #77946 (Errored cURL resources returned by curl_multi_info_read() must be compatible with curl_errno() and curl_error())
+swoole_curl/multi: Bug #77946 (Errored cURL resources returned by curl_multi_info_read() must be compatible with curl_errno() and curl_error())
 --SKIPIF--
+<?php require __DIR__ . '/../../include/skipif.inc'; ?>
 <?php
 
 if (!extension_loaded('curl')) {

diff --git a/tests/swoole_curl/multi/curl_basic_018.phpt b/tests/swoole_curl/multi/curl_basic_018.phpt
@@ -1,8 +1,9 @@
 --TEST--
-Test curl_setopt() with curl_multi function with basic functionality
+swoole_curl/multi: Test curl_setopt() with curl_multi function with basic functionality
 --CREDITS--
 TestFest 2009 - AFUP - Thomas Rabaix <thomas.rabaix@gmail.com>
 --SKIPIF--
+<?php require __DIR__ . '/../../include/skipif.inc'; ?>
 --FILE--
 <?php
 require __DIR__ . '/../../include/bootstrap.php';

diff --git a/tests/swoole_curl/multi/curl_copy_handle_variation4.phpt b/tests/swoole_curl/multi/curl_copy_handle_variation4.phpt
@@ -1,6 +1,7 @@
 --TEST--
-curl_copy_handle() allows to post CURLFile multiple times with curl_multi_exec()
+swoole_curl/multi: curl_copy_handle() allows to post CURLFile multiple times with curl_multi_exec()
 --SKIPIF--
+<?php require __DIR__ . '/../../include/skipif.inc'; ?>
 --FILE--
 <?php
 require __DIR__ . '/../../include/bootstrap.php';

diff --git a/tests/swoole_curl/multi/curl_int_cast.phpt b/tests/swoole_curl/multi/curl_int_cast.phpt
@@ -1,5 +1,7 @@
 --TEST--
-Casting CurlHandle to int returns object ID
+swoole_curl/multi: Casting CurlHandle to int returns object ID
+--SKIPIF--
+<?php require __DIR__ . '/../../include/skipif.inc'; ?>
 --FILE--
 <?php
 use Swoole\Runtime;

diff --git a/tests/swoole_curl/multi/curl_multi_close_basic.phpt b/tests/swoole_curl/multi/curl_multi_close_basic.phpt
@@ -1,9 +1,10 @@
 --TEST--
-curl_multi_close
+swoole_curl/multi: curl_multi_close
 --CREDITS--
 Stefan Koopmanschap <stefan@php.net>
 #testfest Utrecht 2009
 --SKIPIF--
+<?php require __DIR__ . '/../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('curl')) print 'skip';
 ?>
@@ -21,4 +22,4 @@ run(function () {
     curl_type_assert($ch, 'Swoole-Coroutine-cURL-Multi-Handle', Swoole\Coroutine\Curl\MultiHandle::class);
 });
 ?>
---EXPECT--
+--EXPECT--
diff --git a/tests/swoole_curl/multi/curl_multi_close_basic001.phpt b/tests/swoole_curl/multi/curl_multi_close_basic001.phpt
@@ -1,6 +1,7 @@
 --TEST--
-curl_multi_close return false when supplied resource not valid cURL multi handle
+swoole_curl/multi: curl_multi_close return false when supplied resource not valid cURL multi handle
 --SKIPIF--
+<?php require __DIR__ . '/../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('curl')) print 'skip';
 ?>

diff --git a/tests/swoole_curl/multi/curl_multi_close_reference.phpt b/tests/swoole_curl/multi/curl_multi_close_reference.phpt
@@ -1,6 +1,7 @@
 --TEST--
-curl_multi_close closed by cleanup functions
+swoole_curl/multi: curl_multi_close closed by cleanup functions
 --SKIPIF--
+<?php require __DIR__ . '/../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('curl')) print 'skip';
 ?>

diff --git a/tests/swoole_curl/multi/curl_multi_errno_strerror_001.phpt b/tests/swoole_curl/multi/curl_multi_errno_strerror_001.phpt
@@ -1,6 +1,7 @@
 --TEST--
-curl_multi_errno and curl_multi_strerror basic test
+swoole_curl/multi: curl_multi_errno and curl_multi_strerror basic test
 --SKIPIF--
+<?php require __DIR__ . '/../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded("curl")) {
         exit("skip curl extension not loaded");

diff --git a/tests/swoole_curl/multi/curl_multi_getcontent_basic3.phpt b/tests/swoole_curl/multi/curl_multi_getcontent_basic3.phpt
@@ -1,9 +1,10 @@
 --TEST--
-Curl_multi_getcontent() basic test with different sources (local file/http)
+swoole_curl/multi: Curl_multi_getcontent() basic test with different sources (local file/http)
 --CREDITS--
 Rein Velt (rein@velt.org)
 #TestFest Utrecht 20090509
 --SKIPIF--
+<?php require __DIR__ . '/../../include/skipif.inc'; ?>
 --FILE--
 <?php
 require __DIR__ . '/../../include/bootstrap.php';

diff --git a/tests/swoole_curl/multi/curl_multi_info_read.phpt b/tests/swoole_curl/multi/curl_multi_info_read.phpt
@@ -1,8 +1,9 @@
 --TEST--
-array curl_multi_info_read ( resource $mh [, int &$msgs_in_queue = NULL ] );
+swoole_curl/multi: array curl_multi_info_read ( resource $mh [, int &$msgs_in_queue = NULL ] );
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br> - @phpsp - sao paulo - br
 --SKIPIF--
+<?php require __DIR__ . '/../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded('curl')) { print("skip"); }
 ?>

diff --git a/tests/swoole_curl/multi/curl_multi_init_basic.phpt b/tests/swoole_curl/multi/curl_multi_init_basic.phpt
@@ -1,9 +1,10 @@
 --TEST--
-Test curl_multi_init()
+swoole_curl/multi: Test curl_multi_init()
 --CREDITS--
 Mark van der Velden
 #testfest Utrecht 2009
 --SKIPIF--
+<?php require __DIR__ . '/../../include/skipif.inc'; ?>
 <?php if (!extension_loaded("curl")) print "skip"; ?>
 --FILE--
 <?php

diff --git a/tests/swoole_curl/multi/curl_multi_segfault.phpt b/tests/swoole_curl/multi/curl_multi_segfault.phpt
@@ -1,6 +1,7 @@
 --TEST--
-Segfault due to libcurl connection caching
+swoole_curl/multi: Segfault due to libcurl connection caching
 --SKIPIF--
+<?php require __DIR__ . '/../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded("curl")) exit("skip curl extension not loaded");
 if (false === getenv('PHP_CURL_FTP_REMOTE_SERVER'))  exit("skip PHP_CURL_FTP_REMOTE_SERVER env variable is not defined");

diff --git a/tests/swoole_curl/multi/curl_multi_select_basic1.phpt b/tests/swoole_curl/multi/curl_multi_select_basic1.phpt
@@ -1,9 +1,10 @@
 --TEST--
-Test curl_multi_select()
+swoole_curl/multi: Test curl_multi_select()
 --CREDITS--
 Ivo Jansch <ivo@ibuildings.com>
 #testfest Utrecht 2009
 --SKIPIF--
+<?php require __DIR__ . '/../../include/skipif.inc'; ?>
 <?php if (!extension_loaded("curl")) print "skip"; ?>
 --FILE--
 <?php

diff --git a/tests/swoole_curl/multi/curl_multi_setopt_basic001.phpt b/tests/swoole_curl/multi/curl_multi_setopt_basic001.phpt
@@ -1,6 +1,7 @@
 --TEST--
-curl_multi_setopt basic test
+swoole_curl/multi: curl_multi_setopt basic test
 --SKIPIF--
+<?php require __DIR__ . '/../../include/skipif.inc'; ?>
 <?php
 if (!extension_loaded("curl")) {
         exit("skip curl extension not loaded");

diff --git a/tests/swoole_curl/upload/1.phpt b/tests/swoole_curl/upload/1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-swoole_library/curl/upload: CURL file uploading
+swoole_curl/upload: CURL file uploading
 --INI--
 --SKIPIF--
 <?php require __DIR__ . '/../../include/skipif.inc'; ?>

diff --git a/tests/swoole_server/ssl/heartbeat_1.phpt b/tests/swoole_server/ssl/heartbeat_1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-swoole_server: heartbeat with bad client
+swoole_server/ssl: heartbeat with bad client
 --SKIPIF--
 <?php
 require __DIR__ . '/../../include/skipif.inc';

diff --git a/tests/swoole_server/ssl/heartbeat_2.phpt b/tests/swoole_server/ssl/heartbeat_2.phpt
@@ -1,5 +1,5 @@
 --TEST--
-swoole_server: heartbeat normal
+swoole_server/ssl: heartbeat normal
 --SKIPIF--
 <?php
 require __DIR__ . '/../../include/skipif.inc';