summaryrefslogtreecommitdiff
path: root/lib/http_proxy.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2015-02-11 23:18:32 +0100
committerDaniel Stenberg <daniel@haxx.se>2015-03-07 19:19:22 +0100
commitc19349951df1fde96c31d68e054e3a36a3b03860 (patch)
tree6a67e85a7a6a78344cb63c212e284c25079e98a8 /lib/http_proxy.c
parent9da14a96ab5c087814da142c96b2fbdb9ddac9af (diff)
downloadcurl-c19349951df1fde96c31d68e054e3a36a3b03860.tar.gz
multi: fix *getsock() with CONNECT
The code used some happy eyeballs logic even _after_ CONNECT has been sent to a proxy, while the happy eyeball phase is already (should be) over by then. This is solved by splitting the multi state into two separate states introducing the new SENDPROTOCONNECT state. Bug: http://curl.haxx.se/mail/lib-2015-01/0170.html Reported-by: Peter Laser
Diffstat (limited to 'lib/http_proxy.c')
-rw-r--r--lib/http_proxy.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/http_proxy.c b/lib/http_proxy.c
index aa43ef9b2..fd8ccee31 100644
--- a/lib/http_proxy.c
+++ b/lib/http_proxy.c
@@ -72,6 +72,7 @@ CURLcode Curl_proxy_connect(struct connectdata *conn)
conn->data->req.protop = prot_save;
if(CURLE_OK != result)
return result;
+ Curl_safefree(conn->allocptr.proxyuserpwd);
#else
return CURLE_NOT_BUILT_IN;
#endif