diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2007-07-14 16:13:23 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2007-07-14 16:13:23 +0100 |
| commit | 82d0afc286514bbe8904c3436bb6580aeaa6ad66 (patch) | |
| tree | 2339856c9d735d6a228759d15b5e7258b98b0599 /methods/http.cc | |
| parent | f03dd1e032139356f1e5b7f19fb76482ae05e311 (diff) | |
| parent | e53ee4caf5ecf882e3df2665a8e1c2a9e6da6fb0 (diff) | |
* 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
<schepler@math.unipd.it> by the patch (closes: #359634)
* Fix example for Install-{Recommends,Suggests} options on
configure-index example file. Thanks to Peter Eisentraut
<peter_e@gmx.net> by the patch (closes: #432223)
Diffstat (limited to 'methods/http.cc')
| -rw-r--r-- | methods/http.cc | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/methods/http.cc b/methods/http.cc index 3c2d8a36f..d4e231fbe 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 @@ -1168,8 +1164,24 @@ 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; } |