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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/11/12 12:34:50

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

Log message:
        patch #5542

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1080&r2=1.1081
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonSources.ml?cvsroot=mldonkey&r1=1.37&r2=1.38

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1080
retrieving revision 1.1081
diff -u -b -r1.1080 -r1.1081
--- distrib/ChangeLog   9 Nov 2006 21:32:25 -0000       1.1080
+++ distrib/ChangeLog   12 Nov 2006 12:34:50 -0000      1.1081
@@ -14,6 +14,10 @@
 ChangeLog
 =========
 
+2006/11/12
+5542: CommonSources: Work-around division-by-zero bug in Ocaml
+      on Alpha platform (pango)
+
 2006/11/09
 5526: Multiuser: Internal restructuring, new commands
 - from ftp://ftp.berlios.de/pub/mldonkey/pango/userdb-cleanups_v2.patch (pango)

Index: src/daemon/common/commonSources.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonSources.ml,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- src/daemon/common/commonSources.ml  25 Sep 2006 21:39:27 -0000      1.37
+++ src/daemon/common/commonSources.ml  12 Nov 2006 12:34:50 -0000      1.38
@@ -1739,6 +1739,8 @@
                 | _ -> ()
             ) !file_sources_managers;
 
+           if !files <> [] then begin
+
             (* 'normalize' to 0 priorities*)
             sum_priority := !sum_priority + (!nfiles * (-(!min_priority)));
             (* update priorities to be > 0 *)
@@ -1856,7 +1858,6 @@
             in
             iter_files 0 3;
 
-
             (* adjust queue throttling *)
             let all_ready = ref 0 in
             List.iter
@@ -1885,6 +1886,8 @@
                   end
               ) [ good_sources_queue; old_sources1_queue; old_sources2_queue; 
old_sources3_queue ];
 
+           end;
+
             if !verbose_sources > 0 then begin
                 lprintf_nl "[cSrc] CommonSources.refill_sources AFTER:";
                 let buf = Buffer.create 100 in