From d0215fe377710b2a7541d8f52edf46e1ebad8e68 Mon Sep 17 00:00:00 2001 From: gggeek Date: Thu, 9 Feb 2023 10:09:22 +0000 Subject: [PATCH] add testing for different sslversion --- tests/09HTTPTest.php | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/tests/09HTTPTest.php b/tests/09HTTPTest.php index 6153bf9e..b216282b 100644 --- a/tests/09HTTPTest.php +++ b/tests/09HTTPTest.php @@ -292,6 +292,11 @@ class HTTPTest extends ServerTest $this->client->setSSLVerifyPeer(!$this->args['HTTPSIGNOREPEER']); $this->client->setSSLVerifyHost($this->args['HTTPSVERIFYHOST']); $this->client->setSSLVersion($this->args['SSLVERSION']); + if (version_compare(PHP_VERSION, '8.0', '>') && $this->args['SSLVERSION'] == 0) + { + $version = explode('.', PHP_VERSION); + $this->client->setSSLVersion(4 + $version[1]); + } $this->$method(); } @@ -333,14 +338,16 @@ class HTTPTest extends ServerTest /// @todo replace with setOptions when dropping the BC layer $this->client->setSSLVerifyPeer(!$this->args['HTTPSIGNOREPEER']); $this->client->setSSLVerifyHost($this->args['HTTPSVERIFYHOST']); - $this->client->setSSLVersion($this->args['SSLVERSION']); $this->client->setUseCurl(\PhpXmlRpc\Client::USE_CURL_NEVER); - + $this->client->setSSLVersion($this->args['SSLVERSION']); if (version_compare(PHP_VERSION, '8.0', '>')) { $version = explode('.', PHP_VERSION); $this->client->setOption(\PhpXmlRpc\Client::OPT_EXTRA_SOCKET_OPTS, array('ssl' => array('security_level' => 2 + $version[1]))); + if ($this->args['SSLVERSION'] == 0) { + $this->client->setSSLVersion(4 + $version[1]); + } } $this->$method(); @@ -377,6 +384,11 @@ class HTTPTest extends ServerTest $this->client->setSSLVerifyPeer(!$this->args['HTTPSIGNOREPEER']); $this->client->setSSLVerifyHost($this->args['HTTPSVERIFYHOST']); $this->client->setSSLVersion($this->args['SSLVERSION']); + if (version_compare(PHP_VERSION, '8.0', '>') && $this->args['SSLVERSION'] == 0) + { + $version = explode('.', PHP_VERSION); + $this->client->setSSLVersion(4 + $version[1]); + } $this->$method(); } @@ -385,7 +397,7 @@ class HTTPTest extends ServerTest * @dataProvider getSingleHttpTestMethods * @param string $method */ - public function testHttp2($method) + public function testHttp2NoTls($method) { if (!function_exists('curl_init')) { -- 2.47.0