[Mldonkey-commits] mldonkey distrib/ChangeLog src/utils/cdk/zlib.ml

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/02/11 13:15:49

Modified files:
        distrib        : ChangeLog 
        src/utils/cdk  : zlib.ml 

Log message:
        patch #5734

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1176&r2=1.1177
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/cdk/zlib.ml?cvsroot=mldonkey&r1=1.6&r2=1.7

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1176
retrieving revision 1.1177
diff -u -b -r1.1176 -r1.1177
--- distrib/ChangeLog   11 Feb 2007 13:09:41 -0000      1.1176
+++ distrib/ChangeLog   11 Feb 2007 13:15:49 -0000      1.1177
@@ -15,6 +15,7 @@
 =========
 
 2007/02/11
+5734: Update camlzip to version 1.03 (thx to orbit for reporting)
 5735: BT: Fix make_torrents to sort dictionary entries alphabetically
       Bittornado did not read MLDonkey-made torrents (amadeo)
 5737: MinGW: Work-around missing Unix.fstat

Index: src/utils/cdk/zlib.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/cdk/zlib.ml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/utils/cdk/zlib.ml       5 Feb 2006 13:19:14 -0000       1.6
+++ src/utils/cdk/zlib.ml       11 Feb 2007 13:15:49 -0000      1.7
@@ -143,10 +143,10 @@
       let incount = refill inbuf in
       if incount = 0 then uncompr_finish true else uncompr 0 incount
     end else begin
-      let (_, used_in, used_out) =
+      let (finished, used_in, used_out) =
         inflate zs inbuf inpos inavail outbuf 0 buffer_size Z_SYNC_FLUSH in
       flush outbuf used_out;
-      uncompr (inpos + used_in) (inavail - used_in)
+      if not finished then uncompr (inpos + used_in) (inavail - used_in)
     end
   and uncompr_finish first_finish =
     (* Gotcha: if there is no header, inflate requires an extra "dummy" byte