diff options
| author | Uwe Stuehler <uwe@cvs.openbsd.org> | 2006-04-03 21:05:15 +0000 |
|---|---|---|
| committer | Uwe Stuehler <uwe@cvs.openbsd.org> | 2006-04-03 21:05:15 +0000 |
| commit | 2cf1d705c75646daf6d730b964fbc1ea34571bac (patch) | |
| tree | a849807f21626350d1096250499d13eb36c84a29 /usr.bin | |
| parent | e358bfad6c89f7bd4ff4c1e219a7f97968cf1765 (diff) | |
Ignore http_proxy for file urls; ok millert deraadt
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ftp/fetch.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ftp/fetch.c b/usr.bin/ftp/fetch.c index 13846ee7176..d12341dc39a 100644 --- a/usr.bin/ftp/fetch.c +++ b/usr.bin/ftp/fetch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fetch.c,v 1.58 2006/03/29 15:54:55 grunk Exp $ */ +/* $OpenBSD: fetch.c,v 1.59 2006/04/03 21:05:14 uwe Exp $ */ /* $NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $ */ /*- @@ -38,7 +38,7 @@ */ #if !defined(lint) && !defined(SMALL) -static char rcsid[] = "$OpenBSD: fetch.c,v 1.58 2006/03/29 15:54:55 grunk Exp $"; +static char rcsid[] = "$OpenBSD: fetch.c,v 1.59 2006/04/03 21:05:14 uwe Exp $"; #endif /* not lint and not SMALL */ /* @@ -159,7 +159,7 @@ url_get(const char *origline, const char *proxyenv, const char *outfile) goto cleanup_url_get; } - if (proxyenv != NULL) { /* use proxy */ + if (!isfileurl && proxyenv != NULL) { /* use proxy */ proxy = strdup(proxyenv); if (proxy == NULL) errx(1, "Can't allocate memory for proxy URL."); |