malhuda/CodeIgniter4
1
0
Fork 0
mirror of https://github.com/codeigniter4/CodeIgniter4.git synced 2025-02-20 11:44:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: CURL option force_ip_resolve (#9194)

Browse Source 
* feat: CURL option force_ip_resolve

* test: CURL option force_ip_resolve

* docs: CURL option force_ip_resolve

* fix: PHPStan error

* fix: prevent using empty()

* fix: strict check

* tests: unknown value in option force_ip_resolve

* fix: using default match

* fix: PHPUnit option resolved_force_ip
This commit is contained in:
Denny Septian Panggabean 2024-12-02 13:17:58 +07:00 committed by GitHub
parent c46cea4ee0
commit c76a68f123
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 58 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
system/HTTP/CURLRequest.php
View File

@ -649,6 +649,15 @@ class CURLRequest extends OutgoingRequest
$this->setHeader('Content-Length', (string) strlen($json));
}
// Resolve IP
if (array_key_exists('force_ip_resolve', $config)) {
$curlOptions[CURLOPT_IPRESOLVE] = match ($config['force_ip_resolve']) {
'v4' => CURL_IPRESOLVE_V4,
'v6' => CURL_IPRESOLVE_V6,
default => CURL_IPRESOLVE_WHATEVER
};
}
// version
if (! empty($config['version'])) {
$version = sprintf('%.1F', $config['version']);

36
tests/system/HTTP/CURLRequestTest.php
View File

@ -1176,6 +1176,42 @@ accept-ranges: bytes\x0d\x0a\x0d\x0a";
$this->assertSame(CURL_HTTP_VERSION_3, $options[CURLOPT_HTTP_VERSION]);
}
public function testForceResolveIPv4(): void
{
$this->request->request('POST', '/post', [
'force_ip_resolve' => 'v4',
]);
$options = $this->request->curl_options;
$this->assertArrayHasKey(CURLOPT_IPRESOLVE, $options);
$this->assertSame(CURL_IPRESOLVE_V4, $options[CURLOPT_IPRESOLVE]);
}
public function testForceResolveIPv6(): void
{
$this->request->request('POST', '/post', [
'force_ip_resolve' => 'v6',
]);
$options = $this->request->curl_options;
$this->assertArrayHasKey(CURLOPT_IPRESOLVE, $options);
$this->assertSame(CURL_IPRESOLVE_V6, $options[CURLOPT_IPRESOLVE]);
}
public function testForceResolveIPUnknown(): void
{
$this->request->request('POST', '/post', [
'force_ip_resolve' => 'v?',
]);
$options = $this->request->curl_options;
$this->assertArrayHasKey(CURLOPT_IPRESOLVE, $options);
$this->assertSame(\CURL_IPRESOLVE_WHATEVER, $options[CURLOPT_IPRESOLVE]);
}
public function testCookieOption(): void
{
$holder = SUPPORTPATH . 'HTTP/Files/CookiesHolder.txt';

9
user_guide_src/source/libraries/curlrequest.rst
View File

@ -364,6 +364,15 @@ is true:
.. _curlrequest-version:
force_ip_resolve
================
.. versionadded:: 4.6.0
To set the HTTP handlers to use ``v4`` only ipv4 protocol or ``v6`` for ipv6 protocol:
.. literalinclude:: curlrequest/036.php
version
=======

4
user_guide_src/source/libraries/curlrequest/036.php Normal file
View File

@ -0,0 +1,4 @@
<?php
// Force ipv4 resolve
$client->request('GET', '/', ['force_ip_resolve' => 'v4']); // v4 or v6