summaryrefslogtreecommitdiff
path: root/methods/http.cc
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:51:38 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:51:38 +0000
commit352c27685a2b9f3b5e0b9eb7b828af099fbdb934 (patch)
tree79d53502c5a949c1c01ee6e5f3b7398c80731013 /methods/http.cc
parentf9fe12bbb59aa3ba53f04d94fd924b4424a9d233 (diff)
Made http_proxy override
Author: jgg Date: 1998-11-23 21:28:43 GMT Made http_proxy override
Diffstat (limited to 'methods/http.cc')
-rw-r--r--methods/http.cc25
1 files changed, 15 insertions, 10 deletions
diff --git a/methods/http.cc b/methods/http.cc
index babf7b972..be7e8610a 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: http.cc,v 1.6 1998/11/21 06:09:09 jgg Exp $
+// $Id: http.cc,v 1.7 1998/11/23 21:28:43 jgg Exp $
/* ######################################################################
HTTP Aquire Method - This is the HTTP aquire method for APT.
@@ -267,18 +267,23 @@ bool ServerState::Open()
Out.Reset();
// Determine the proxy setting
- string DefProxy = _config->Find("Acquire::http::Proxy",getenv("http_proxy"));
- string SpecificProxy = _config->Find("Acquire::http::Proxy::" + ServerName.Host);
- if (SpecificProxy.empty() == false)
+ if (getenv("http_proxy") != 0)
{
- if (SpecificProxy == "DIRECT")
- Proxy = "";
+ string DefProxy = _config->Find("Acquire::http::Proxy");
+ string SpecificProxy = _config->Find("Acquire::http::Proxy::" + ServerName.Host);
+ if (SpecificProxy.empty() == false)
+ {
+ if (SpecificProxy == "DIRECT")
+ Proxy = "";
+ else
+ Proxy = SpecificProxy;
+ }
else
- Proxy = SpecificProxy;
- }
+ Proxy = DefProxy;
+ }
else
- Proxy = DefProxy;
-
+ Proxy = getenv("http_proxy");
+
// Determine what host and port to use based on the proxy settings
int Port = 80;
string Host;