Skip to content

Commit dda8496

Browse files
committed
Merge branch '5.1' into 5.2
* 5.1: Display debug info [HttpClient] don't fallback to HTTP/1.1 when HTTP/2 streams break fix lexing nested sequences/mappings
2 parents b972e7c + c2e3dd9 commit dda8496

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

Response/CurlResponse.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -306,10 +306,7 @@ private static function perform(ClientState $multi, array &$responses = null): v
306306
curl_multi_remove_handle($multi->handle, $ch);
307307
$waitFor[1] = (string) ((int) $waitFor[1] - 1); // decrement the retry counter
308308
curl_setopt($ch, \CURLOPT_PRIVATE, $waitFor);
309-
310-
if ('1' === $waitFor[1]) {
311-
curl_setopt($ch, \CURLOPT_HTTP_VERSION, \CURL_HTTP_VERSION_1_1);
312-
}
309+
curl_setopt($ch, \CURLOPT_FORBID_REUSE, true);
313310

314311
if (0 === curl_multi_add_handle($multi->handle, $ch)) {
315312
continue;

0 commit comments

Comments
 (0)