bug #30755 [HttpClient] correctly clean state on destruct in CurlResponse (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit efb6414f6be2 · 2019-03-28T17:34:47.000+01:00
This PR was merged into the 4.3-dev branch. Discussion ---------- [HttpClient] correctly clean state on destruct in CurlResponse | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #30753 | License | MIT | Doc PR | - On destruct, we ask curl to close the stream once the headers arrived, but we don't silence the "error" this sets in curl. This fixes it. Commits ------- 332a88c [HttpClient] correctly clean state on destruct in CurlResponse
diff --git a/src/Symfony/Component/HttpClient/Response/CurlResponse.php b/src/Symfony/Component/HttpClient/Response/CurlResponse.php
@@ -231,7 +231,7 @@ protected static function perform(\stdClass $multi, array &$responses = null): v
 
             while ($info = curl_multi_info_read($multi->handle)) {
                 $multi->handlesActivity[(int) $info['handle']][] = null;
-                $multi->handlesActivity[(int) $info['handle']][] = \in_array($info['result'], [\CURLE_OK, \CURLE_TOO_MANY_REDIRECTS], true) ? null : new TransportException(curl_error($info['handle']));
+                $multi->handlesActivity[(int) $info['handle']][] = \in_array($info['result'], [\CURLE_OK, \CURLE_TOO_MANY_REDIRECTS], true) || (\CURLE_WRITE_ERROR === $info['result'] && 'destruct' === @curl_getinfo($info['handle'], CURLINFO_PRIVATE)) ? null : new TransportException(curl_error($info['handle']));
             }
         } finally {
             self::$performing = false;

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ protected static function perform(\stdClass $multi, array &$responses = null): v`
`231`	`231`
`232`	`232`	`while ($info = curl_multi_info_read($multi->handle)) {`
`233`	`233`	`$multi->handlesActivity[(int) $info['handle']][] = null;`
`234`		`- $multi->handlesActivity[(int) $info['handle']][] = \in_array($info['result'], [\CURLE_OK, \CURLE_TOO_MANY_REDIRECTS], true) ? null : new TransportException(curl_error($info['handle']));`
	`234`	`+ $multi->handlesActivity[(int) $info['handle']][] = \in_array($info['result'], [\CURLE_OK, \CURLE_TOO_MANY_REDIRECTS], true) \|\| (\CURLE_WRITE_ERROR === $info['result'] && 'destruct' === @curl_getinfo($info['handle'], CURLINFO_PRIVATE)) ? null : new TransportException(curl_error($info['handle']));`
`235`	`235`	`}`
`236`	`236`	`} finally {`
`237`	`237`	`self::$performing = false;`