Merge branch '7.4' into 8.0

javiereguiluz · javiereguiluz · commit d44e5a9489ab · 2025-06-24T09:29:14.000+02:00
* 7.4:
  Fix some RST issues
  Add note about concurrency limits
diff --git a/http_client.rst b/http_client.rst
@@ -170,8 +170,9 @@ Some options are described in this guide:
 Check out the full :ref:`http_client config reference <reference-http-client>`
 to learn about all the options.
 
-The HTTP client also has one configuration option called
-``max_host_connections``, this option can not be overridden by a request:
+The HTTP client also has a configuration option called
+:ref:`max_host_connections <reference-http-client-max-host-connections>`.
+This option cannot be overridden per request:
 
 .. configuration-block::
 
@@ -1342,6 +1343,9 @@ code waits only when necessary.
     or access to certificate files). To avoid hitting these limits, consider
     processing requests in batches.
 
+    There is, however, a maximum amount of concurrent connections that can be open
+    per host (``6`` by default). See :ref:`max_host_connections <reference-http-client-max-host-connections>`.
+
 Multiplexing Responses
 ~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -1719,6 +1719,8 @@ max_duration
 The maximum execution time, in seconds, that the request and the response are
 allowed to take. A value lower than or equal to 0 means it is unlimited.
 
+.. _reference-http-client-max-host-connections:
+
 max_host_connections
 ....................
 
