Don't parse the proxy URL unless we're actually going to use it. No real

functional difference, but debugging output will be less confusing.

1 files changed, 6 insertions, 3 deletions

diff --git a/lib/libfetch/http.c b/lib/libfetch/http.c
index 5f44c53..1fc4cd5 100644
--- a/lib/libfetch/http.c
+++ b/lib/libfetch/http.c
@@ -696,11 +696,13 @@ _http_connect(struct url *URL, struct url *purl, const char *flags)
 }
 
 static struct url *
-_http_get_proxy(void)
+_http_get_proxy(const char *flags)
 {
 	struct url *purl;
 	char *p;
 
+	if (strchr(flags, 'd') != NULL)
+		return (NULL);
 	if (((p = getenv("HTTP_PROXY")) || (p = getenv("http_proxy"))) &&
 	    (purl = fetchParseURL(p))) {
 		if (!*purl->scheme)
@@ -1108,7 +1110,7 @@ ouch:
 FILE *
 fetchXGetHTTP(struct url *URL, struct url_stat *us, const char *flags)
 {
-	return (_http_request(URL, "GET", us, _http_get_proxy(), flags));
+	return (_http_request(URL, "GET", us, _http_get_proxy(flags), flags));
 }
 
 /*
@@ -1138,7 +1140,8 @@ fetchStatHTTP(struct url *URL, struct url_stat *us, const char *flags)
 {
 	FILE *f;
 
-	if ((f = _http_request(URL, "HEAD", us, _http_get_proxy(), flags)) == NULL)
+	f = _http_request(URL, "HEAD", us, _http_get_proxy(flags), flags);
+	if (f == NULL)
 		return (-1);
 	fclose(f);
 	return (0);