mirror of
https://github.com/curl/curl.git
synced 2026-08-25 23:43:35 +03:00
parent
86ea3abd41
commit
1495489c41
17 changed files with 62 additions and 67 deletions
|
|
@ -266,11 +266,11 @@ static CURLcode sock_assign_addr(struct Curl_sockaddr_ex *dest,
|
|||
uint8_t transport)
|
||||
{
|
||||
/*
|
||||
* The Curl_sockaddr_ex structure is basically libcurl's external API
|
||||
* curl_sockaddr structure with enough space available to directly hold
|
||||
* any protocol-specific address structures. The variable declared here
|
||||
* will be used to pass / receive data to/from the fopensocket callback
|
||||
* if this has been set, before that, it is initialized from parameters.
|
||||
* The Curl_sockaddr_ex structure is libcurl's external API curl_sockaddr
|
||||
* structure with enough space available to directly hold any
|
||||
* protocol-specific address structures. The variable declared here will be
|
||||
* used to pass / receive data to/from the fopensocket callback if this has
|
||||
* been set, before that, it is initialized from parameters.
|
||||
*/
|
||||
dest->family = ai->ai_family;
|
||||
switch(transport) {
|
||||
|
|
|
|||
|
|
@ -35,8 +35,8 @@ struct Curl_sockaddr_ex;
|
|||
struct ip_quadruple;
|
||||
|
||||
/*
|
||||
* The Curl_sockaddr_ex structure is basically libcurl's external API
|
||||
* curl_sockaddr structure with enough space available to directly hold any
|
||||
* The Curl_sockaddr_ex structure is libcurl's external API curl_sockaddr
|
||||
* structure with enough space available to directly hold any
|
||||
* protocol-specific address structures. The variable declared here will be
|
||||
* used to pass / receive data to/from the fopensocket callback if this has
|
||||
* been set, before that, it is initialized from parameters.
|
||||
|
|
|
|||
|
|
@ -2264,8 +2264,7 @@ static CURLcode ftp_statemach(struct Curl_easy *data,
|
|||
* connected.
|
||||
*
|
||||
* 'complete' can return 0 for incomplete, 1 for done and -1 for go back
|
||||
* (which basically is only for when PASV is being sent to retry a failed
|
||||
* EPSV).
|
||||
* (which is for when PASV is being sent to retry a failed EPSV).
|
||||
*/
|
||||
static CURLcode ftp_do_more(struct Curl_easy *data, int *completep)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -974,9 +974,8 @@ static CURLcode auth_basic(struct Curl_easy *data,
|
|||
*availp |= CURLAUTH_BASIC;
|
||||
authp->avail |= CURLAUTH_BASIC;
|
||||
if(authp->picked == CURLAUTH_BASIC) {
|
||||
/* We asked for Basic authentication but got a 40X back
|
||||
anyway, which basically means our name+password is not
|
||||
valid. */
|
||||
/* We asked for Basic authentication but got a 40X back anyway, which
|
||||
means our name+password is not valid. */
|
||||
authp->avail = CURLAUTH_NONE;
|
||||
infof(data, "Basic authentication problem, ignoring.");
|
||||
data->state.authproblem = TRUE;
|
||||
|
|
@ -993,8 +992,8 @@ static CURLcode auth_bearer(struct Curl_easy *data,
|
|||
*availp |= CURLAUTH_BEARER;
|
||||
authp->avail |= CURLAUTH_BEARER;
|
||||
if(authp->picked == CURLAUTH_BEARER) {
|
||||
/* We asked for Bearer authentication but got a 40X back
|
||||
anyway, which basically means our token is not valid. */
|
||||
/* We asked for Bearer authentication but got a 40X back anyway, which
|
||||
means our token is not valid. */
|
||||
authp->avail = CURLAUTH_NONE;
|
||||
infof(data, "Bearer authentication problem, ignoring.");
|
||||
data->state.authproblem = TRUE;
|
||||
|
|
|
|||
14
lib/multi.c
14
lib/multi.c
|
|
@ -693,10 +693,10 @@ static CURLcode multi_done(struct Curl_easy *data,
|
|||
case CURLE_ABORTED_BY_CALLBACK:
|
||||
case CURLE_READ_ERROR:
|
||||
case CURLE_WRITE_ERROR:
|
||||
/* When we are aborted due to a callback return code it basically have to
|
||||
be counted as premature as there is trouble ahead if we do not. We have
|
||||
many callbacks and protocols work differently, we could potentially do
|
||||
this more fine-grained in the future. */
|
||||
/* When we are aborted due to a callback return code it has to be counted
|
||||
as premature as there is trouble ahead if we do not. We have many
|
||||
callbacks and protocols work differently, we could potentially do this
|
||||
more fine-grained in the future. */
|
||||
premature = TRUE;
|
||||
FALLTHROUGH();
|
||||
default:
|
||||
|
|
@ -1694,9 +1694,9 @@ static CURLcode multi_do(struct Curl_easy *data, bool *done)
|
|||
}
|
||||
|
||||
/*
|
||||
* multi_do_more() is called during the DO_MORE multi state. It is basically a
|
||||
* second stage DO state which (wrongly) was introduced to support FTP's
|
||||
* second connection.
|
||||
* multi_do_more() is called during the DO_MORE multi state. It is a second
|
||||
* stage DO state which (wrongly) was introduced to support FTP's second
|
||||
* connection.
|
||||
*
|
||||
* 'complete' can return 0 for incomplete, 1 for done and -1 for go back to
|
||||
* DOING state there is more work to do!
|
||||
|
|
|
|||
|
|
@ -935,8 +935,8 @@ static CURLcode tftp_connect(struct Curl_easy *data, bool *done)
|
|||
return CURLE_OUT_OF_MEMORY;
|
||||
}
|
||||
|
||||
/* we do not keep TFTP connections up basically because there is none or
|
||||
* little gain for UDP */
|
||||
/* we do not keep TFTP connections up because there is none or little gain
|
||||
* for UDP */
|
||||
connclose(conn, "TFTP");
|
||||
|
||||
state->data = data;
|
||||
|
|
|
|||
|
|
@ -574,8 +574,7 @@ CURLcode Curl_pretransfer(struct Curl_easy *data)
|
|||
|
||||
/*
|
||||
* Set user-agent. Used for HTTP, but since we can attempt to tunnel
|
||||
* basically anything through an HTTP proxy we cannot limit this based on
|
||||
* protocol.
|
||||
* anything through an HTTP proxy we cannot limit this based on protocol.
|
||||
*/
|
||||
if(!result && data->set.str[STRING_USERAGENT]) {
|
||||
curlx_free(data->state.aptr.uagent);
|
||||
|
|
|
|||
|
|
@ -514,8 +514,8 @@ struct Curl_scheme {
|
|||
const struct Curl_protocol *run; /* implementation */
|
||||
curl_prot_t protocol; /* See CURLPROTO_* - this needs to be the single
|
||||
specific protocol bit */
|
||||
curl_prot_t family; /* single bit for protocol family; basically the
|
||||
non-TLS name of the protocol this is */
|
||||
curl_prot_t family; /* single bit for protocol family; the non-TLS name
|
||||
of the protocol this is */
|
||||
uint32_t flags; /* Extra particular characteristics, see PROTOPT_* */
|
||||
uint16_t defport; /* Default port. */
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue