Commit 85c45d15 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

connectionexists: follow-up to fd9d3a1e 

PROTOPT_CREDSPERREQUEST still needs to be checked even when NTLM is not
enabled.

Mistake-caught-by: Kamil Dudka
parent fd9d3a1e

lib/url.c

+7 −4
Original line number Diff line number Diff line
@@ -3210,9 +3210,11 @@ ConnectionExists(struct SessionHandle *data, 
          continue;

      }



#if defined(USE_NTLM)

      if((!(needle->handler->flags & PROTOPT_CREDSPERREQUEST)) ||

         (wantNTLMhttp || check->ntlm.state != NTLMSTATE_NONE)) {

      if((!(needle->handler->flags & PROTOPT_CREDSPERREQUEST))

#ifdef USE_NTLM

         || (wantNTLMhttp || check->ntlm.state != NTLMSTATE_NONE)

#endif

        ) {

        /* This protocol requires credentials per connection or is HTTP+NTLM,

           so verify that we're using the same name and password as well */

        if(!strequal(needle->user, check->user) ||
@@ -3220,9 +3222,10 @@ ConnectionExists(struct SessionHandle *data, 
          /* one of them was different */

          continue;

        }

#if defined(USE_NTLM)

        credentialsMatch = TRUE;

      }

#endif

      }



      if(!needle->bits.httpproxy || needle->handler->flags&PROTOPT_SSL ||

         (needle->bits.httpproxy && check->bits.httpproxy &&