From 3bf462f858ea58c56f8dc1a89d60196382490dd8 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Sun, 7 Oct 2012 20:25:15 +0000 Subject: [PATCH] merged resume data fix from RC_0_16 --- ChangeLog | 1 + src/storage.cpp | 3 +++ 2 files changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 4556c2e17..144db9c5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ * fix uTP edge case where udp socket buffer fills up * fix nagle implementation in uTP + * relax file timestamp requirements for accepting resume data * fix performance issue in web seed downloader (coalescing of blocks sometimes wouldn't work) * web seed fixes (better support for torrents without trailing / in web seeds) * fix some issues with SSL over uTP connections diff --git a/src/storage.cpp b/src/storage.cpp index 22a81a9a1..6e2936703 100644 --- a/src/storage.cpp +++ b/src/storage.cpp @@ -197,6 +197,9 @@ namespace libtorrent if (flags & ignore_timestamps) continue; + // if there is no timestamp in the resume data, ignore it + if (size_iter->second == 0) continue; + // allow one second 'slack', because of FAT volumes // in sparse mode, allow the files to be more recent // than the resume data, but only by 5 minutes