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

Merge branch '6.4' into 7.1

* 6.4:
  [DoctrineBridge] Fix Connection::createSchemaManager() for Doctrine DBAL v2
  [HttpClient] Various cleanups after recent changes
  do not add child nodes to EmptyNode instances
  consider write property visibility to decide whether a property is writable
  add comment explaining why HttpClient tests are run separately
  silence warnings issued by Redis Sentinel on connection issues
parents b0f454a9 8fa765f6
No related branches found
No related tags found
No related merge requests found
......@@ -46,11 +46,9 @@ 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, ?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
'on_progress' => null, // callable(int $dlNow, int $dlSize, array $info) - 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
'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.
Finish editing this message first!
Please register or to comment