From 21fd1746e37e695f569121c0b6489770ec6a8b0e Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 10 Jul 2007 15:06:12 -0300 Subject: * Fix compilation warnings: - apt-pkg/contrib/configuration.cc: wrong argument type; - apt-pkg/deb/dpkgpm.cc: wrong signess; - apt-pkg-acquire-item.cc: wrong signess and orderned initializers; - methods/https.cc: - type conversion; - unused variable; - changed SetupProxy() method to void; --- methods/https.cc | 5 ++--- methods/https.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'methods') diff --git a/methods/https.cc b/methods/https.cc index b758e4ab3..e62d51f1f 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -50,13 +50,13 @@ HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow, { HttpsMethod *me = (HttpsMethod *)clientp; if(dltotal > 0 && me->Res.Size == 0) { - me->Res.Size = dltotal; + me->Res.Size = (unsigned long)dltotal; me->URIStart(me->Res); } return 0; } -bool HttpsMethod::SetupProxy() +void HttpsMethod::SetupProxy() { URI ServerName = Queue->Uri; @@ -84,7 +84,6 @@ bool HttpsMethod::SetupProxy() } // Determine what host and port to use based on the proxy settings - int Port = 0; string Host; if (Proxy.empty() == true || Proxy.Host.empty() == true) { diff --git a/methods/https.h b/methods/https.h index 6620a10fc..638c18193 100644 --- a/methods/https.h +++ b/methods/https.h @@ -29,7 +29,7 @@ class HttpsMethod : public pkgAcqMethod static size_t write_data(void *buffer, size_t size, size_t nmemb, void *userp); static int progress_callback(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow); - bool SetupProxy(); + void SetupProxy(); CURL *curl; FetchResult Res; -- cgit v1.2.3 From ae58a98599e912eba6b7d0ece21aaa2d979941df Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 10 Jul 2007 15:14:57 -0300 Subject: Minor typos. --- methods/http.cc | 2 +- methods/http.h | 2 +- methods/https.cc | 2 +- methods/https.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'methods') diff --git a/methods/http.cc b/methods/http.cc index d9487be88..3c2d8a36f 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -3,7 +3,7 @@ // $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $ /* ###################################################################### - HTTP Aquire Method - This is the HTTP aquire method for APT. + HTTP Acquire Method - This is the HTTP aquire method for APT. It uses HTTP/1.1 and many of the fancy options there-in, such as pipelining, range, if-range and so on. diff --git a/methods/http.h b/methods/http.h index a6191e501..6753a9901 100644 --- a/methods/http.h +++ b/methods/http.h @@ -3,7 +3,7 @@ // $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $ /* ###################################################################### - HTTP Aquire Method - This is the HTTP aquire method for APT. + HTTP Acquire Method - This is the HTTP aquire method for APT. ##################################################################### */ /*}}}*/ diff --git a/methods/https.cc b/methods/https.cc index e62d51f1f..d48ac97fb 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -3,7 +3,7 @@ // $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $ /* ###################################################################### - HTTPS Aquire Method - This is the HTTPS aquire method for APT. + HTTPS Acquire Method - This is the HTTPS aquire method for APT. It uses libcurl diff --git a/methods/https.h b/methods/https.h index 638c18193..2c33d95ee 100644 --- a/methods/https.h +++ b/methods/https.h @@ -3,7 +3,7 @@ // $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $ /* ###################################################################### - HTTP Aquire Method - This is the HTTP aquire method for APT. + HTTP Acquire Method - This is the HTTP aquire method for APT. ##################################################################### */ /*}}}*/ -- cgit v1.2.3 From 946392c230d5fbf31b7456576c0ee423e25bb58f Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 10 Jul 2007 16:12:25 -0300 Subject: Simplified HttpMethod::Fetch on http.cc removing Tail variable; --- methods/http.cc | 4 ---- 1 file changed, 4 deletions(-) (limited to 'methods') diff --git a/methods/http.cc b/methods/http.cc index 3c2d8a36f..506e66fae 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -996,7 +996,6 @@ bool HttpMethod::Fetch(FetchItem *) // Queue the requests int Depth = -1; - bool Tail = false; for (FetchItem *I = Queue; I != 0 && Depth < (signed)PipelineDepth; I = I->Next, Depth++) { @@ -1008,8 +1007,6 @@ bool HttpMethod::Fetch(FetchItem *) if (Server->Comp(I->Uri) == false) break; if (QueueBack == I) - Tail = true; - if (Tail == true) { QueueBack = I->Next; SendReq(I,Server->Out); @@ -1071,7 +1068,6 @@ int HttpMethod::Loop() delete Server; Server = new ServerState(Queue->Uri,this); } - /* If the server has explicitly said this is the last connection then we pre-emptively shut down the pipeline and tear down the connection. This will speed up HTTP/1.0 servers a tad -- cgit v1.2.3 From 9a52beaad9a26454fe627dab3f87ebf08c799677 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 10 Jul 2007 16:49:12 -0300 Subject: * Fix pipeline handling on http.cc (closes: #413324) --- methods/http.cc | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'methods') diff --git a/methods/http.cc b/methods/http.cc index 506e66fae..068d26978 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -1164,8 +1164,25 @@ int HttpMethod::Loop() URIDone(Res); } else - Fail(true); + { + if (Server->ServerFd == -1) + { + FailCounter++; + _error->Discard(); + Server->Close(); + if (FailCounter >= 2) + { + Fail(_("Connection failed"),true); + FailCounter = 0; + } + + QueueBack = Queue; + } + else + Fail(true); + } + break; } -- cgit v1.2.3