[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       08/01/15 09:08:31

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonSwarming.ml 

Log message:
        patch #6373

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1345&r2=1.1346
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonSwarming.ml?cvsroot=mldonkey&r1=1.64&r2=1.65

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1345
retrieving revision 1.1346
diff -u -b -r1.1345 -r1.1346
--- distrib/ChangeLog   8 Jan 2008 21:31:07 -0000       1.1345
+++ distrib/ChangeLog   15 Jan 2008 09:08:31 -0000      1.1346
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2008/01/15
+6373: Swarmer: Ignore received data when file is queued
+
 2008/01/08
 6367: FileTP: Fix bug when starting downloads > 4GB via dllink
 

Index: src/daemon/common/commonSwarming.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonSwarming.ml,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- src/daemon/common/commonSwarming.ml 17 Jun 2007 01:56:29 -0000      1.64
+++ src/daemon/common/commonSwarming.ml 15 Jan 2008 09:08:31 -0000      1.65
@@ -2779,12 +2779,12 @@
     | FileCancelled 
     | FileShared
     | FileNew
+    | FileQueued
     | FileDownloaded -> 
        if !verbose then
          lprintf_nl "received: wrong file state %s for %s" (string_of_state 
(file_state t.t_file)) s.s_filename;
        ()
-    | FileDownloading
-    | FileQueued ->
+    | FileDownloading ->
        try
          List.iter (fun (_,_,r) ->
     (* was: r.range_begin < file_end && r.range_end > file_begin *)