Commit 62df0ff0 authored Jan 18, 2008 by Daniel Stenberg

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.

parent 01d95b56

CHANGES

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6,6 +6,12 @@

	Changelog		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)		Yang Tse (17 Jan 2008)
	- Don't abort tests 518 and 537 when unable to raise the open-file soft limit.		- Don't abort tests 518 and 537 when unable to raise the open-file soft limit.

RELEASE-NOTES

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -57,6 +57,7 @@ This release includes the following bugfixes:
	o improved pipelining		o improved pipelining
	o improved OOM handling for data url encoded HTTP POSTs when read from a file		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 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:		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,		Gilles Blanc, David Wright, Vikram Saxena, Mateusz Loskot, Gary Maxwell,
	Dmitry Kurochkin, Mohun Biswas, Richard Atterer, Maxim Perenesenko,		Dmitry Kurochkin, Mohun Biswas, Richard Atterer, Maxim Perenesenko,
	Daniel Egger, Jeff Johnson, Nikitinskit Dmitriy, Georg Lippitsch, Eric Landes,		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)		Thanks! (and sorry if I forgot to mention someone)

lib/multi.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -780,6 +780,7 @@ static int multi_getsock(struct Curl_one_easy *easy,
	case CURLM_STATE_DOING:		case CURLM_STATE_DOING:
	return Curl_doing_getsock(easy->easy_conn, socks, numsocks);		return Curl_doing_getsock(easy->easy_conn, socks, numsocks);

			case CURLM_STATE_WAITPROXYCONNECT:
	case CURLM_STATE_WAITCONNECT:		case CURLM_STATE_WAITCONNECT:
	return waitconnect_getsock(easy->easy_conn, socks, numsocks);		return waitconnect_getsock(easy->easy_conn, socks, numsocks);