Richard Atterer brought a patch that added support for SOCKS4a proxies, which (a46b40b7) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

CHANGES

+7 −0

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

		Changelog

		Daniel S (2 Jan 2008)
		- Richard Atterer brought a patch that added support for SOCKS4a proxies,
		which is an inofficial PROXY4 variant that sends the hostname to the proxy
		instead of the resolved address (which is already supported by SOCKS5).
		--socks4a is the curl command line option for it and CURLOPT_PROXYTYPE can
		now be set to CURLPROXY_SOCKS4A as well.

		Daniel S (1 Jan 2008)
		- Mohun Biswas pointed out that --libcurl generated a source code with an int
		function but without a return statement. While fixing that, I also took care

+3 −2

Original line number	Diff line number	Diff line
		Curl and libcurl 7.17.2

		Public curl releases: 103
		Command line options: 123
		Command line options: 124
		curl_easy_setopt() options: 148
		Public functions in libcurl: 55
		Public web site mirrors: 42
		@@ -13,6 +13,7 @@ This release includes the following changes:
		o --data-urlencode was added
		o CURLOPT_PROXY_TRANSFER_MODE was added
		o --no-keep-alive was added
		o --socks4a added (proxy type CURLPROXY_SOCKS4A for libcurl)

		This release includes the following bugfixes:

		@@ -62,6 +63,6 @@ advice from friends like these:
		Robin Johnson, Michal Marek, Ates Goral, Andres Garcia, Rob Crittenden,
		Emil Romanus, Alessandro Vesely, Ray Pekowski, Spacen Jasset, Andrew Moise,
		Gilles Blanc, David Wright, Vikram Saxena, Mateusz Loskot, Gary Maxwell,
		Dmitry Kurochkin, Mohun Biswas
		Dmitry Kurochkin, Mohun Biswas, Richard Atterer

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

+9 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		.\" * \| (__\| \|_\| \| _ <\| \|___
		.\" * \___\|\___/\|_\| \_\_____\|
		.\" *
		.\" * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
		.\" * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
		.\" *
		.\" * This software is licensed as described in the file COPYING, which
		.\" * you should have received as part of this distribution. The terms
		@@ -1074,6 +1074,14 @@ assumed at port 1080. (Added in 7.15.2)
		This option overrides any previous use of \fI-x/--proxy\fP, as they are
		mutually exclusive.

		If this option is used several times, the last one will be used.
		.IP "--socks4a <host[:port]>"
		Use the specified SOCKS4a proxy. If the port number is not specified, it is
		assumed at port 1080. (Added in 7.17.2)

		This option overrides any previous use of \fI-x/--proxy\fP, as they are
		mutually exclusive.

		If this option is used several times, the last one will be used.
		.IP "--socks5 <host[:port]>"
		Use the specified SOCKS5 proxy. If the port number is not specified, it is

+4 −3

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		.\" * \| (__\| \|_\| \| _ <\| \|___
		.\" * \___\|\___/\|_\| \_\_____\|
		.\" *
		.\" * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
		.\" * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
		.\" *
		.\" * This software is licensed as described in the file COPYING, which
		.\" * you should have received as part of this distribution. The terms
		@@ -430,8 +430,9 @@ Pass a long with this option to set the proxy port to connect to unless it is
		specified in the proxy string \fICURLOPT_PROXY\fP.
		.IP CURLOPT_PROXYTYPE
		Pass a long with this option to set type of the proxy. Available options for
		this are \fICURLPROXY_HTTP\fP, \fICURLPROXY_SOCKS4\fP (added in 7.15.2)
		\fICURLPROXY_SOCKS5\fP. The HTTP type is default. (Added in 7.10)
		this are \fICURLPROXY_HTTP\fP, \fICURLPROXY_SOCKS4\fP (added in 7.15.2),
		\fICURLPROXY_SOCKS5\fP and \fICURLPROXY_SOCKS4A\fP (added in 7.17.2). The HTTP
		type is default. (Added in 7.10)
		.IP CURLOPT_HTTPPROXYTUNNEL
		Set the parameter to non-zero to get the library to tunnel all operations
		through a given HTTP proxy. There is a big difference between using a proxy

+8 −6

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		* \| (__\| \|_\| \| _ <\| \|___
		* \___\|\___/\|_\| \_\_____\|
		*
		* Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
		* Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
		*
		* This software is licensed as described in the file COPYING, which
		* you should have received as part of this distribution. The terms
		@@ -510,10 +510,12 @@ typedef CURLcode (curl_ssl_ctx_callback)(CURL curl, /* easy handle */
		void *userptr);

		typedef enum {
		CURLPROXY_HTTP = 0,
		CURLPROXY_SOCKS4 = 4,
		CURLPROXY_SOCKS5 = 5
		} curl_proxytype;
		CURLPROXY_HTTP = 0, /* added in 7.10 */
		CURLPROXY_SOCKS4 = 4, /* support added in 7.15.2, enum existed already
		in 7.10 */
		CURLPROXY_SOCKS5 = 5, /* added in 7.10 */
		CURLPROXY_SOCKS4A = 6 /* added in 7.17.2 */
		} curl_proxytype; /* this enum was added in 7.10 */

		#define CURLAUTH_NONE 0 /* nothing */
		#define CURLAUTH_BASIC (1<<0) /* Basic (default) */
		@@ -958,7 +960,7 @@ typedef enum {
		CINIT(SHARE, OBJECTPOINT, 100),

		/* indicates type of proxy. accepted values are CURLPROXY_HTTP (default),
		CURLPROXY_SOCKS4 and CURLPROXY_SOCKS5. */
		CURLPROXY_SOCKS4, CURLPROXY_SOCKS4A and CURLPROXY_SOCKS5. */
		CINIT(PROXYTYPE, LONG, 101),

		/* Set the Accept-Encoding string. Use this to tell a server you would like