aboutsummaryrefslogtreecommitdiff
path: root/lib/url.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2014-02-16 14:07:56 +0100
committerDaniel Stenberg <daniel@haxx.se>2014-02-16 14:30:02 +0100
commitd765099813f58153cb859279c743e6494d179341 (patch)
tree93f87a896bfdb5d57ca2f5056445ca850b0686e6 /lib/url.c
parentf3bae6ed737c59791c5d36932e4d2387309f8fdb (diff)
ConnectionExists: re-use connections better
When allowing NTLM, the re-use connection logic was too focused on finding an existing NTLM connection to use and didn't properly allow re-use of other ones. This made the logic not re-use perfectly re-usable connections. Added test case 1418 and 1419 to verify. Regression brought in 8ae35102c (curl 7.35.0) Reported-by: Jeff King Bug: http://thread.gmane.org/gmane.comp.version-control.git/242213
Diffstat (limited to 'lib/url.c')
-rw-r--r--lib/url.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/url.c b/lib/url.c
index 085b3a2f9..c0aebef16 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -3133,8 +3133,10 @@ ConnectionExists(struct SessionHandle *data,
*force_reuse = TRUE;
break;
}
- else
- continue;
+ else if(credentialsMatch)
+ /* this is a backup choice */
+ chosen = check;
+ continue;
}
if(canPipeline) {