Merge branch '4.4' into 5.4

nicolas-grekas · nicolas-grekas · commit 1badd3d297f7 · 2022-02-04T19:44:28.000+01:00
* 4.4:
  [HttpClient] fix destructing CurlResponse
diff --git a/Response/CurlResponse.php b/Response/CurlResponse.php
@@ -255,7 +255,9 @@ public function __destruct()
 
             $this->doDestruct();
         } finally {
-            curl_setopt($this->handle, \CURLOPT_VERBOSE, false);
+            if (\is_resource($this->handle) || $this->handle instanceof \CurlHandle) {
+                curl_setopt($this->handle, \CURLOPT_VERBOSE, false);
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,9 @@ public function __destruct()`
`255`	`255`
`256`	`256`	`$this->doDestruct();`
`257`	`257`	`} finally {`
`258`		`- curl_setopt($this->handle, \CURLOPT_VERBOSE, false);`
	`258`	`+ if (\is_resource($this->handle) \|\| $this->handle instanceof \CurlHandle) {`
	`259`	`+ curl_setopt($this->handle, \CURLOPT_VERBOSE, false);`
	`260`	`+ }`
`259`	`261`	`}`
`260`	`262`	`}`
`261`	`263`