diff options
| -rw-r--r-- | methods/server.cc | 20 | ||||
| -rw-r--r-- | methods/server.h | 5 |
2 files changed, 20 insertions, 5 deletions
diff --git a/methods/server.cc b/methods/server.cc index cac77e24c..6a7cae2bc 100644 --- a/methods/server.cc +++ b/methods/server.cc @@ -40,6 +40,10 @@ string ServerMethod::FailFile; int ServerMethod::FailFd = -1; time_t ServerMethod::FailTime = 0; +// Number of successful requests in a pipeline needed to continue +// pipelining after a connection reset. +constexpr int PIPELINE_MIN_SUCCESSFUL_ANSWERS_TO_CONTINUE = 3; + // ServerState::RunHeaders - Get the headers before the data /*{{{*/ // --------------------------------------------------------------------- /* Returns 0 if things are OK, 1 if an IO error occurred and 2 if a header @@ -230,8 +234,11 @@ bool ServerState::HeaderLine(string Line) /* Some servers send error pages (as they are dynamically generated) for simplicity via a connection close instead of e.g. chunked, so assuming an always closing server only if we get a file + close */ - if (Result >= 200 && Result < 300) + if (Result >= 200 && Result < 300 && PipelineAnswersReceived < PIPELINE_MIN_SUCCESSFUL_ANSWERS_TO_CONTINUE) + { PipelineAllowed = false; + PipelineAnswersReceived = 0; + } } else if (stringcasecmp(Val,"keep-alive") == 0) Persistent = true; @@ -512,7 +519,10 @@ int ServerMethod::Loop() // Reset the pipeline if (Server->IsOpen() == false) + { QueueBack = Queue; + Server->PipelineAnswersReceived = 0; + } // Connnect to the host if (Server->Open() == false) @@ -632,6 +642,10 @@ int ServerMethod::Loop() BeforeI = I; } } + if (Server->Pipeline == true) + { + Server->PipelineAnswersReceived++; + } Res.TakeHashes(*resultHashes); URIDone(Res); } @@ -759,8 +773,8 @@ unsigned long long ServerMethod::FindMaximumObjectSizeInQueue() const /*{{{*/ } /*}}}*/ ServerMethod::ServerMethod(char const * const Binary, char const * const Ver,unsigned long const Flags) :/*{{{*/ - aptMethod(Binary, Ver, Flags), Server(nullptr), File(NULL), PipelineDepth(10), - AllowRedirect(false), Debug(false) + aptMethod(Binary, Ver, Flags), Server(nullptr), File(NULL), + AllowRedirect(false), Debug(false), PipelineDepth(10) { } /*}}}*/ 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 { |