Merge branch '4.4' into 5.0

fabpot · fabpot · commit d7973ff0e3ab · 2020-03-15T10:56:47.000+01:00
* 4.4:
  [HttpClient] Fix typo
  [Mime] Fix boundary header
  ignore microseconds submitted by Edge
diff --git a/CurlHttpClient.php b/CurlHttpClient.php
@@ -53,7 +53,7 @@ final class CurlHttpClient implements HttpClientInterface, LoggerAwareInterface,
     private static $curlVersion;
 
     /**
-     * @param array $defaultOptions     Default requests' options
+     * @param array $defaultOptions     Default request's options
      * @param int   $maxHostConnections The maximum number of connections to a single host
      * @param int   $maxPendingPushes   The maximum number of pushed responses to accept in the queue
      *
diff --git a/HttpClient.php b/HttpClient.php
@@ -21,7 +21,7 @@
 final class HttpClient
 {
     /**
-     * @param array $defaultOptions     Default requests' options
+     * @param array $defaultOptions     Default request's options
      * @param int   $maxHostConnections The maximum number of connections to a single host
      * @param int   $maxPendingPushes   The maximum number of pushed responses to accept in the queue
      *
diff --git a/NativeHttpClient.php b/NativeHttpClient.php
@@ -41,7 +41,7 @@ final class NativeHttpClient implements HttpClientInterface, LoggerAwareInterfac
     private $multi;
 
     /**
-     * @param array $defaultOptions     Default requests' options
+     * @param array $defaultOptions     Default request's options
      * @param int   $maxHostConnections The maximum number of connections to open
      *
      * @see HttpClientInterface::OPTIONS_DEFAULTS for available options

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ final class CurlHttpClient implements HttpClientInterface, LoggerAwareInterface,`
`53`	`53`	`private static $curlVersion;`
`54`	`54`
`55`	`55`	`/**`
`56`		`- * @param array $defaultOptions Default requests' options`
	`56`	`+ * @param array $defaultOptions Default request's options`
`57`	`57`	`* @param int $maxHostConnections The maximum number of connections to a single host`
`58`	`58`	`* @param int $maxPendingPushes The maximum number of pushed responses to accept in the queue`
`59`	`59`	`*`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`final class HttpClient`
`22`	`22`	`{`
`23`	`23`	`/**`
`24`		`- * @param array $defaultOptions Default requests' options`
	`24`	`+ * @param array $defaultOptions Default request's options`
`25`	`25`	`* @param int $maxHostConnections The maximum number of connections to a single host`
`26`	`26`	`* @param int $maxPendingPushes The maximum number of pushed responses to accept in the queue`
`27`	`27`	`*`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ final class NativeHttpClient implements HttpClientInterface, LoggerAwareInterfac`
`41`	`41`	`private $multi;`
`42`	`42`
`43`	`43`	`/**`
`44`		`- * @param array $defaultOptions Default requests' options`
	`44`	`+ * @param array $defaultOptions Default request's options`
`45`	`45`	`* @param int $maxHostConnections The maximum number of connections to open`
`46`	`46`	`*`
`47`	`47`	`* @see HttpClientInterface::OPTIONS_DEFAULTS for available options`