generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

imap/pop3: Post graceful cancellation consistency changes

Browse Source
This commit is contained in:
Steve Holme
2013-12-04 20:10:33 +00:00
parent b0b5b51193
commit 2c0ecac9d3
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/imap.c
View File

@@ -584,8 +584,8 @@ static CURLcode imap_perform_authenticate(struct connectdata *conn)
return result; return result;
} }
/* Calculate the supported authentication mechanism by decreasing order of /* Calculate the supported authentication mechanism, by decreasing order of
security */ security, as well as the initial response where appropriate */
#ifndef CURL_DISABLE_CRYPTO_AUTH #ifndef CURL_DISABLE_CRYPTO_AUTH
if((imapc->authmechs & SASL_MECH_DIGEST_MD5) && if((imapc->authmechs & SASL_MECH_DIGEST_MD5) &&
(imapc->prefmech & SASL_MECH_DIGEST_MD5)) { (imapc->prefmech & SASL_MECH_DIGEST_MD5)) {

6
lib/pop3.c
View File

@@ -601,8 +601,8 @@ static CURLcode pop3_perform_authenticate(struct connectdata *conn)
return result; return result;
} }
/* Calculate the supported authentication mechanism by decreasing order of /* Calculate the supported authentication mechanism, by decreasing order of
security */ security, as well as the initial response where appropriate */
if(pop3c->authtypes & POP3_TYPE_SASL) { if(pop3c->authtypes & POP3_TYPE_SASL) {
#ifndef CURL_DISABLE_CRYPTO_AUTH #ifndef CURL_DISABLE_CRYPTO_AUTH
if((pop3c->authmechs & SASL_MECH_DIGEST_MD5) && if((pop3c->authmechs & SASL_MECH_DIGEST_MD5) &&
@@ -1625,12 +1625,12 @@ static CURLcode pop3_perform(struct connectdata *conn, bool *connected,
{ {
/* This is POP3 and no proxy */ /* This is POP3 and no proxy */
CURLcode result = CURLE_OK; CURLcode result = CURLE_OK;
struct POP3 *pop3 = conn->data->req.protop;
DEBUGF(infof(conn->data, "DO phase starts\n")); DEBUGF(infof(conn->data, "DO phase starts\n"));
if(conn->data->set.opt_no_body) { if(conn->data->set.opt_no_body) {
/* Requested no body means no transfer */ /* Requested no body means no transfer */
struct POP3 *pop3 = conn->data->req.protop;
pop3->transfer = FTPTRANSFER_INFO; pop3->transfer = FTPTRANSFER_INFO;
} }