summaryrefslogtreecommitdiff
path: root/src/FileEntry.cc
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2010-03-07 10:36:42 +0000
committerTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2010-03-07 10:36:42 +0000
commitb0f180c99c83be511b32c2a22e4e7d701c69a3d9 (patch)
tree1e8cc5e0a99d67d64b86c49b8d1f68d11fed6244 /src/FileEntry.cc
parent6ce44b001de112ee1fb08ea77ed9dc7f045cf4c8 (diff)
2010-03-07 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
url -> uri in Request class. * src/AbstractCommand.cc * src/AdaptiveURISelector.cc * src/DefaultBtAnnounce.cc * src/FeedbackURISelector.cc * src/FileEntry.cc * src/FileEntry.h * src/HttpRequest.h * src/HttpResponse.cc * src/InitiateConnectionCommandFactory.cc * src/Metalink2RequestGroup.cc * src/OptionHandlerImpl.h * src/ProtocolDetector.cc * src/Request.cc * src/Request.h * src/XmlRpcMethodImpl.cc * test/AuthConfigFactoryTest.cc * test/FtpConnectionTest.cc * test/HttpRequestTest.cc * test/HttpResponseTest.cc * test/RequestTest.cc
Diffstat (limited to 'src/FileEntry.cc')
-rw-r--r--src/FileEntry.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/FileEntry.cc b/src/FileEntry.cc
index db0ff1b9..78cbdde0 100644
--- a/src/FileEntry.cc
+++ b/src/FileEntry.cc
@@ -132,7 +132,7 @@ FileEntry::getRequest
return req;
}
req.reset(new Request());
- if(req->setUrl(uri)) {
+ if(req->setUri(uri)) {
if(!_singleHostMultiConnection) {
if(inFlightHost(_inFlightRequests.begin(), _inFlightRequests.end(),
req->getHost())) {
@@ -243,7 +243,7 @@ void FileEntry::removeURIWhoseHostnameIs(const std::string& hostname)
for(std::deque<std::string>::const_iterator itr = _uris.begin(),
eoi = _uris.end(); itr != eoi; ++itr) {
if(((*itr).find(hostname) == std::string::npos) ||
- (req.setUrl(*itr) && (req.getHost() != hostname))) {
+ (req.setUri(*itr) && (req.getHost() != hostname))) {
newURIs.push_back(*itr);
}
}
@@ -337,7 +337,7 @@ static InputIterator findRequestByUri
(InputIterator first, InputIterator last, const T& uri)
{
for(; first != last; ++first) {
- if(!(*first)->removalRequested() && (*first)->getUrl() == uri) {
+ if(!(*first)->removalRequested() && (*first)->getUri() == uri) {
return first;
}
}