Commit 378af08c authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

ConnectionExists: reusing possible HTTP+NTLM connections better 

Make sure that the special NTLM magic we do is for HTTP+NTLM only since
that's where the authenticated connection is a weird non-standard
paradigm.

Regression brought in 8ae35102 (curl 7.35.0)

Bug: http://curl.haxx.se/mail/lib-2014-02/0100.html
Reported-by: Dan Fandrich
parent c021a60b

lib/url.c

+18 −18
Original line number Diff line number Diff line
@@ -2903,8 +2903,9 @@ ConnectionExists(struct SessionHandle *data, 
  struct connectdata *check;

  struct connectdata *chosen = 0;

  bool canPipeline = IsPipeliningPossible(data, needle);

  bool wantNTLM = (data->state.authhost.want & CURLAUTH_NTLM) ||

    (data->state.authhost.want & CURLAUTH_NTLM_WB) ? TRUE : FALSE;

  bool wantNTLMhttp = ((data->state.authhost.want & CURLAUTH_NTLM) ||

                       (data->state.authhost.want & CURLAUTH_NTLM_WB)) &&

    (needle->handler->protocol & CURLPROTO_HTTP) ? TRUE : FALSE;

  struct connectbundle *bundle;



  *force_reuse = FALSE;
@@ -3059,8 +3060,7 @@ ConnectionExists(struct SessionHandle *data, 
          continue;

      }



      if((needle->handler->protocol & CURLPROTO_FTP) ||

         ((needle->handler->protocol & CURLPROTO_HTTP) && wantNTLM)) {

      if((needle->handler->protocol & CURLPROTO_FTP) || wantNTLMhttp) {

        /* This is FTP or HTTP+NTLM, verify that we're using the same name

           and password as well */

        if(!strequal(needle->user, check->user) ||
@@ -3120,12 +3120,12 @@ ConnectionExists(struct SessionHandle *data, 
      }



      if(match) {

        /* If we are looking for an NTLM connection, check if this is already

           authenticating with the right credentials. If not, keep looking so

           that we can reuse NTLM connections if possible. (Especially we

           must not reuse the same connection if partway through

           a handshake!) */

        if(wantNTLM) {

        /* If we are looking for an HTTP+NTLM connection, check if this is

           already authenticating with the right credentials. If not, keep

           looking so that we can reuse NTLM connections if

           possible. (Especially we must not reuse the same connection if

           partway through a handshake!) */

        if(wantNTLMhttp) {

          if(credentialsMatch && check->ntlm.state != NTLMSTATE_NONE) {

            chosen = check;