diff --git a/ChangeLog b/ChangeLog index f6280b660..21e10b312 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,7 @@ * almost completely changed the storage interface (for custom storage) * added support for hashing pieces in multiple threads + * fix bug where web seeds were not used for torrents added by URL * fix support for symlinks on windows * fix long filename issue (on unixes) * fixed performance bug in DHT torrent eviction diff --git a/src/torrent.cpp b/src/torrent.cpp index 2a0492f34..0777b6361 100644 --- a/src/torrent.cpp +++ b/src/torrent.cpp @@ -479,7 +479,7 @@ namespace libtorrent TORRENT_ASSERT(num_torrents == int(m_ses.m_torrents.size())); // if the user added any trackers while downloading the - // .torrent file, serge them into the new tracker list + // .torrent file, merge them into the new tracker list std::vector new_trackers = m_torrent_file->trackers(); for (std::vector::iterator i = m_trackers.begin() , end(m_trackers.end()); i != end; ++i) @@ -605,6 +605,10 @@ namespace libtorrent } m_trackers.swap(new_trackers); + // add the web seeds from the .torrent file + std::vector const& web_seeds = m_torrent_file->web_seeds(); + m_web_seeds.insert(m_web_seeds.end(), web_seeds.begin(), web_seeds.end()); + #if !defined(TORRENT_DISABLE_ENCRYPTION) && !defined(TORRENT_DISABLE_EXTENSIONS) hasher h; h.update("req2", 4);