summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2007-06-09 01:02:25 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2007-06-09 01:02:25 +0200
commitc37030c2566a511787933f801a89430f26e5b18a (patch)
treef5786be03d1816e68580d405867bfab8d89712ad
parent408a4726131e9db26ff868623a5d216a26c45a50 (diff)
* debian/control: increase standards version
* methods/http.cc: revert pipeline depth and move global Proxy to here * methods/http.h: remove Proxy from here
-rw-r--r--debian/control2
-rw-r--r--methods/http.cc3
-rw-r--r--methods/http.h2
3 files changed, 3 insertions, 4 deletions
diff --git a/debian/control b/debian/control
index a47d13817..46fd59484 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
Priority: important
Maintainer: APT Development Team <deity@lists.debian.org>
Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>
-Standards-Version: 3.6.2.2
+Standards-Version: 3.7.2.2
Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl3-gnutls-dev (>= 7.15.5)
Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1)
diff --git a/methods/http.cc b/methods/http.cc
index 4b9622b00..d9487be88 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -55,9 +55,10 @@ using namespace std;
string HttpMethod::FailFile;
int HttpMethod::FailFd = -1;
time_t HttpMethod::FailTime = 0;
-unsigned long PipelineDepth = 8;
+unsigned long PipelineDepth = 10;
unsigned long TimeOut = 120;
bool Debug = false;
+URI Proxy;
unsigned long CircleBuf::BwReadLimit=0;
unsigned long CircleBuf::BwTickReadData=0;
diff --git a/methods/http.h b/methods/http.h
index 541e2952c..a6191e501 100644
--- a/methods/http.h
+++ b/methods/http.h
@@ -158,6 +158,4 @@ class HttpMethod : public pkgAcqMethod
};
};
-URI Proxy;
-
#endif