| 12345678910111213141516171819202122232425262728 |
- --- curl-7.42.0.orig/lib/url.c 2015-04-22 07:55:54.000000000 +0200
- +++ curl-7.42.0/lib/url.c 2015-04-24 18:00:21.000000000 +0200
- @@ -3069,9 +3069,11 @@ ConnectionExists(struct SessionHandle *d
- struct connectdata *check;
- struct connectdata *chosen = 0;
- bool canPipeline = IsPipeliningPossible(data, needle);
- +#ifdef USE_NTLM
- bool wantNTLMhttp = ((data->state.authhost.want & CURLAUTH_NTLM) ||
- (data->state.authhost.want & CURLAUTH_NTLM_WB)) &&
- (needle->handler->protocol & PROTO_FAMILY_HTTP) ? TRUE : FALSE;
- +#endif
- struct connectbundle *bundle;
-
- *force_reuse = FALSE;
- @@ -3208,8 +3210,11 @@ ConnectionExists(struct SessionHandle *d
- continue;
- }
-
- - 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) ||
|
