remove some spurious line-endings
This commit is contained in:
@@ -620,26 +620,26 @@ password to use for the transfer.
|
|||||||
|
|
||||||
The CURLOPT_PASSWORD option should be used in conjunction with
|
The CURLOPT_PASSWORD option should be used in conjunction with
|
||||||
as the \fICURLOPT_USERNAME\fP option. (Added in 7.19.1)
|
as the \fICURLOPT_USERNAME\fP option. (Added in 7.19.1)
|
||||||
.IP CURLOPT_PROXYUSERNAME
|
.IP CURLOPT_PROXYUSERNAME
|
||||||
Pass a char * as parameter, which should be pointing to the zero terminated
|
Pass a char * as parameter, which should be pointing to the zero terminated
|
||||||
user name to use for the transfer while connecting to Proxy.
|
user name to use for the transfer while connecting to Proxy.
|
||||||
|
|
||||||
The CURLOPT_PROXYUSERNAME option should be used in same way as the
|
The CURLOPT_PROXYUSERNAME option should be used in same way as the
|
||||||
\fICURLOPT_PROXYUSERPWD\fP is used. In comparison to \fICURLOPT_PROXYUSERPWD\fP
|
\fICURLOPT_PROXYUSERPWD\fP is used. In comparison to \fICURLOPT_PROXYUSERPWD\fP
|
||||||
the CURLOPT_PROXYUSERNAME allows the username to contain colon,
|
the CURLOPT_PROXYUSERNAME allows the username to contain colon,
|
||||||
like in following example: "sip:user@example.com".
|
like in following example: "sip:user@example.com".
|
||||||
Note the CURLOPT_PROXYUSERNAME option is an alternative way to set the user name
|
Note the CURLOPT_PROXYUSERNAME option is an alternative way to set the user name
|
||||||
while connecting to Proxy. There is no meaning to use it together
|
while connecting to Proxy. There is no meaning to use it together
|
||||||
with the \fICURLOPT_PROXYUSERPWD\fP option.
|
with the \fICURLOPT_PROXYUSERPWD\fP option.
|
||||||
|
|
||||||
In order to specify the password to be used in conjunction with the user name
|
In order to specify the password to be used in conjunction with the user name
|
||||||
use the \fICURLOPT_PROXYPASSWORD\fP option. (Added in 7.19.1)
|
use the \fICURLOPT_PROXYPASSWORD\fP option. (Added in 7.19.1)
|
||||||
.IP CURLOPT_PROXYPASSWORD
|
.IP CURLOPT_PROXYPASSWORD
|
||||||
Pass a char * as parameter, which should be pointing to the zero terminated
|
Pass a char * as parameter, which should be pointing to the zero terminated
|
||||||
password to use for the transfer while connecting to Proxy.
|
password to use for the transfer while connecting to Proxy.
|
||||||
|
|
||||||
The CURLOPT_PROXYPASSWORD option should be used in conjunction with
|
The CURLOPT_PROXYPASSWORD option should be used in conjunction with
|
||||||
as the \fICURLOPT_PROXYUSERNAME\fP option. (Added in 7.19.1)
|
as the \fICURLOPT_PROXYUSERNAME\fP option. (Added in 7.19.1)
|
||||||
.IP CURLOPT_HTTPAUTH
|
.IP CURLOPT_HTTPAUTH
|
||||||
Pass a long as parameter, which is set to a bitmask, to tell libcurl what
|
Pass a long as parameter, which is set to a bitmask, to tell libcurl what
|
||||||
authentication method(s) you want it to use. The available bits are listed
|
authentication method(s) you want it to use. The available bits are listed
|
||||||
|
@@ -1144,10 +1144,10 @@ typedef enum {
|
|||||||
/* "name" and "pwd" to use when fetching. */
|
/* "name" and "pwd" to use when fetching. */
|
||||||
CINIT(USERNAME, OBJECTPOINT, 173),
|
CINIT(USERNAME, OBJECTPOINT, 173),
|
||||||
CINIT(PASSWORD, OBJECTPOINT, 174),
|
CINIT(PASSWORD, OBJECTPOINT, 174),
|
||||||
|
|
||||||
/* "name" and "pwd" to use with Proxy when fetching. */
|
/* "name" and "pwd" to use with Proxy when fetching. */
|
||||||
CINIT(PROXYUSERNAME, OBJECTPOINT, 175),
|
CINIT(PROXYUSERNAME, OBJECTPOINT, 175),
|
||||||
CINIT(PROXYPASSWORD, OBJECTPOINT, 176),
|
CINIT(PROXYPASSWORD, OBJECTPOINT, 176),
|
||||||
|
|
||||||
CURLOPT_LASTENTRY /* the last unused */
|
CURLOPT_LASTENTRY /* the last unused */
|
||||||
} CURLoption;
|
} CURLoption;
|
||||||
|
@@ -198,9 +198,9 @@ _CURL_WARNING(_curl_easy_getinfo_err_curl_slist,
|
|||||||
(option) == CURLOPT_USERPWD || \
|
(option) == CURLOPT_USERPWD || \
|
||||||
(option) == CURLOPT_USERNAME || \
|
(option) == CURLOPT_USERNAME || \
|
||||||
(option) == CURLOPT_PASSWORD || \
|
(option) == CURLOPT_PASSWORD || \
|
||||||
(option) == CURLOPT_PROXYUSERPWD || \
|
(option) == CURLOPT_PROXYUSERPWD || \
|
||||||
(option) == CURLOPT_PROXYUSERNAME || \
|
(option) == CURLOPT_PROXYUSERNAME || \
|
||||||
(option) == CURLOPT_PROXYPASSWORD || \
|
(option) == CURLOPT_PROXYPASSWORD || \
|
||||||
(option) == CURLOPT_ENCODING || \
|
(option) == CURLOPT_ENCODING || \
|
||||||
(option) == CURLOPT_REFERER || \
|
(option) == CURLOPT_REFERER || \
|
||||||
(option) == CURLOPT_USERAGENT || \
|
(option) == CURLOPT_USERAGENT || \
|
||||||
|
@@ -1338,8 +1338,8 @@ enum dupstring {
|
|||||||
STRING_SSL_ISSUERCERT, /* issuer cert file to check certificate */
|
STRING_SSL_ISSUERCERT, /* issuer cert file to check certificate */
|
||||||
STRING_USERNAME, /* <username>, if used */
|
STRING_USERNAME, /* <username>, if used */
|
||||||
STRING_PASSWORD, /* <password>, if used */
|
STRING_PASSWORD, /* <password>, if used */
|
||||||
STRING_PROXYUSERNAME, /* Proxy <username>, if used */
|
STRING_PROXYUSERNAME, /* Proxy <username>, if used */
|
||||||
STRING_PROXYPASSWORD, /* Proxy <password>, if used */
|
STRING_PROXYPASSWORD, /* Proxy <password>, if used */
|
||||||
|
|
||||||
/* -- end of strings -- */
|
/* -- end of strings -- */
|
||||||
STRING_LAST /* not used, just an end-of-list marker */
|
STRING_LAST /* not used, just an end-of-list marker */
|
||||||
|
Reference in New Issue
Block a user