diff options
| author | Michael Vogt <mvo@debian.org> | 2005-01-11 11:56:48 +0000 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2005-01-11 11:56:48 +0000 |
| commit | e5dfb858ba7dc53c2a29324f2b4678f4f6912871 (patch) | |
| tree | ddf267b19b7d135608391ae8cd2a698183f46625 /methods | |
| parent | 32133629d8c49029f3d04886aa605de4864b486e (diff) | |
| parent | 47f17da4f65ee4887f46e4442ce2843e3e744d89 (diff) | |
* star-merged with matt, removed the unset("no_proxy") in methods/ftp.cc
Patches applied:
* apt@packages.debian.org/apt--main--0--patch-42
Merge from apt--mvo--0
* apt@packages.debian.org/apt--main--0--patch-43
Fix permissions AGAIN
* apt@packages.debian.org/apt--main--0--patch-44
Update to 0.6.28
* apt@packages.debian.org/apt--main--0--patch-45
Fix malformatted changelog
* apt@packages.debian.org/apt--main--0--patch-46
Merge apt--mvo--0
* apt@packages.debian.org/apt--main--0--patch-47
s/unstable/hoary/
* apt@packages.debian.org/apt--main--0--patch-48
Add ppc64 to buildlib/archtable
Diffstat (limited to 'methods')
| -rw-r--r-- | methods/ftp.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/methods/ftp.cc b/methods/ftp.cc index fafa10534..00d3476c8 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -1098,7 +1098,8 @@ int main(int argc,const char *argv[]) char S[300]; snprintf(S,sizeof(S),"http_proxy=%s",getenv("ftp_proxy")); putenv(S); - putenv("no_proxy="); + //mvo: why should we unset no_proxy here? + //putenv("no_proxy="); // Run the http method string Path = flNotFile(argv[0]) + "http"; |