- Daniel Egger provided a patch that allows you to disable proxy support in (f3ab5d55) · 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 (29 Sep 2008)
		- Daniel Egger provided a patch that allows you to disable proxy support in
		libcurl to somewhat reduce the size of the binary. Run configure
		--disable-proxy.

		Daniel Fandrich (29 Sep 2008)
		- Moved all signal-based name resolution timeout handling into a single new
		Curl_resolv_timeout function to reduce coupling.

+2 −1

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@ This release includes the following changes:
		o Added CURLOPT_CERTINFO and CURLINFO_CERTINFO
		o Added CURLOPT_POSTREDIR
		o Better detect HTTP 1.0 servers and don't do HTTP 1.1 requests on them
		o configure --disable-proxy disables proxy

		This release includes the following bugfixes:

		@@ -45,6 +46,6 @@ advice from friends like these:
		Keith Mok, Yang Tse, Daniel Fandrich, Guenter Knauf, Dmitriy Sergeyev,
		Linus Nielsen Feltzing, Martin Drasar, Stefan Krause, Dmitry Kurochkin,
		Mike Revi, Andres Garcia, Michael Goffioul, Markus Moeller, Rob Crittenden,
		Jamie Lokier, Emanuele Bovisio, Maxim Ivanov, Ian Lynagh
		Jamie Lokier, Emanuele Bovisio, Maxim Ivanov, Ian Lynagh, Daniel Egger

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

+16 −0

Original line number	Diff line number	Diff line
		@@ -509,6 +509,22 @@ AC_HELP_STRING([--disable-ldaps],[Disable LDAPS support]),
		AC_SUBST(CURL_DISABLE_LDAPS, [1])
		)

		AC_MSG_CHECKING([whether to support proxiesy])
		AC_ARG_ENABLE(proxy,
		AC_HELP_STRING([--enable-proxy],[Enable proxy support])
		AC_HELP_STRING([--disable-proxy],[Disable proxy support]),
		[ case "$enableval" in
		no)
		AC_MSG_RESULT(no)
		AC_DEFINE(CURL_DISABLE_PROXY, 1, [to disable proxies])
		AC_SUBST(CURL_DISABLE_PROXY, [1])
		;;
		*) AC_MSG_RESULT(yes)
		;;
		esac ],
		AC_MSG_RESULT(yes)
		)

		AC_MSG_CHECKING([whether to support dict])
		AC_ARG_ENABLE(dict,
		AC_HELP_STRING([--enable-dict],[Enable DICT support])

+5 −3

Original line number	Diff line number	Diff line
		@@ -1876,14 +1876,12 @@ static CURLcode ftp_state_pasv_resp(struct connectdata *conn,
		ftp_pasv_verbose(conn, conninfo, newhost, connectport);

		switch(data->set.proxytype) {
		#ifndef CURL_DISABLE_PROXY
		case CURLPROXY_SOCKS5:
		case CURLPROXY_SOCKS5_HOSTNAME:
		result = Curl_SOCKS5(conn->proxyuser, conn->proxypasswd, newhost, newport,
		SECONDARYSOCKET, conn);
		break;
		case CURLPROXY_HTTP:
		/* do nothing here. handled later. */
		break;
		case CURLPROXY_SOCKS4:
		result = Curl_SOCKS4(conn->proxyuser, newhost, newport,
		SECONDARYSOCKET, conn, FALSE);
		@@ -1892,6 +1890,10 @@ static CURLcode ftp_state_pasv_resp(struct connectdata *conn,
		result = Curl_SOCKS4(conn->proxyuser, newhost, newport,
		SECONDARYSOCKET, conn, TRUE);
		break;
		#endif /* CURL_DISABLE_PROXY */
		case CURLPROXY_HTTP:
		/* do nothing here. handled later. */
		break;
		default:
		failf(data, "unknown proxytype option given");
		result = CURLE_COULDNT_CONNECT;

+4 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@

		#include "setup.h"

		#ifndef CURL_DISABLE_PROXY
		#include <string.h>

		#ifdef NEED_MALLOC_H
		@@ -686,3 +687,6 @@ CURLcode Curl_SOCKS5(const char *proxy_name,
		Curl_nonblock(sock, TRUE);
		return CURLE_OK; /* Proxy was successful! */
		}

		#endif /* CURL_DISABLE_PROXY */