aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2013-12-04 20:10:33 +0000
committerSteve Holme <steve_holme@hotmail.com>2013-12-04 20:19:36 +0000
commit2c0ecac9d3a22bf329cb50f884835c3f8b167cf3 (patch)
tree75c2c298c80c766e826b4608de0dc2f59fa354a3
parentb0b5b51193566960d0232d55a39daad70c9026f4 (diff)
imap/pop3: Post graceful cancellation consistency changes
-rw-r--r--lib/imap.c4
-rw-r--r--lib/pop3.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/imap.c b/lib/imap.c
index 60e7489df..0e558ae1a 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -584,8 +584,8 @@ static CURLcode imap_perform_authenticate(struct connectdata *conn)
return result;
}
- /* Calculate the supported authentication mechanism by decreasing order of
- security */
+ /* Calculate the supported authentication mechanism, by decreasing order of
+ security, as well as the initial response where appropriate */
#ifndef CURL_DISABLE_CRYPTO_AUTH
if((imapc->authmechs & SASL_MECH_DIGEST_MD5) &&
(imapc->prefmech & SASL_MECH_DIGEST_MD5)) {
diff --git a/lib/pop3.c b/lib/pop3.c
index fb2675d87..d432f9d0f 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -601,8 +601,8 @@ static CURLcode pop3_perform_authenticate(struct connectdata *conn)
return result;
}
- /* Calculate the supported authentication mechanism by decreasing order of
- security */
+ /* Calculate the supported authentication mechanism, by decreasing order of
+ security, as well as the initial response where appropriate */
if(pop3c->authtypes & POP3_TYPE_SASL) {
#ifndef CURL_DISABLE_CRYPTO_AUTH
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 */
CURLcode result = CURLE_OK;
+ struct POP3 *pop3 = conn->data->req.protop;
DEBUGF(infof(conn->data, "DO phase starts\n"));
if(conn->data->set.opt_no_body) {
/* Requested no body means no transfer */
- struct POP3 *pop3 = conn->data->req.protop;
pop3->transfer = FTPTRANSFER_INFO;
}