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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/05/30 10:56:09

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

Log message:
        patch #5138

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.856&tr2=1.857&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/guiEncoding.ml.diff?tr1=1.53&tr2=1.54&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.856 mldonkey/distrib/ChangeLog:1.857
--- mldonkey/distrib/ChangeLog:1.856    Tue May 30 10:55:21 2006
+++ mldonkey/distrib/ChangeLog  Tue May 30 10:56:09 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/05/30
+5138: Catch ip banned exception (zet)
 5137: HTML: Fix display of file magic values with '
 5136: FileTP: fixes and enhancements (zet)
 * Add "FTP-chunk_size" option (0 = no chunks = download full file at once)
Index: mldonkey/src/daemon/common/guiEncoding.ml
diff -u mldonkey/src/daemon/common/guiEncoding.ml:1.53 
mldonkey/src/daemon/common/guiEncoding.ml:1.54
--- mldonkey/src/daemon/common/guiEncoding.ml:1.53      Wed May 17 08:52:43 2006
+++ mldonkey/src/daemon/common/guiEncoding.ml   Tue May 30 10:56:09 2006
@@ -596,7 +596,8 @@
   );
   if proto > 33 then begin
     let is_blocked = 
-      !Ip.banned (Ip.ip_of_addr addr) <> None
+      try !Ip.banned (Ip.ip_of_addr addr) <> None
+      with _ -> false
     in
     buf_bool buf is_blocked 
   end