1 - fix the syntax in the .IP line

2 - Provided user names and passwords are URL decoded by libcurl

Bug: http://curl.haxx.se/bug/view.cgi?id=3525935
This commit is contained in:
Daniel Stenberg 2012-05-12 23:31:27 +02:00
Родитель 92f841aef7
Коммит 03c1bcf4bd
1 изменённых файлов: 5 добавлений и 1 удалений

Просмотреть файл

@ -1574,7 +1574,7 @@ means the verification was successful. (Added in 7.19.0)
.RE .RE
If this option is used several times, the last one will be used. If this option is used several times, the last one will be used.
.IP "-x, --proxy <[protocol://][user@password]proxyhost[:port]>" .IP "-x, --proxy <[protocol://][user:password@]proxyhost[:port]>"
Use the specified HTTP proxy. If the port number is not specified, it is Use the specified HTTP proxy. If the port number is not specified, it is
assumed at port 1080. assumed at port 1080.
@ -1587,6 +1587,10 @@ converted to HTTP. It means that certain protocol specific operations might
not be available. This is not the case if you can tunnel through the proxy, as not be available. This is not the case if you can tunnel through the proxy, as
one with the \fI-p, --proxytunnel\fP option. one with the \fI-p, --proxytunnel\fP option.
User and password that might be provided in the proxy string are URL decoded
by libcurl. This allows you to pass in special characters such as @ by using
%40 or pass in a colon with %3a.
The proxy host can be specified the exact same way as the proxy environment The proxy host can be specified the exact same way as the proxy environment
variables, including the protocol prefix (http://) and the embedded user + variables, including the protocol prefix (http://) and the embedded user +
password. password.