- Mike Crowe made libcurl return CURLE_COULDNT_RESOLVE_PROXY when it is the (c82a1f95) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

CHANGES

+5 −0

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

		Changelog

		Daniel Stenberg (26 Jan 2010)
		- Mike Crowe made libcurl return CURLE_COULDNT_RESOLVE_PROXY when it is the
		proxy that cannot be resolved when using c-ares. This matches the behaviour
		when not using c-ares.

		Björn Stenberg (23 Jan 2010)
		- Added a new flag: -J/--remote-header-name. This option tells the
		-O/--remote-name option to use the server-specified Content-Disposition

+1 −1

Original line number	Diff line number	Diff line
		@@ -63,6 +63,6 @@ advice from friends like these:
		Markus Koetter, Chad Monroe, Martin Storsjo, Siegfried Gyuricsko,
		Jon Nelson, Julien Chaffraix, Renato Botelho, Peter Pentchev, Ingmar Runge,
		Johan van Selst, Charles Kerr, Gil Weber, David McCreedy, Chris Conroy,
		Björn Stenberg
		Bjorn Stenberg, Mike Crowe

		Thanks! (and sorry if I forgot to mention someone)

+20 −7

Original line number	Diff line number	Diff line
		@@ -285,14 +285,27 @@ CURLcode Curl_wait_for_resolv(struct connectdata *conn,
		if(!conn->async.dns) {
		/* a name was not resolved */
		if((timeout < 0) \|\| (conn->async.status == ARES_ETIMEOUT)) {
		if (conn->bits.httpproxy) {
		failf(data, "Resolving proxy timed out: %s", conn->proxy.dispname);
		rc = CURLE_COULDNT_RESOLVE_PROXY;
		}
		else {
		failf(data, "Resolving host timed out: %s", conn->host.dispname);
		rc = CURLE_COULDNT_RESOLVE_HOST;
		}
		}
		else if(conn->async.done) {
		if (conn->bits.httpproxy) {
		failf(data, "Could not resolve proxy: %s (%s)", conn->proxy.dispname,
		ares_strerror(conn->async.status));
		rc = CURLE_COULDNT_RESOLVE_PROXY;
		}
		else {
		failf(data, "Could not resolve host: %s (%s)", conn->host.dispname,
		ares_strerror(conn->async.status));
		rc = CURLE_COULDNT_RESOLVE_HOST;
		}
		}
		else
		rc = CURLE_OPERATION_TIMEDOUT;