clone the original response class before every curl request

Author: michalsn

system/HTTP/CURLRequest.php

@@ -28,6 +28,13 @@ class CURLRequest extends OutgoingRequest
      */
     protected $response;
 
+    /**
+     * The original response object associated with this request
+     *
+     * @var ResponseInterface|null
+     */
+    protected $responseOrig;
+
     /**
      * The URI associated with this request
      *
@@ -105,7 +112,7 @@ public function __construct(App $config, URI $uri, ?ResponseInterface $response
 
         parent::__construct('GET', $uri);
 
-        $this->response       = $response;
+        $this->responseOrig   = $response;
         $this->baseURI        = $uri->useRawQueryString();
         $this->defaultOptions = $options;
 
@@ -125,6 +132,8 @@ public function __construct(App $config, URI $uri, ?ResponseInterface $response
      */
     public function request($method, string $url, array $options = []): ResponseInterface
     {
+        $this->response = clone $this->responseOrig;
+
         $this->parseOptions($options);
 
         $url = $this->prepareURL($url);
@@ -469,10 +478,6 @@ protected function applyBody(array $curlOptions = []): array
      */
     protected function setResponseHeaders(array $headers = [])
     {
-        foreach ($this->response->headers() as $header) {
-            $this->response->removeHeader($header->getName());
-        }
-
         foreach ($headers as $header) {
             if (($pos = strpos($header, ':')) !== false) {
                 $title = substr($header, 0, $pos);

system/Test/Mock/MockCURLRequest.php

@@ -34,6 +34,8 @@ public function setOutput($output)
 
     protected function sendRequest(array $curlOptions = []): string
     {
+        $this->response = clone $this->responseOrig;
+
         // Save so we can access later.
         $this->curl_options = $curlOptions;
 

tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php

@@ -766,15 +766,15 @@ public function testSendContinuedWithManyHeaders()
         $this->assertSame('<title>Update success! config</title>', $response->getBody());
 
         $responseHeaderKeys = [
+            'Cache-Control',
+            'Content-Type',
             'Server',
             'Connection',
             'Keep-Alive',
             'Set-Cookie',
             'Date',
             'Expires',
-            'Cache-Control',
             'Pragma',
-            'Content-Type',
             'Transfer-Encoding',
         ];
         $this->assertSame($responseHeaderKeys, array_keys($response->headers()));
@@ -805,20 +805,20 @@ public function testResponseHeadersWithMultipleRequests()
         $this->assertSame('<title>Hello1</title>', $response->getBody());
 
         $responseHeaderKeys = [
+            'Cache-Control',
+            'Content-Type',
             'Server',
             'Expires',
-            'Cache-Control',
             'Pragma',
-            'Content-Type',
             'Transfer-Encoding',
         ];
         $this->assertSame($responseHeaderKeys, array_keys($response->headers()));
 
         $this->assertSame(200, $response->getStatusCode());
 
         $output = "HTTP/2.0 200 OK
-Server: ddos-guard
 Expires: Thu, 19 Nov 1982 08:52:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate
 Content-Type: application/xml; charset=utf-8
 Transfer-Encoding: chunked\x0d\x0a\x0d\x0a<title>Hello2</title>";
         $request->setOutput($output);
@@ -828,9 +828,9 @@ public function testResponseHeadersWithMultipleRequests()
         $this->assertSame('<title>Hello2</title>', $response->getBody());
 
         $responseHeaderKeys = [
-            'Server',
-            'Expires',
+            'Cache-Control',
             'Content-Type',
+            'Expires',
             'Transfer-Encoding',
         ];
         $this->assertSame($responseHeaderKeys, array_keys($response->headers()));

tests/system/HTTP/CURLRequestTest.php

@@ -749,15 +749,15 @@ public function testSendContinuedWithManyHeaders()
         $this->assertSame('<title>Update success! config</title>', $response->getBody());
 
         $responseHeaderKeys = [
+            'Cache-Control',
+            'Content-Type',
             'Server',
             'Connection',
             'Keep-Alive',
             'Set-Cookie',
             'Date',
             'Expires',
-            'Cache-Control',
             'Pragma',
-            'Content-Type',
             'Transfer-Encoding',
         ];
         $this->assertSame($responseHeaderKeys, array_keys($response->headers()));
@@ -788,20 +788,20 @@ public function testResponseHeadersWithMultipleRequests()
         $this->assertSame('<title>Hello1</title>', $response->getBody());
 
         $responseHeaderKeys = [
+            'Cache-Control',
+            'Content-Type',
             'Server',
             'Expires',
-            'Cache-Control',
             'Pragma',
-            'Content-Type',
             'Transfer-Encoding',
         ];
         $this->assertSame($responseHeaderKeys, array_keys($response->headers()));
 
         $this->assertSame(200, $response->getStatusCode());
 
         $output = "HTTP/2.0 200 OK
-Server: ddos-guard
 Expires: Thu, 19 Nov 1982 08:52:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate
 Content-Type: application/xml; charset=utf-8
 Transfer-Encoding: chunked\x0d\x0a\x0d\x0a<title>Hello2</title>";
         $request->setOutput($output);
@@ -811,9 +811,9 @@ public function testResponseHeadersWithMultipleRequests()
         $this->assertSame('<title>Hello2</title>', $response->getBody());
 
         $responseHeaderKeys = [
-            'Server',
-            'Expires',
+            'Cache-Control',
             'Content-Type',
+            'Expires',
             'Transfer-Encoding',
         ];
         $this->assertSame($responseHeaderKeys, array_keys($response->headers()));