diff options
Diffstat (limited to 'lib/libfetch/fetch.3')
| -rw-r--r-- | lib/libfetch/fetch.3 | 42 |
1 files changed, 29 insertions, 13 deletions
diff --git a/lib/libfetch/fetch.3 b/lib/libfetch/fetch.3 index 9c4249f71916..664959436694 100644 --- a/lib/libfetch/fetch.3 +++ b/lib/libfetch/fetch.3 @@ -133,10 +133,16 @@ A regular expression which produces this syntax is: <scheme>:(//(<user>(:<pwd>)?@)?<host>(:<port>)?)?/(<document>)? .Ed .Pp +If the URL does not seem to begin with a scheme name, the following +syntax is assumed: +.Bd -literal + ((<user>(:<pwd>)?@)?<host>(:<port>)?)?/(<document>)? +.Ed +.Pp Note that some components of the URL are not necessarily relevant to all URL schemes. -For instance, the file scheme only needs the <scheme> -and <document> components. +For instance, the file scheme only needs the <scheme> and <document> +components. .Pp .Fn fetchMakeURL and @@ -416,8 +422,11 @@ and message, e.g. "File is not available (404 Not Found)" .Sh ENVIRONMENT .Bl -tag -width HTTP_PROXY_AUTH .It Ev FTP_PROXY -host name of the FTP proxy to use, optionally followed by a port -number separated from the host name by a colon. +URL of the proxy to use for FTP requests. +The document part is ignored. +FTP and HTTP proxies are supported; if no scheme is specified, FTP is +assumed. +If the proxy is an FTP proxy, .Nm libfetch will send .Ql user@host @@ -426,25 +435,30 @@ as user name to the proxy, where is the real user name, and .Ql host is the name of the FTP server. +.Pp If this variable is set to an empty string, no proxy will be used for FTP requests, even if the .Ev HTTP_PROXY variable is set. .It Ev HTTP_AUTH -Specifies HTTP authorization parameters, used only if the server -requires authorization and no user name or password was specified in -the URL. +Specifies HTTP authorization parameters as a colon-separated list of +items. The first and second item are the authorization scheme and realm respectively; further items are scheme-dependent. Currently, only basic authorization is supported. +.Pp Basic authorization requires two parameters: the user name and password, in that order. +.Pp +This variable is only used if the server requires authorization and +no user name or password was specified in the URL. .It Ev HTTP_PROXY -host name of the HTTP proxy to use, optionally followed by a port -number separated from the host name by a colon. +URL of the proxy to use for HTTP requests. +The document part is ignored. +Only HTTP proxies are supported for HTTP requests. If no port number is specified, the default is 3128. -Note that the HTTP proxy will also be used for FTP documents, unless -the +.Pp +Note that this proxy will also be used for FTP documents, unless the .Ev FTP_PROXY variable is set. .It Ev HTTP_PROXY_AUTH @@ -452,8 +466,10 @@ Specifies authorization parameters for the HTTP proxy in the same format as the .Ev HTTP_AUTH variable. -The value of this variable is used if and only if connected to an HTTP -proxy. +.Pp +This variable is used if and only if connected to an HTTP proxy, and +is ignored if a user and/or a password were specified in the proxy +URL. .El .Sh SEE ALSO .Xr fetch 1 , |