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

Treat 30X response without Location header field as error

Browse source 
This is required to make segmented download work.
This commit is contained in:
Tatsuhiro Tsujikawa 2014-02-05 21:20:09 +09:00
parent ec4b729704
commit b18e62dba7
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/HttpResponse.cc
View file

@ -105,6 +105,10 @@ void HttpResponse::validateResponse() const
case 303: // See Other case 303: // See Other
case 307: // Temporary Redirect case 307: // Temporary Redirect
case 308: // Permanent Redirect case 308: // Permanent Redirect
if (!httpHeader_->defined(HttpHeader::LOCATION)) {
throw DL_ABORT_EX2(fmt(EX_LOCATION_HEADER_REQUIRED, statusCode),
error_code::HTTP_PROTOCOL_ERROR);
}
return; return;
} }
if (statusCode >= 400) { if (statusCode >= 400) {

9
src/HttpResponseCommand.cc
View file

@ -231,11 +231,10 @@ bool HttpResponseCommand::executeInternal()
#endif // ENABLE_MESSAGE_DIGEST #endif // ENABLE_MESSAGE_DIGEST
} }
if (statusCode == 404) { if(statusCode >= 300) {
grp->increaseAndValidateFileNotFoundCount(); if(statusCode == 404) {
return skipResponseBody(std::move(httpResponse)); grp->increaseAndValidateFileNotFoundCount();
} }
if (statusCode >= 400 || statusCode == 304 || httpResponse->isRedirect()) {
return skipResponseBody(std::move(httpResponse)); return skipResponseBody(std::move(httpResponse));
} }

9
test/HttpResponseTest.cc
View file

@ -362,7 +362,14 @@ void HttpResponseTest::testValidateResponse()
httpResponse.setHttpHeader(make_unique<HttpHeader>()); httpResponse.setHttpHeader(make_unique<HttpHeader>());
httpResponse.getHttpHeader()->setStatusCode(301); httpResponse.getHttpHeader()->setStatusCode(301);
// It is fine without Location header try {
httpResponse.validateResponse();
CPPUNIT_FAIL("exception must be thrown.");
} catch(Exception& e) {
// success
}
httpResponse.getHttpHeader()->put(HttpHeader::LOCATION, "http://a/b");
httpResponse.validateResponse(); httpResponse.validateResponse();
httpResponse.getHttpHeader()->setStatusCode(201); httpResponse.getHttpHeader()->setStatusCode(201);