Merge branch '5.4' into 6.4

* 5.4:
  Document possibility to use user:pass for basic auth

Author: javiereguiluz

http_client.rst

@@ -483,6 +483,11 @@ each request (which overrides any global authentication):
         // ...
     ]);
 
+.. note::
+
+    Basic Authentication can also be set by including the credentials in the URL,
+    such as: ``http://the-username:[email protected]``
+
 .. note::
 
     The NTLM authentication mechanism requires using the cURL transport.