diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/http.c | 16 | ||||
| -rw-r--r-- | lib/url.c | 4 |
2 files changed, 4 insertions, 16 deletions
diff --git a/lib/http.c b/lib/http.c index 961c80080..0b680b2d6 100644 --- a/lib/http.c +++ b/lib/http.c @@ -2312,20 +2312,10 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) te ); - /* clear userpwd to avoid re-using credentials from re-used connections */ + /* clear userpwd and proxyuserpwd to avoid re-using old credentials + * from re-used connections */ Curl_safefree(conn->allocptr.userpwd); - - /* - * Free proxyuserpwd for Negotiate/NTLM. Cannot reuse as it is associated - * with the connection and shouldn't be repeated over it either. - */ - switch(data->state.authproxy.picked) { - case CURLAUTH_NEGOTIATE: - case CURLAUTH_NTLM: - case CURLAUTH_NTLM_WB: - Curl_safefree(conn->allocptr.proxyuserpwd); - break; - } + Curl_safefree(conn->allocptr.proxyuserpwd); if(result) return result; @@ -3277,9 +3277,7 @@ proxy_info_matches(const struct proxy_info* data, { if((data->proxytype == needle->proxytype) && (data->port == needle->port) && - Curl_safe_strcasecompare(data->host.name, needle->host.name) && - Curl_safe_strcasecompare(data->user, needle->user) && - Curl_safe_strcasecompare(data->passwd, needle->passwd)) + Curl_safe_strcasecompare(data->host.name, needle->host.name)) return TRUE; return FALSE; |