From c9a4338d6ffd880097d94b054ade89dd9771ad41 Mon Sep 17 00:00:00 2001 From: Robin Lindner Date: Mon, 21 Oct 2024 21:05:57 +0200 Subject: [PATCH 1/2] Fix supported schemes in docs --- xml/System.Net.Http/HttpClient.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/xml/System.Net.Http/HttpClient.xml b/xml/System.Net.Http/HttpClient.xml index 1489a4c9230..75ed10e16bc 100644 --- a/xml/System.Net.Http/HttpClient.xml +++ b/xml/System.Net.Http/HttpClient.xml @@ -362,7 +362,15 @@ The environment variables used for `DefaultProxy` initialization on Windows and On systems where environment variables are case-sensitive, the variable names may be all lowercase or all uppercase. The lowercase names are checked first. -The proxy server may be a hostname or IP address, optionally followed by a colon and port number, or it may be an http URL, optionally including a username and password for proxy authentication. The URL must be start with `http`, not `https`, and cannot include any text after the hostname, IP, or port. +The proxy server may be a hostname or IP address, optionally followed by a colon and port number, or it may be an http, https, socks4, socks4a or socks5 URL, optionally including a username and password for proxy authentication. The URL must be start with `http`, `https`, `socks4`, `socks4a` or `socks5`, and cannot include any text after the hostname, IP, or port. +The URL can optionally include a username and password for proxy authentication for the schemes `http`, `https` and `socks5`. For the schemes `socks4` and `socks4a` only an userid is supported. + +* **`http`**: `http://[username:password@]hostname[:port]` +* **`https`**: `https://[username:password@]hostname[:port]` +* **`socks4`**: `socks4://[userid@]hostname[:port]` +* **`socks4a`**: `socks4a://[userid@]hostname[:port]` +* **`socks5`**: `socks5://[username:password@]hostname[:port]` + ]]> The value passed cannot be . From fb5a47090981b7bccf6582ae4bab2d1dab3c48e9 Mon Sep 17 00:00:00 2001 From: Miha Zupan Date: Wed, 30 Oct 2024 23:01:45 +0100 Subject: [PATCH 2/2] Tweak proxy description --- xml/System.Net.Http/HttpClient.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xml/System.Net.Http/HttpClient.xml b/xml/System.Net.Http/HttpClient.xml index 75ed10e16bc..9820a116965 100644 --- a/xml/System.Net.Http/HttpClient.xml +++ b/xml/System.Net.Http/HttpClient.xml @@ -362,13 +362,13 @@ The environment variables used for `DefaultProxy` initialization on Windows and On systems where environment variables are case-sensitive, the variable names may be all lowercase or all uppercase. The lowercase names are checked first. -The proxy server may be a hostname or IP address, optionally followed by a colon and port number, or it may be an http, https, socks4, socks4a or socks5 URL, optionally including a username and password for proxy authentication. The URL must be start with `http`, `https`, `socks4`, `socks4a` or `socks5`, and cannot include any text after the hostname, IP, or port. -The URL can optionally include a username and password for proxy authentication for the schemes `http`, `https` and `socks5`. For the schemes `socks4` and `socks4a` only an userid is supported. +The proxy server may be a hostname or IP address, optionally followed by a colon and port number, or it may be an `http`, `https`, `socks4`, `socks4a`, or `socks5` URL. The URL cannot include any text after the hostname, IP, or port. If a scheme isn't specified, `http` is assumed. +The URL may optionally include a username and password for proxy authentication, but the password is ignored when using `socks4` or `socks4a` as the protocols have no support for password authentication. * **`http`**: `http://[username:password@]hostname[:port]` * **`https`**: `https://[username:password@]hostname[:port]` -* **`socks4`**: `socks4://[userid@]hostname[:port]` -* **`socks4a`**: `socks4a://[userid@]hostname[:port]` +* **`socks4`**: `socks4://[username@]hostname[:port]` +* **`socks4a`**: `socks4a://[username@]hostname[:port]` * **`socks5`**: `socks5://[username:password@]hostname[:port]` ]]>