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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/05/05 22:41:54

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

Log message:
        patch #5073

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.805&tr2=1.806&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonOptions.ml.diff?tr1=1.140&tr2=1.141&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.805 mldonkey/distrib/ChangeLog:1.806
--- mldonkey/distrib/ChangeLog:1.805    Fri May  5 22:08:00 2006
+++ mldonkey/distrib/ChangeLog  Fri May  5 22:41:54 2006
@@ -15,6 +15,9 @@
 =========
 
 2006/05/06
+5073: Update default IP blocklist URL, replaced
+      http://www.bluetack.co.uk/config/antip2p.txt with
+      http://www.bluetack.co.uk/config/level1.gz
 5068: New global option user_agent, current option BT-user_agent overrides
       the global value in BT module (pango)
 5064: BT: only try to connect to http trackers (pango)
Index: mldonkey/src/daemon/common/commonOptions.ml
diff -u mldonkey/src/daemon/common/commonOptions.ml:1.140 
mldonkey/src/daemon/common/commonOptions.ml:1.141
--- mldonkey/src/daemon/common/commonOptions.ml:1.140   Fri May  5 22:08:00 2006
+++ mldonkey/src/daemon/common/commonOptions.ml Fri May  5 22:41:54 2006
@@ -843,7 +843,7 @@
     EXAMPLE:
  web_infos = [
   (\"server.met\", 0, \"http://www.jd2k.com/server.met\";);
-  (\"guarding.p2p\", 96, \"http://www.bluetack.co.uk/config/antip2p.txt\";);
+  (\"guarding.p2p\", 96, \"http://www.bluetack.co.uk/config/level1.gz\";);
   (\"ocl\", 24, 
\"http://members.lycos.co.uk/appbyhp2/FlockHelpApp/contact-files/contact.ocl\";);
   (\"contact.dat\", 168, \"http://download.overnet.org/contact.dat\";);
  ]
@@ -852,7 +852,7 @@
       tuple3_option (string_option, int_option, string_option)))
   [
     ("guarding.p2p", 96,
-      "http://www.bluetack.co.uk/config/antip2p.txt";);
+      "http://www.bluetack.co.uk/config/level1.gz";);
     ("server.met", 0,
       "http://www.jd2k.com/server.met";);
     ("contact.dat", 168,
@@ -1504,7 +1504,7 @@
 
 let options_version = define_expert_option current_section ["options_version"]
     "(internal option)"
-    int_option 11
+    int_option 12
 
 
 (*************************************************************************)
@@ -1992,4 +1992,16 @@
       end;
       update 11
 
+  | 11 ->
+      if web_infos_exists "http://www.bluetack.co.uk/config/antip2p.txt"; then
+      begin
+        web_infos_remove
+          [
+           ("guarding.p2p", 96,
+             "http://www.bluetack.co.uk/config/antip2p.txt";);
+          ];
+       web_infos_add "guarding.p2p" 0 
"http://www.bluetack.co.uk/config/level1.gz";;
+      end;
+      update 12
+
   | _ -> ()