From 03c1bcf4bda7a493ea8020070cecdd5f0ed37c65 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sat, 12 May 2012 23:31:27 +0200 Subject: [PATCH] curl.1: clarify -x usage 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 --- docs/curl.1 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/curl.1 b/docs/curl.1 index 02cfb44f4..64612d293 100644 --- a/docs/curl.1 +++ b/docs/curl.1 @@ -1574,7 +1574,7 @@ means the verification was successful. (Added in 7.19.0) .RE 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 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 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 variables, including the protocol prefix (http://) and the embedded user + password.