Commit 5df04bfa authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

curl: rename --bearer to --oauth2-bearer 

The option '--bearer' might be slightly ambiguous in name. It doesn't
create any conflict that I am aware of at the moment, however, OAUTH v2
is not the only authentication mechanism which uses "bearer" tokens.

Reported-by: Kyle L. Huff
URL: http://curl.haxx.se/mail/lib-2013-10/0064.html
parent d015f4cc

docs/curl.1

+8 −8
Original line number Diff line number Diff line
@@ -173,14 +173,6 @@ Note that using --anyauth is not recommended if you do uploads from stdin, 
since it may require data to be sent twice and then the client must be able to

rewind. If the need should arise when uploading from stdin, the upload

operation will fail.

.IP "--bearer"

(IMAP/POP3/SMTP) Specify the Bearer Token for OAUTH 2.0 server authentication.

The Bearer Token is used in conjuction with the user name which can be

specified as part of the \fI--url\fP or \fI-u, --user\fP options.



The Bearer Token and user name are formatted according to RFC 6750.



If this option is used several times, the last one will be used.

.IP "-b, --cookie <name=data>"

(HTTP)

Pass the data to the HTTP server as a cookie. It is supposedly the
@@ -1062,6 +1054,14 @@ you want the file saved in a different directory, make sure you change current 
working directory before you invoke curl with the \fB-O, --remote-name\fP flag!



You may use this option as many times as the number of URLs you have.

.IP "--oauth2-bearer"

(IMAP/POP3/SMTP) Specify the Bearer Token for OAUTH 2.0 server authentication.

The Bearer Token is used in conjuction with the user name which can be

specified as part of the \fI--url\fP or \fI-u, --user\fP options.



The Bearer Token and user name are formatted according to RFC 6750.



If this option is used several times, the last one will be used.

.IP "-p, --proxytunnel"

When an HTTP proxy is used (\fI-x, --proxy\fP), this option will cause non-HTTP

protocols to attempt to tunnel through the proxy instead of merely using it to

src/tool_getparam.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static const struct LongShort aliases[]= { 
  {"*6", "dns-ipv6-addr",            TRUE},

  {"*a", "random-file",              TRUE},

  {"*b", "egd-file",                 TRUE},

  {"*B", "bearer",                   TRUE},

  {"*B", "oauth2-bearer",             TRUE},

  {"*c", "connect-timeout",          TRUE},

  {"*d", "ciphers",                  TRUE},

  {"*D", "dns-interface",            TRUE},