Lau Hang Kin found and fixed a problem with the multi interface when doing

CONNECT over a proxy. curl_multi_fdset() didn't report back the socket
properly during that state, due to a missing case in the switch in the
multi_getsock() function.
This commit is contained in:
Daniel Stenberg 2008-01-18 21:51:10 +00:00
parent 01d95b56a0
commit 62df0ff025
3 changed files with 9 additions and 1 deletions

View File

@ -6,6 +6,12 @@
Changelog
Daniel S (18 Jan 2008)
- Lau Hang Kin found and fixed a problem with the multi interface when doing
CONNECT over a proxy. curl_multi_fdset() didn't report back the socket
properly during that state, due to a missing case in the switch in the
multi_getsock() function.
Yang Tse (17 Jan 2008)
- Don't abort tests 518 and 537 when unable to raise the open-file soft limit.

View File

@ -57,6 +57,7 @@ This release includes the following bugfixes:
o improved pipelining
o improved OOM handling for data url encoded HTTP POSTs when read from a file
o test suite could pick wrong tool(s) if more than one existed in the PATH
o curl_multi_fdset() failed to return socket while doing CONNECT over proxy
This release includes the following known bugs:
@ -81,6 +82,6 @@ advice from friends like these:
Gilles Blanc, David Wright, Vikram Saxena, Mateusz Loskot, Gary Maxwell,
Dmitry Kurochkin, Mohun Biswas, Richard Atterer, Maxim Perenesenko,
Daniel Egger, Jeff Johnson, Nikitinskit Dmitriy, Georg Lippitsch, Eric Landes,
Joe Malicki, Nathan Coulter
Joe Malicki, Nathan Coulter, Lau Hang Kin
Thanks! (and sorry if I forgot to mention someone)

View File

@ -780,6 +780,7 @@ static int multi_getsock(struct Curl_one_easy *easy,
case CURLM_STATE_DOING:
return Curl_doing_getsock(easy->easy_conn, socks, numsocks);
case CURLM_STATE_WAITPROXYCONNECT:
case CURLM_STATE_WAITCONNECT:
return waitconnect_getsock(easy->easy_conn, socks, numsocks);