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

2010-06-27 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

Browse source 
Don't set previousUri_ to "" on redirect.
	* src/Request.cc: redirectUri()
This commit is contained in:
Tatsuhiro Tsujikawa 2010-06-27 14:36:25 +00:00
parent d16c70803b
commit 985bc37c00
3 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2010-06-27 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Don't set previousUri_ to "" on redirect.
* src/Request.cc: redirectUri()
2010-06-27 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2010-06-27 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Return given hostname if hostname is numeric host. Return given hostname if hostname is numeric host.

1
src/Request.cc
View file

@ -125,7 +125,6 @@ void Request::setReferer(const std::string& uri)
} }
bool Request::redirectUri(const std::string& uri) { bool Request::redirectUri(const std::string& uri) {
previousUri_ = A2STR::NIL;
supportsPersistentConnection_ = true; supportsPersistentConnection_ = true;
++redirectCount_; ++redirectCount_;
std::string redirectedUri; std::string redirectedUri;

18
test/RequestTest.cc
View file

@ -339,7 +339,7 @@ void RequestTest::testRedirectUri() {
// currentUri must be updated // currentUri must be updated
CPPUNIT_ASSERT_EQUAL(std::string("http://aria.rednoah.co.jp/"), CPPUNIT_ASSERT_EQUAL(std::string("http://aria.rednoah.co.jp/"),
req.getCurrentUri()); req.getCurrentUri());
// previousUri must be "" when redirection // previousUri is "" because no referer is set.
CPPUNIT_ASSERT_EQUAL(std::string(""), req.getPreviousUri()); CPPUNIT_ASSERT_EQUAL(std::string(""), req.getPreviousUri());
CPPUNIT_ASSERT_EQUAL(std::string("http"), req.getProtocol()); CPPUNIT_ASSERT_EQUAL(std::string("http"), req.getProtocol());
CPPUNIT_ASSERT_EQUAL(std::string("aria.rednoah.co.jp"), req.getHost()); CPPUNIT_ASSERT_EQUAL(std::string("aria.rednoah.co.jp"), req.getHost());
@ -375,18 +375,22 @@ void RequestTest::testRedirectUri2() {
CPPUNIT_ASSERT_EQUAL(std::string(""), req.getPreviousUri()); CPPUNIT_ASSERT_EQUAL(std::string(""), req.getPreviousUri());
req.setReferer("http://aria.rednoah.com/"); req.setReferer("http://aria.rednoah.com/");
// previousUri is updated when referer is specified // previousUri is updated when referer is specified
CPPUNIT_ASSERT_EQUAL(std::string("http://aria.rednoah.com/"), req.getPreviousUri()); CPPUNIT_ASSERT_EQUAL(std::string("http://aria.rednoah.com/"),
req.getPreviousUri());
req.redirectUri("http://aria.rednoah.com/403.html"); req.redirectUri("http://aria.rednoah.com/403.html");
// previousUri must be "" when redirection // previousUri must not be changed in redirection
CPPUNIT_ASSERT_EQUAL(std::string(""), req.getPreviousUri()); CPPUNIT_ASSERT_EQUAL(std::string("http://aria.rednoah.com/"),
req.getPreviousUri());
// referer is unchagned // referer is unchagned
CPPUNIT_ASSERT_EQUAL(std::string("http://aria.rednoah.com/"), req.getReferer()); CPPUNIT_ASSERT_EQUAL(std::string("http://aria.rednoah.com/"),
req.getReferer());
req.redirectUri("http://aria.rednoah.com/error.html"); req.redirectUri("http://aria.rednoah.com/error.html");
// previousUri must be "" when redirection // previousUri must not be changed in redirection
CPPUNIT_ASSERT_EQUAL(std::string(""), req.getPreviousUri()); CPPUNIT_ASSERT_EQUAL(std::string("http://aria.rednoah.com/"),
req.getPreviousUri());
} }
void RequestTest::testResetUri() { void RequestTest::testResetUri() {