diff options
| author | Julian Andres Klode <jak@debian.org> | 2016-08-18 10:02:35 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2016-08-18 10:02:35 +0200 |
| commit | d1fd09b982f6108dc32ec75330b0535236c48311 (patch) | |
| tree | c0dce6cf7501c1e0d5e3bad34e9b63c0d6dcd354 /methods/http.cc | |
| parent | b5fcba3682581b2a48921cc830dbf3deae6b0ff3 (diff) | |
| parent | 43670e2ef8b689d9efba633d11d2a5fc6f9968a0 (diff) | |
Merge tag '1.3_rc2' into ubuntu
apt Debian release 1.3~rc2
Diffstat (limited to 'methods/http.cc')
| -rw-r--r-- | methods/http.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/methods/http.cc b/methods/http.cc index 0358b50cd..11136bb9a 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -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() /*{{{*/ { @@ -899,7 +906,7 @@ void HttpMethod::SendReq(FetchItem *Itm) // Check for a partial file and send if-queries accordingly struct stat SBuf; - if (stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0) + if (Server->RangesAllowed && stat(Itm->DestFile.c_str(),&SBuf) >= 0 && SBuf.st_size > 0) Req << "Range: bytes=" << std::to_string(SBuf.st_size) << "-\r\n" << "If-Range: " << TimeRFC1123(SBuf.st_mtime, false) << "\r\n"; else if (Itm->LastModified != 0) |