- Constantine Sapuntzakis fixed bug report #2784055 (e84c7db0) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

CHANGES

+9 −0

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

		Changelog

		Daniel Stenberg (8 May 2009)
		- Constantine Sapuntzakis fixed bug report #2784055
		(http://curl.haxx.se/bug/view.cgi?id=2784055) identifying a problem to
		connect to SOCKS proxies when using the multi interface. It turned out to
		almost not work at all previously. We need to wait for the TCP connect to
		be properly verified before doing the SOCKS magic.

		There's still a flaw in the FTP code for this.

		Daniel Stenberg (7 May 2009)
		- Made the SO_SNDBUF setting for the data connection socket for ftp uploads as
		well. See change 28 Apr 2009.

RELEASE-NOTES

+1 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ This release includes the following bugfixes:
		o Rejected SSL session ids are killed properly (for OpenSSL and GnuTLS builds)
		o Deal with the TFTP OACK packet
		o fixed roff mistakes in man pages
		o use SOCKS proxy with the multi interface

		This release includes the following known bugs:

lib/multi.c

+10 −3

Original line number	Diff line number	Diff line
		@@ -1055,9 +1055,16 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
		easy->result = Curl_is_connected(easy->easy_conn,
		FIRSTSOCKET,
		&connected);
		if(connected)
		if(connected) {
		/* see if we need to do any proxy magic first once we connected */
		easy->result = Curl_connected_proxy(easy->easy_conn);

		if(!easy->result)
		/* if everything is still fine we do the protocol-specific connect
		setup */
		easy->result = Curl_protocol_connect(easy->easy_conn,
		&protocol_connect);
		}

		if(CURLE_OK != easy->result) {
		/* failure detected */

lib/url.c

+48 −32

Original line number	Diff line number	Diff line
		@@ -2814,33 +2814,16 @@ ConnectionStore(struct SessionHandle *data,
		return i;
		}

		static CURLcode ConnectPlease(struct SessionHandle *data,
		struct connectdata *conn,
		struct Curl_dns_entry *hostaddr,
		bool *connected)
		{
		CURLcode result;
		Curl_addrinfo *addr;
		#ifndef CURL_DISABLE_VERBOSE_STRINGS
		char *hostname = conn->bits.proxy?conn->proxy.name:conn->host.name;
		/* after a TCP connection to the proxy has been verified, this function does
		the next magic step.

		infof(data, "About to connect() to %s%s port %d (#%d)\n",
		conn->bits.proxy?"proxy ":"",
		hostname, conn->port, conn->connectindex);
		#endif
		Note: this function (and its sub-functions) calls failf()

		/*************************************************************
		* Connect to server/proxy
		*************************************************************/
		result= Curl_connecthost(conn,
		hostaddr,
		&conn->sock[FIRSTSOCKET],
		&addr,
		connected);
		if(CURLE_OK == result) {
		/* All is cool, then we store the current information */
		conn->dns_entry = hostaddr;
		conn->ip_addr = addr;
		*/
		CURLcode Curl_connected_proxy(struct connectdata *conn)
		{
		CURLcode result = CURLE_OK;
		struct SessionHandle *data = conn->data;

		switch(data->set.proxytype) {
		#ifndef CURL_DISABLE_PROXY
		@@ -2868,9 +2851,42 @@ static CURLcode ConnectPlease(struct SessionHandle *data,
		result = CURLE_COULDNT_CONNECT;
		break;
		} /* switch proxytype */
		} /* if result is ok */

		if(result)
		return result;
		}

		static CURLcode ConnectPlease(struct SessionHandle *data,
		struct connectdata *conn,
		struct Curl_dns_entry *hostaddr,
		bool *connected)
		{
		CURLcode result;
		Curl_addrinfo *addr;
		#ifndef CURL_DISABLE_VERBOSE_STRINGS
		char *hostname = conn->bits.proxy?conn->proxy.name:conn->host.name;

		infof(data, "About to connect() to %s%s port %d (#%d)\n",
		conn->bits.proxy?"proxy ":"",
		hostname, conn->port, conn->connectindex);
		#endif

		/*************************************************************
		* Connect to server/proxy
		*************************************************************/
		result= Curl_connecthost(conn,
		hostaddr,
		&conn->sock[FIRSTSOCKET],
		&addr,
		connected);
		if(CURLE_OK == result) {
		/* All is cool, we store the current information */
		conn->dns_entry = hostaddr;
		conn->ip_addr = addr;

		if(*connected)
		result = Curl_connected_proxy(conn);
		}
		else
		connected = FALSE; / mark it as not connected */

		return result;
		@@ -4761,8 +4777,6 @@ CURLcode Curl_done(struct connectdata **connp,

		Curl_expire(data, 0); /* stop timer */

		Curl_getoff_all_pipelines(data, conn);

		if(conn->bits.done \|\|
		(conn->send_pipe->size + conn->recv_pipe->size != 0 &&
		!data->set.reuse_forbid &&
		@@ -4773,6 +4787,8 @@ CURLcode Curl_done(struct connectdata **connp,

		conn->bits.done = TRUE; /* called just now! */

		Curl_getoff_all_pipelines(data, conn);

		/* Cleanup possible redirect junk */
		if(data->req.newurl) {
		free(data->req.newurl);

lib/url.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -85,4 +85,6 @@ void Curl_reset_reqproto(struct connectdata *conn);
		#define CURL_DEFAULT_PROXY_PORT 1080 /* default proxy port unless specified */
		#define CURL_DEFAULT_SOCKS5_GSSAPI_SERVICE "rcmd" /* default socks5 gssapi service */

		CURLcode Curl_connected_proxy(struct connectdata *conn);

		#endif