diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/client/clientmedia.cpp | 26 | ||||
-rw-r--r-- | src/client/clientmedia.h | 1 |
2 files changed, 1 insertions, 26 deletions
diff --git a/src/client/clientmedia.cpp b/src/client/clientmedia.cpp index 97931ee68..e3ad92dbc 100644 --- a/src/client/clientmedia.cpp +++ b/src/client/clientmedia.cpp @@ -105,7 +105,6 @@ void ClientMediaDownloader::addRemoteServer(const std::string &baseurl) RemoteServerStatus *remote = new RemoteServerStatus(); remote->baseurl = baseurl; remote->active_count = 0; - remote->request_by_filename = false; m_remotes.push_back(remote); } @@ -299,28 +298,6 @@ void ClientMediaDownloader::remoteHashSetReceived( << e.what() << std::endl; } } - - // For compatibility: If index.mth is not found, assume that the - // server contains files named like the original files (not their sha1) - - // Do NOT check for any particular response code (e.g. 404) here, - // because different servers respond differently - - if (!fetch_result.succeeded && !fetch_result.timeout) { - infostream << "Client: Enabling compatibility mode for remote " - << "server \"" << remote->baseurl << "\"" << std::endl; - remote->request_by_filename = true; - - // Assume every file is available on this server - - for(std::map<std::string, FileStatus*>::iterator - it = m_files.upper_bound(m_name_bound); - it != m_files.end(); ++it) { - FileStatus *f = it->second; - if (!f->received) - f->available_remotes.push_back(remote_id); - } - } } void ClientMediaDownloader::remoteMediaReceived( @@ -425,8 +402,7 @@ void ClientMediaDownloader::startRemoteMediaTransfers() m_remotes[remote_id]; std::string url = remote->baseurl + - (remote->request_by_filename ? name : - hex_encode(filestatus->sha1)); + hex_encode(filestatus->sha1); verbosestream << "Client: " << "Requesting remote media file " << "\"" << name << "\" " diff --git a/src/client/clientmedia.h b/src/client/clientmedia.h index b08b83e4d..92831082c 100644 --- a/src/client/clientmedia.h +++ b/src/client/clientmedia.h @@ -92,7 +92,6 @@ private: struct RemoteServerStatus { std::string baseurl; s32 active_count; - bool request_by_filename; }; void initialStep(Client *client); |