diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2011-08-18 23:35:15 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2011-08-18 23:35:15 +0200 |
| commit | b998d95b4d6de388ddc59a48714a2a1d9a43dc43 (patch) | |
| tree | f216741373ddbb8907a59b8e1ada36e5cb12d632 /lib/urldata.h | |
| parent | d44896508ce73fdab43ad7ea713817b58432baa0 (diff) | |
FTP: fix proxy connect race condition
When using the multi interface, a SOCKS proxy, and a connection that
wouldn't immediately consider itself connected (which my Linux tests do
by default), libcurl would be tricked into doing _two_ connects to the
SOCKS proxy when it setup the data connection and then of course the
second attempt would fail miserably and cause error.
This problem is a regression that was introduced by commit
4a42e5cdaa344755 that was introduced in the 7.21.7 release.
Bug: http://curl.haxx.se/mail/lib-2011-08/0199.html
Reported by: Fabian Keil
Diffstat (limited to 'lib/urldata.h')
| -rw-r--r-- | lib/urldata.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/urldata.h b/lib/urldata.h index bd8ba6cd8..b9439e458 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -411,7 +411,7 @@ struct ConnectBits { bool do_more; /* this is set TRUE if the ->curl_do_more() function is supposed to be called, after ->curl_do() */ - bool tcpconnect; /* the TCP layer (or similar) is connected, this is set + bool tcpconnect[2]; /* the TCP layer (or similar) is connected, this is set the first time on the first connect function call */ bool protoconnstart;/* the protocol layer has STARTED its operation after the TCP layer connect */ |