* debian/control: increase standards version

* methods/http.cc: revert pipeline depth and move global Proxy to here
* methods/http.h: remove Proxy from here

diff --git a/debian/control b/debian/control
index a47d138177021aee73c131aa95622b2678b85e38..46fd594844cc59aa6fa9be51d454bf3c842551c1 100644 (file)
--- 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>
 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)
 
 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 4b9622b00c1de73919f8cbbc3719b9873ce6e339..d9487be88c564e5793187b0c172e20441bd4313d 100644 (file)
--- 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;
 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;
 unsigned long TimeOut = 120;
 bool Debug = false;

+URI Proxy;

 
 unsigned long CircleBuf::BwReadLimit=0;
 unsigned long CircleBuf::BwTickReadData=0;
 
 unsigned long CircleBuf::BwReadLimit=0;
 unsigned long CircleBuf::BwTickReadData=0;

diff --git a/methods/http.h b/methods/http.h
index 541e2952cb5fdf540f31129e99ad7e499fc074ef..a6191e50142e3c3fad8949bf12613567ac600a8a 100644 (file)
--- a/methods/http.h
+++ b/methods/http.h
@@ -158,6 +158,4 @@ class HttpMethod : public pkgAcqMethod
    };
 };
 
    };
 };
 

-URI Proxy;
-

 #endif
 #endif