diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2012-09-22 23:19:41 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2012-09-22 23:19:41 +0900 |
| commit | 461a542c5e236a22bb4edba3fae9610df4ba44c6 (patch) | |
| tree | 47898cc7a938ff49866b8889095b651c54e3df3c /src/HttpResponseCommand.cc | |
| parent | 9d294741fd1bb469ed6be4e46af2f6521ce75054 (diff) | |
Rewritten DownloadHandlerConstants
DownloadHandlerConstants was simplified. MIME type handling in Accept
header was also reworked. DownloadContext's metalinkServerContacted_
is replaced with acceptMetalink_ and its boolean value is reverted.
RequestGroup and HttpRequest now do not hold vector of accepting
types. HttpRequest has the flag acceptMetalink_ which will be set by
the same value of DownloadContext::accpetMetalink_ and if it is true,
Metalink MIME types are added to Accept header field.
Diffstat (limited to 'src/HttpResponseCommand.cc')
| -rw-r--r-- | src/HttpResponseCommand.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/HttpResponseCommand.cc b/src/HttpResponseCommand.cc index 57a9a1cc..66d5035c 100644 --- a/src/HttpResponseCommand.cc +++ b/src/HttpResponseCommand.cc @@ -197,9 +197,9 @@ bool HttpResponseCommand::executeInternal() } if(!getPieceStorage()) { // Metalink/HTTP - if(!getDownloadContext()->getMetalinkServerContacted()) { + if(getDownloadContext()->getAcceptMetalink()) { if(httpHeader->defined(HttpHeader::LINK)) { - getDownloadContext()->setMetalinkServerContacted(true); + getDownloadContext()->setAcceptMetalink(false); std::vector<MetalinkHttpEntry> entries; httpResponse->getMetalinKHttpEntries(entries, getOption()); for(std::vector<MetalinkHttpEntry>::iterator i = entries.begin(), @@ -245,7 +245,7 @@ bool HttpResponseCommand::executeInternal() } } if(!getPieceStorage()) { - util::removeMetalinkContentTypes(getRequestGroup()); + getDownloadContext()->setAcceptMetalink(false); int64_t totalLength = httpResponse->getEntityLength(); getFileEntry()->setLength(totalLength); if(getFileEntry()->getPath().empty()) { |