mirrors/aria2
1
0
Fork 0
mirror of https://github.com/aria2/aria2.git synced 2025-04-05 21:47:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Accept HTTP 304 reply as success when If-None-Match request-header

Browse source 
field is specified using --header option.

When --conditional-get is used, --allow-overwrite is now required to
overwrite existing file.
This commit is contained in:
Tatsuhiro Tsujikawa 2011-01-29 23:19:10 +09:00
parent 7a6ec762ef
commit 1b9329c67c
5 changed files with 62 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/HttpResponseCommand.cc
View file

@ -174,26 +174,22 @@ bool HttpResponseCommand::executeInternal()
}
int statusCode = httpResponse->getStatusCode();
if(!httpResponse->getHttpRequest()->getIfModifiedSinceHeader().empty()) {
if(statusCode == 304) {
uint64_t totalLength = httpResponse->getEntityLength();
getFileEntry()->setLength(totalLength);
getRequestGroup()->initPieceStorage();
getPieceStorage()->markAllPiecesDone();
// Just set checksum verification done.
getDownloadContext()->setChecksumVerified(true);
A2_LOG_NOTICE(fmt(MSG_DOWNLOAD_ALREADY_COMPLETED,
util::itos(getRequestGroup()->getGID()).c_str(),
getRequestGroup()->getFirstFilePath().c_str()));
poolConnection();
getFileEntry()->poolRequest(getRequest());
return true;
} else if(statusCode == 200 || statusCode == 206) {
// Remote file is newer than local file. We allow overwrite.
getOption()->put(PREF_ALLOW_OVERWRITE, A2_V_TRUE);
}
if(statusCode == 304) {
uint64_t totalLength = httpResponse->getEntityLength();
getFileEntry()->setLength(totalLength);
getRequestGroup()->initPieceStorage();
getPieceStorage()->markAllPiecesDone();
// Just set checksum verification done.
getDownloadContext()->setChecksumVerified(true);
A2_LOG_NOTICE(fmt(MSG_DOWNLOAD_ALREADY_COMPLETED,
util::itos(getRequestGroup()->getGID()).c_str(),
getRequestGroup()->getFirstFilePath().c_str()));
poolConnection();
getFileEntry()->poolRequest(getRequest());
return true;
}
if(statusCode != 304 && statusCode >= 300) {
if(statusCode >= 300) {
if(statusCode == 404) {
getRequestGroup()->increaseAndValidateFileNotFoundCount();
}