fix: add config $CURLRequestShareOptions for the CURLRequest

If $CURLRequestShareOptions is false, reset all config after sending a request.
If true, keep the all config (the same as before).

Author: kenjis

app/Config/App.php

@@ -461,4 +461,15 @@ class App extends BaseConfig
      * @var bool
      */
     public $CSPEnabled = false;
+
+    /**
+     * --------------------------------------------------------------------------
+     * CURLRequest Share Options
+     * --------------------------------------------------------------------------
+     *
+     * Whether share options between requests or not.
+     *
+     * @var bool
+     */
+    public $CURLRequestShareOptions = true;
 }

system/HTTP/CURLRequest.php

@@ -42,7 +42,14 @@ class CURLRequest extends Request
      *
      * @var array
      */
-    protected $config = [
+    protected $config;
+
+    /**
+     * The default setting values
+     *
+     * @var array
+     */
+    private $defaultConfig = [
         'timeout'         => 0.0,
         'connect_timeout' => 150,
         'debug'           => false,
@@ -79,6 +86,13 @@ class CURLRequest extends Request
      */
     private $defaultOptions;
 
+    /**
+     * Whether share options between requests or not.
+     *
+     * @var bool
+     */
+    private $shareOptions;
+
     /**
      * Takes an array of options to set the following possible class properties:
      *
@@ -102,6 +116,8 @@ public function __construct(App $config, URI $uri, ?ResponseInterface $response
         $this->response       = $response;
         $this->baseURI        = $uri->useRawQueryString();
         $this->defaultOptions = $options;
+        $this->config         = $this->defaultConfig;
+        $this->shareOptions   = $config->CURLRequestShareOptions ?? true;
 
         $this->parseOptions($options);
     }
@@ -122,15 +138,24 @@ public function request($method, string $url, array $options = []): ResponseInte
 
         $this->send($method, $url);
 
+        if ($this->shareOptions === false) {
+            $this->resetOptions();
+        }
+
+        return $this->response;
+    }
+
+    private function resetOptions()
+    {
         // Reset headers
         $this->headers   = [];
         $this->headerMap = [];
-        // Reset unshared configs
-        unset($this->config['multipart'], $this->config['form_params']);
+
+        // Reset configs
+        $this->config = $this->defaultConfig;
+
         // Set the default options for next request
         $this->parseOptions($this->defaultOptions);
-
-        return $this->response;
     }
 
     /**

tests/system/HTTP/CURLRequestTest.php

@@ -36,11 +36,13 @@ protected function setUp(): void
         $this->request = $this->getRequest();
     }
 
-    protected function getRequest(array $options = [])
+    protected function getRequest(array $options = [], $shareOptions = true)
     {
-        $uri = isset($options['base_uri']) ? new URI($options['base_uri']) : new URI();
+        $uri                          = isset($options['base_uri']) ? new URI($options['base_uri']) : new URI();
+        $app                          = new App();
+        $app->CURLRequestShareOptions = $shareOptions;
 
-        return new MockCURLRequest(($app = new App()), $uri, new Response($app), $options);
+        return new MockCURLRequest(($app), $uri, new Response($app), $options);
     }
 
     /**
@@ -197,12 +199,12 @@ public function testOptionsHeadersNotUsingPopulate()
         $this->assertSame('', $request->header('Accept-Encoding')->getValue());
     }
 
-    public function testHeaderContentLengthNotSharedBetweenRequests()
+    public function testHeaderContentLengthNotSharedBetweenRequestsWhenSharedOptionsFalse()
     {
         $options = [
             'base_uri' => 'http://www.foo.com/api/v1/',
         ];
-        $request = $this->getRequest($options);
+        $request = $this->getRequest($options, false);
 
         $request->post('example', [
             'form_params' => [