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; --- debian/changelog | 1 + methods/http.cc | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index a97018ac8..269992196 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ apt (0.7.4) UNRELEASED; urgency=low - type conversion; - unused variable; - changed SetupProxy() method to void; + * Simplified HttpMethod::Fetch on http.cc removing Tail variable; -- Otavio Salvador Mon, 02 Jul 2007 13:27:54 -0300 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) --- debian/changelog | 1 + methods/http.cc | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 269992196..c81d487ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ apt (0.7.4) UNRELEASED; urgency=low - unused variable; - changed SetupProxy() method to void; * Simplified HttpMethod::Fetch on http.cc removing Tail variable; + * Fix pipeline handling on http.cc (closes: #413324) -- Otavio Salvador Mon, 02 Jul 2007 13:27:54 -0300 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 From da78c57f0b0d96c8e76059971e31a7551510bde6 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 12 Jul 2007 14:05:12 -0300 Subject: * Fix building to properly support binNMUs. Thanks to Daniel Schepler by the patch (closes: #359634) --- debian/changelog | 2 ++ debian/rules | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6e74f4265..5a810273f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ apt (0.7.4) UNRELEASED; urgency=low - changed SetupProxy() method to void; * Simplified HttpMethod::Fetch on http.cc removing Tail variable; * Fix pipeline handling on http.cc (closes: #413324) + * Fix building to properly support binNMUs. Thanks to Daniel Schepler + by the patch (closes: #359634) -- Michael Vogt Wed, 11 Jul 2007 23:20:15 +0100 diff --git a/debian/rules b/debian/rules index 3ebecfba4..473821f16 100755 --- a/debian/rules +++ b/debian/rules @@ -38,7 +38,7 @@ build: PKG=apt DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS) -APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p' -e 's/\+.*$$//') +APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p' | sed -e 's/\+.*$$//') APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in) APT_CVSTAG=$(shell echo "$(APT_DEBVER)" | sed -e 's/^/v/' -e 's/\./_/g') -- cgit v1.2.3 From e53ee4caf5ecf882e3df2665a8e1c2a9e6da6fb0 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 12 Jul 2007 14:09:39 -0300 Subject: * Fix example for Install-{Recommends,Suggests} options on configure-index example file. Thanks to Peter Eisentraut by the patch (closes: #432223) --- debian/changelog | 4 ++++ doc/examples/configure-index | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5a810273f..f618b84df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ apt (0.7.4) UNRELEASED; urgency=low * cmdline/apt-get.cc: - fix in the task-install code regexp (thanks to Adam Conrad and Colin Watson) + [Otavio Salvador] * Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3) * Fix compilation warnings: @@ -18,6 +19,9 @@ apt (0.7.4) UNRELEASED; urgency=low * Fix pipeline handling on http.cc (closes: #413324) * Fix building to properly support binNMUs. Thanks to Daniel Schepler by the patch (closes: #359634) + * Fix example for Install-{Recommends,Suggests} options on + configure-index example file. Thanks to Peter Eisentraut + by the patch (closes: #432223) -- Michael Vogt Wed, 11 Jul 2007 23:20:15 +0100 diff --git a/doc/examples/configure-index b/doc/examples/configure-index index d0aad1e3d..bf086e9c1 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -97,8 +97,8 @@ APT // consider Recommends, Suggests as important dependencies that should // be installed by default - APT::Install-Recommends "false"; - APT::Install-Suggests "false"; + Install-Recommends "false"; + Install-Suggests "false"; // consider dependencies of packages in this section manual Never-MarkAuto-Section "metapackages"; -- cgit v1.2.3