[HttpClient] fix collecting debug info on destruction of CurlResponse

nicolas-grekas · nicolas-grekas · commit f0b52c828936 · 2021-10-18T18:39:13.000+02:00
diff --git a/src/Symfony/Component/HttpClient/Response/CurlResponse.php b/src/Symfony/Component/HttpClient/Response/CurlResponse.php
@@ -225,13 +225,15 @@ public function getContent(bool $throw = true): string
 
     public function __destruct()
     {
-        curl_setopt($this->handle, \CURLOPT_VERBOSE, false);
+        try {
+            if (null === $this->timeout) {
+                return; // Unused pushed response
+            }
 
-        if (null === $this->timeout) {
-            return; // Unused pushed response
+            $this->doDestruct();
+        } finally {
+            curl_setopt($this->handle, \CURLOPT_VERBOSE, false);
         }
-
-        $this->doDestruct();
     }
 
     /**
diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php b/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php
@@ -167,4 +167,16 @@ public function testHandleIsRemovedOnException()
             $this->assertCount(0, $clientState->openHandles);
         }
     }
+
+    public function testDebugInfoOnDestruct()
+    {
+        $client = $this->getHttpClient(__FUNCTION__);
+
+        $traceInfo = [];
+        $client->request('GET', 'http://localhost:8057', ['on_progress' => function (int $dlNow, int $dlSize, array $info) use (&$traceInfo) {
+            $traceInfo = $info;
+        }]);
+
+        $this->assertNotEmpty($traceInfo['debug']);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -225,13 +225,15 @@ public function getContent(bool $throw = true): string`
`225`	`225`
`226`	`226`	`public function __destruct()`
`227`	`227`	`{`
`228`		`- curl_setopt($this->handle, \CURLOPT_VERBOSE, false);`
	`228`	`+ try {`
	`229`	`+ if (null === $this->timeout) {`
	`230`	`+ return; // Unused pushed response`
	`231`	`+ }`
`229`	`232`
`230`		`- if (null === $this->timeout) {`
`231`		`- return; // Unused pushed response`
	`233`	`+ $this->doDestruct();`
	`234`	`+ } finally {`
	`235`	`+ curl_setopt($this->handle, \CURLOPT_VERBOSE, false);`
`232`	`236`	`}`
`233`		`-`
`234`		`- $this->doDestruct();`
`235`	`237`	`}`
`236`	`238`
`237`	`239`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -167,4 +167,16 @@ public function testHandleIsRemovedOnException()`
`167`	`167`	`$this->assertCount(0, $clientState->openHandles);`
`168`	`168`	`}`
`169`	`169`	`}`
	`170`	`+`
	`171`	`+ public function testDebugInfoOnDestruct()`
	`172`	`+ {`
	`173`	`+ $client = $this->getHttpClient(__FUNCTION__);`
	`174`	`+`
	`175`	`+ $traceInfo = [];`
	`176`	`+ $client->request('GET', 'http://localhost:8057', ['on_progress' => function (int $dlNow, int $dlSize, array $info) use (&$traceInfo) {`
	`177`	`+ $traceInfo = $info;`
	`178`	`+ }]);`
	`179`	`+`
	`180`	`+ $this->assertNotEmpty($traceInfo['debug']);`
	`181`	`+ }`
`170`	`182`	`}`