summaryrefslogtreecommitdiff
path: root/methods
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2018-09-18 14:10:03 +0000
committerJulian Andres Klode <jak@debian.org>2018-09-18 14:10:03 +0000
commit64efbcd06aa8038e47db7a8bea2d0f388a3e1bb5 (patch)
treeccd3ca2f5f43addde8067526fe74df63754e558e /methods
parent252a0a5020726a7b1ee53f2ed5f00e1210f5f4d1 (diff)
parentdf696650b7a8c58bbd92e0e1619e956f21010a96 (diff)
Merge branch 'pu/keep-pipelining-after-close' into 'master'
http: Stop pipeline after close only if it was not filled before See merge request apt-team/apt!25
Diffstat (limited to 'methods')
-rw-r--r--methods/basehttp.cc24
-rw-r--r--methods/basehttp.h3
2 files changed, 21 insertions, 6 deletions
diff --git a/methods/basehttp.cc b/methods/basehttp.cc
index 3d95ba7df..f8dd7c020 100644
--- a/methods/basehttp.cc
+++ b/methods/basehttp.cc
@@ -39,6 +39,10 @@ string BaseHttpMethod::FailFile;
int BaseHttpMethod::FailFd = -1;
time_t BaseHttpMethod::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
@@ -215,8 +219,11 @@ bool RequestState::HeaderLine(string const &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 && Server->PipelineAnswersReceived < PIPELINE_MIN_SUCCESSFUL_ANSWERS_TO_CONTINUE)
+ {
Server->PipelineAllowed = false;
+ Server->PipelineAnswersReceived = 0;
+ }
}
else if (stringcasecmp(Val,"keep-alive") == 0)
Server->Persistent = true;
@@ -267,6 +274,7 @@ void ServerState::Reset() /*{{{*/
Pipeline = false;
PipelineAllowed = true;
RangesAllowed = true;
+ PipelineAnswersReceived = 0;
}
/*}}}*/
@@ -593,8 +601,10 @@ int BaseHttpMethod::Loop()
Server->Close();
// Reset the pipeline
- if (Server->IsOpen() == false)
+ if (Server->IsOpen() == false) {
QueueBack = Queue;
+ Server->PipelineAnswersReceived = 0;
+ }
// Connect to the host
switch (Server->Open())
@@ -752,6 +762,10 @@ int BaseHttpMethod::Loop()
BeforeI = I;
}
}
+ if (Server->Pipeline == true)
+ {
+ Server->PipelineAnswersReceived++;
+ }
Res.TakeHashes(*resultHashes);
URIDone(Res);
}
@@ -861,9 +875,9 @@ unsigned long long BaseHttpMethod::FindMaximumObjectSizeInQueue() const /*{{{*/
return MaxSizeInQueue;
}
/*}}}*/
-BaseHttpMethod::BaseHttpMethod(std::string &&Binary, char const * const Ver,unsigned long const Flags) :/*{{{*/
- aptAuthConfMethod(std::move(Binary), Ver, Flags), Server(nullptr), PipelineDepth(10),
- AllowRedirect(false), Debug(false)
+BaseHttpMethod::BaseHttpMethod(std::string &&Binary, char const *const Ver, unsigned long const Flags) /*{{{*/
+ : aptAuthConfMethod(std::move(Binary), Ver, Flags), Server(nullptr),
+ AllowRedirect(false), Debug(false), PipelineDepth(10)
{
}
/*}}}*/
diff --git a/methods/basehttp.h b/methods/basehttp.h
index 8220c1b3c..5fdff69e0 100644
--- a/methods/basehttp.h
+++ b/methods/basehttp.h
@@ -67,6 +67,7 @@ struct ServerState
bool Persistent;
bool PipelineAllowed;
bool RangesAllowed;
+ unsigned long PipelineAnswersReceived;
bool Pipeline;
URI ServerName;
@@ -122,7 +123,6 @@ class BaseHttpMethod : public aptAuthConfMethod
std::unique_ptr<ServerState> Server;
std::string NextURI;
- unsigned long PipelineDepth;
bool AllowRedirect;
// Find the biggest item in the fetch queue for the checking of the maximum
@@ -131,6 +131,7 @@ class BaseHttpMethod : public aptAuthConfMethod
public:
bool Debug;
+ unsigned long PipelineDepth;
/** \brief Result of the header parsing */
enum DealWithHeadersResult {