Commit 2c0ecac9 authored by Steve Holme's avatar Steve Holme
Browse files

imap/pop3: Post graceful cancellation consistency changes

parent b0b5b511

lib/imap.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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)) {

lib/pop3.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -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;

  }

  }