Skip to content
Snippets Groups Projects
Commit 76f954d1 authored by Nicolas Grekas's avatar Nicolas Grekas
Browse files

Merge branch '6.4' into 7.1

* 6.4:
  [HttpClient] Resolve hostnames in NoPrivateNetworkHttpClient
  [security-http] Check owner of persisted remember-me cookie
parents c8a43378 79f02097
No related branches found
No related tags found
No related merge requests found
......@@ -46,9 +46,11 @@ interface HttpClientInterface
'buffer' => true, // bool|resource|\Closure - whether the content of the response should be buffered or not,
// or a stream resource where the response body should be written,
// or a closure telling if/where the response should be buffered based on its headers
'on_progress' => null, // callable(int $dlNow, int $dlSize, array $info) - throwing any exceptions MUST abort
// the request; it MUST be called on DNS resolution, on arrival of headers and on
// completion; it SHOULD be called on upload/download of data and at least 1/s
'on_progress' => null, // callable(int $dlNow, int $dlSize, array $info, ?Closure $resolve = null) - throwing any
// exceptions MUST abort the request; it MUST be called on connection, on headers and on
// completion; it SHOULD be called on upload/download of data and at least 1/s;
// if passed, $resolve($host) / $resolve($host, $ip) can be called to read / populate
// the DNS cache respectively
'resolve' => [], // string[] - a map of host to IP address that SHOULD replace DNS resolution
'proxy' => null, // string - by default, the proxy-related env vars handled by curl SHOULD be honored
'no_proxy' => null, // string - a comma separated list of hosts that do not require a proxy to be reached
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment