Skip to content

Commit 8207e01

Browse files
committed
fix: CURLOPT_SSL_VERIFYPEER values and tests related with CURLOPT_SSL_VERIFYPEER and CURLOPT_SSL_VERIFYHOST
1 parent 35345c7 commit 8207e01

File tree

3 files changed

+19
-4
lines changed

3 files changed

+19
-4
lines changed

system/HTTP/CURLRequest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -544,10 +544,10 @@ protected function setCURLOptions(array $curlOptions = [], array $config = [])
544544

545545
$curlOptions[CURLOPT_CAINFO] = $file;
546546
if ($config['verify'] === 'yes') {
547-
$curlOptions[CURLOPT_SSL_VERIFYPEER] = 1;
547+
$curlOptions[CURLOPT_SSL_VERIFYPEER] = true;
548548
$curlOptions[CURLOPT_SSL_VERIFYHOST] = 2;
549549
} else {
550-
$curlOptions[CURLOPT_SSL_VERIFYPEER] = 0;
550+
$curlOptions[CURLOPT_SSL_VERIFYPEER] = false;
551551
$curlOptions[CURLOPT_SSL_VERIFYHOST] = 0;
552552
}
553553
} elseif (is_bool($config['verify'])) {

tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@ public function testSSLVerification(): void
545545
$this->assertSame($file, $options[CURLOPT_CAINFO]);
546546

547547
$this->assertArrayHasKey(CURLOPT_SSL_VERIFYPEER, $options);
548-
$this->assertSame(1, $options[CURLOPT_SSL_VERIFYPEER]);
548+
$this->assertTrue($options[CURLOPT_SSL_VERIFYPEER]);
549549
}
550550

551551
public function testSSLWithBadKey(): void

tests/system/HTTP/CURLRequestTest.php

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,12 +528,27 @@ public function testSSLVerification(): void
528528
$this->assertSame($file, $options[CURLOPT_CAINFO]);
529529

530530
$this->assertArrayHasKey(CURLOPT_SSL_VERIFYPEER, $options);
531-
$this->assertSame(1, $options[CURLOPT_SSL_VERIFYPEER]);
531+
$this->assertTrue($options[CURLOPT_SSL_VERIFYPEER]);
532532

533533
$this->assertArrayHasKey(CURLOPT_SSL_VERIFYHOST, $options);
534534
$this->assertSame(2, $options[CURLOPT_SSL_VERIFYHOST]);
535535
}
536536

537+
public function testNoSSL(): void
538+
{
539+
$this->request->request('get', 'http://example.com', [
540+
'verify' => false,
541+
]);
542+
543+
$options = $this->request->curl_options;
544+
545+
$this->assertArrayHasKey(CURLOPT_SSL_VERIFYPEER, $options);
546+
$this->assertFalse($options[CURLOPT_SSL_VERIFYPEER]);
547+
548+
$this->assertArrayHasKey(CURLOPT_SSL_VERIFYHOST, $options);
549+
$this->assertSame(0, $options[CURLOPT_SSL_VERIFYHOST]);
550+
}
551+
537552
public function testSSLWithBadKey(): void
538553
{
539554
$file = 'something_obviously_bogus';

0 commit comments

Comments
 (0)