Browse Source

reorganize server-states resetting in http/https

We keep various information bits about the server around, some only
effecting the currently handled file (like sizes) while others
should be persistent (like pipeline detections). http used to reset all
file-related manually, which is a bit silly if we already have a Reset()
method – which does reset all through –, so extending it with a
parameter for reuse and calling it from https too (as this was
previously resetting by just creating a new state struct – it uses no
value of the persistent state-keeping yet as it supports no pipelining).

Gbp-Dch: Ignore
tags/debian/1.3_rc2
David Kalnischkies 5 years ago
parent
commit
ebdb6f1810
5 changed files with 26 additions and 17 deletions
  1. +7
    -0
      methods/http.cc
  2. +1
    -1
      methods/http.h
  3. +4
    -1
      methods/https.cc
  4. +13
    -12
      methods/server.cc
  5. +1
    -3
      methods/server.h

+ 7
- 0
methods/http.cc View File

@@ -647,6 +647,13 @@ bool HttpServerState::InitHashes(HashStringList const &ExpectedHashes) /*{{{*/
return true;
}
/*}}}*/
void HttpServerState::Reset(bool const Everything) /*{{{*/
{
ServerState::Reset(Everything);
if (Everything)
ServerFd = -1;
}
/*}}}*/

APT_PURE Hashes * HttpServerState::GetHashes() /*{{{*/
{


+ 1
- 1
methods/http.h View File

@@ -103,7 +103,7 @@ struct HttpServerState: public ServerState
virtual bool WriteResponse(std::string const &Data) APT_OVERRIDE;

public:
virtual void Reset() APT_OVERRIDE { ServerState::Reset(); ServerFd = -1; };
virtual void Reset(bool const Everything = true) APT_OVERRIDE;

virtual bool RunData(FileFd * const File) APT_OVERRIDE;
virtual bool RunDataToDevNull() APT_OVERRIDE;


+ 4
- 1
methods/https.cc View File

@@ -399,7 +399,10 @@ bool HttpsMethod::Fetch(FetchItem *Itm)

// go for it - if the file exists, append on it
File = new FileFd(Itm->DestFile, FileFd::WriteAny);
Server = CreateServerState(Itm->Uri);
if (Server == nullptr || Server->Comp(Itm->Uri) == false)
Server = CreateServerState(Itm->Uri);
else
Server->Reset(false);
if (Server->InitHashes(Itm->ExpectedHashes) == false)
return false;



+ 13
- 12
methods/server.cc View File

@@ -46,20 +46,9 @@ time_t ServerMethod::FailTime = 0;
ServerState::RunHeadersResult ServerState::RunHeaders(FileFd * const File,
const std::string &Uri)
{
State = Header;
Reset(false);
Owner->Status(_("Waiting for headers"));

Major = 0;
Minor = 0;
Result = 0;
TotalFileSize = 0;
JunkSize = 0;
StartPos = 0;
Encoding = Closes;
HaveContent = false;
time(&Date);

do
{
string Data;
@@ -254,6 +243,18 @@ bool ServerState::AddPartialFileToHashes(FileFd &File) /*{{{*/
return GetHashes()->AddFD(File, StartPos);
}
/*}}}*/
void ServerState::Reset(bool const Everything) /*{{{*/
{
Major = 0; Minor = 0; Result = 0; Code[0] = '\0';
TotalFileSize = 0; JunkSize = 0; StartPos = 0;
Encoding = Closes; time(&Date); HaveContent = false;
State = Header; MaximumSize = 0;
if (Everything)
{
Persistent = false; Pipeline = false; PipelineAllowed = true;
}
}
/*}}}*/

// ServerMethod::DealWithHeaders - Handle the retrieved header data /*{{{*/
// ---------------------------------------------------------------------


+ 1
- 3
methods/server.h View File

@@ -84,9 +84,7 @@ struct ServerState
bool AddPartialFileToHashes(FileFd &File);

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;};
virtual void Reset(bool const Everything = true);
virtual bool WriteResponse(std::string const &Data) = 0;

/** \brief Transfer the data from the socket */


Loading…
Cancel
Save