Merge branch '5.1' into 5.2

nicolas-grekas · nicolas-grekas · commit 5b9fc5d85a6c · 2020-11-28T14:45:20.000+01:00
* 5.1:
  [HttpClient] partial revert of previous commit
diff --git a/Internal/AmpClientState.php b/Internal/AmpClientState.php
@@ -119,7 +119,7 @@ public function request(array $options, Request $request, CancellationToken $can
     private function getClient(array $options): array
     {
         $options = [
-            'bindto' => $options['bindto'] ?: '0:0',
+            'bindto' => $options['bindto'] ?: '0',
             'verify_peer' => $options['verify_peer'],
             'capath' => $options['capath'],
             'cafile' => $options['cafile'],

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public function request(array $options, Request $request, CancellationToken $can`
`119`	`119`	`private function getClient(array $options): array`
`120`	`120`	`{`
`121`	`121`	`$options = [`
`122`		`- 'bindto' => $options['bindto'] ?: '0:0',`
	`122`	`+ 'bindto' => $options['bindto'] ?: '0',`
`123`	`123`	`'verify_peer' => $options['verify_peer'],`
`124`	`124`	`'capath' => $options['capath'],`
`125`	`125`	`'cafile' => $options['cafile'],`