github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Support network-path reference in HTTP redirect.

pull/9/head
Tatsuhiro Tsujikawa 2012-01-11 02:17:38 +09:00
parent 2997fa0631
commit a6803c21b5
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Request.cc
View File

@ -108,9 +108,16 @@ bool Request::redirectUri(const std::string& uri) {
return false; return false;
} }
std::string redirectedUri; std::string redirectedUri;
if(uri.find("://") == std::string::npos) { if(util::startsWith(uri, "//")) {
// Network-path reference (according to RFC 3986, Section 4.2)
// Just complement current protocol.
redirectedUri = getProtocol();
redirectedUri += ":";
redirectedUri += uri;
} else if(uri.find("://") == std::string::npos) {
// rfc2616 requires absolute URI should be provided by Location header // rfc2616 requires absolute URI should be provided by Location header
// field, but some servers don't obey this rule. // field, but some servers don't obey this rule.
// UPDATE: draft-ietf-httpbis-p2-semantics-18 now allows this.
uri::UriStruct rus(us_); uri::UriStruct rus(us_);
rus.query.clear(); rus.query.clear();
rus.file.clear(); rus.file.clear();

5
test/RequestTest.cc
View File

@ -137,6 +137,11 @@ void RequestTest::testRedirectUri()
"relativepath/to/file"), "relativepath/to/file"),
req.getCurrentUri()); req.getCurrentUri());
CPPUNIT_ASSERT_EQUAL(4, req.getRedirectCount()); CPPUNIT_ASSERT_EQUAL(4, req.getRedirectCount());
// Give network-path reference
CPPUNIT_ASSERT(req.redirectUri("//host/to/file"));
CPPUNIT_ASSERT_EQUAL(std::string("http://host/to/file"), req.getCurrentUri());
CPPUNIT_ASSERT_EQUAL(5, req.getRedirectCount());
} }
void RequestTest::testRedirectUri2() void RequestTest::testRedirectUri2()