diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2018-08-31 16:07:07 +0200 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2018-09-28 13:53:11 +0200 |
| commit | 439ae5eceae0b44315d278e963332369f0decfa0 (patch) | |
| tree | b5f701ed24b22e493ac61b585f71fc78866e476e /methods/server.h | |
| parent | 1bdcf519e7d35cbf249b28a4395364cb6c754f02 (diff) | |
http: Stop pipeline after close only if it was not filled before
It is perfectly valid behavior for a server to respond with
Connection: close eventually, even when pipelining. Turning
off pipelining due to that is wrong. For example, some Ubuntu
mirrors close the connection after 101 requests. If I have
more packages to install, only the first 101 would benefit
from pipelining.
This commit introduces a new check to only turn of pipelining
for future connections if the pipeline for this connection did
not have 3 successful fetches before, that should work quite well to
detect broken server/proxy combinations like in bug 832113.
(cherry picked from commit df696650b7a8c58bbd92e0e1619e956f21010a96)
LP: #1794957
(cherry picked from commit 3de7454c796f245371c33076ae01529d6d36d715)
Diffstat (limited to 'methods/server.h')
| -rw-r--r-- | methods/server.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/methods/server.h b/methods/server.h index 28c6851f1..1dd24562e 100644 --- a/methods/server.h +++ b/methods/server.h @@ -53,6 +53,7 @@ struct ServerState bool Persistent; bool PipelineAllowed; std::string Location; + unsigned long PipelineAnswersReceived; // This is a Persistent attribute of the server itself. bool Pipeline; @@ -87,7 +88,7 @@ struct ServerState bool Comp(URI Other) const {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;}; virtual void Reset() {Major = 0; Minor = 0; Result = 0; Code[0] = '\0'; TotalFileSize = 0; JunkSize = 0; StartPos = 0; Encoding = Closes; time(&Date); HaveContent = false; - State = Header; Persistent = false; Pipeline = false; MaximumSize = 0; PipelineAllowed = true;}; + State = Header; Persistent = false; Pipeline = false; MaximumSize = 0; PipelineAllowed = true; PipelineAnswersReceived = 0;}; virtual bool WriteResponse(std::string const &Data) = 0; /** \brief Transfer the data from the socket */ @@ -115,7 +116,6 @@ class ServerMethod : public aptMethod std::string NextURI; FileFd *File; - unsigned long PipelineDepth; bool AllowRedirect; // Find the biggest item in the fetch queue for the checking of the maximum @@ -124,6 +124,7 @@ class ServerMethod : public aptMethod public: bool Debug; + unsigned long PipelineDepth; /** \brief Result of the header parsing */ enum DealWithHeadersResult { |