D28437.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D28437.diff
View Options

	Index: lib/libfetch/common.h
	===================================================================
	--- lib/libfetch/common.h
	+++ lib/libfetch/common.h
	@@ -168,6 +168,7 @@
	const char , const char );
	FILE ftp_request(struct url , const char *,
	struct url_stat , struct url , const char *);
	+struct url ftp_get_proxy(struct url , const char *);

	/*
	* Check whether a particular flag is set
	Index: lib/libfetch/ftp.c
	===================================================================
	--- lib/libfetch/ftp.c
	+++ lib/libfetch/ftp.c
	@@ -1064,7 +1064,7 @@
	/*
	* Check the proxy settings
	*/
	-static struct url *
	+struct url *
	ftp_get_proxy(struct url * url, const char *flags)
	{
	struct url *purl;
	Index: lib/libfetch/http.c
	===================================================================
	--- lib/libfetch/http.c
	+++ lib/libfetch/http.c
	@@ -1952,6 +1952,15 @@
	if (url != URL)
	fetchFreeURL(url);
	url = new;
	+ if (!direct) {
	+ if (purl)
	+ fetchFreeURL(purl);
	+ if (strcmp(url->scheme, SCHEME_FTP) == 0)
	+ purl = ftp_get_proxy(url, flags);
	+ else if (strcmp(url->scheme, SCHEME_HTTP) == 0
	+ \|\| strcmp(url->scheme, SCHEME_HTTPS) == 0)
	+ purl = http_get_proxy(url, flags);
	+ }
	} while (++i < n);

	/* we failed, or ran out of retries */