aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2012-05-12 23:31:27 +0200
committerDaniel Stenberg <daniel@haxx.se>2012-05-12 23:35:16 +0200
commit03c1bcf4bda7a493ea8020070cecdd5f0ed37c65 (patch)
treea9162a3616458351d8a0d50c0eb92985947e1286
parent92f841aef772d90b96cfc804636ee0ab1eb039f8 (diff)
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
-rw-r--r--docs/curl.16
1 files changed, 5 insertions, 1 deletions
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.