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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       09/01/04 00:22:59

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

Log message:
        patch #6713

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1386&r2=1.1387
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.223&r2=1.224

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1386
retrieving revision 1.1387
diff -u -b -r1.1386 -r1.1387
--- distrib/ChangeLog   12 Dec 2008 23:00:09 -0000      1.1386
+++ distrib/ChangeLog   4 Jan 2009 00:22:58 -0000       1.1387
@@ -14,6 +14,11 @@
 ChangeLog
 =========
 
+2009/01/04
+6713: GeoIP: New web_infos URL for country list (thx to Choby)
+- old URLs are updated to:
+  http://www.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz
+
 2008/12/13
 6689: Allow compilation with Ocaml 3.11.0
 

Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -b -r1.223 -r1.224
--- src/daemon/common/commonOptions.ml  31 Mar 2008 07:58:16 -0000      1.223
+++ src/daemon/common/commonOptions.ml  4 Jan 2009 00:22:59 -0000       1.224
@@ -1034,7 +1034,7 @@
     (\"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\";);
-    (\"geoip.dat\", 168, 
\"http://www.maxmind.com/download/geoip/database/GeoIP.dat.gz\";);
+    (\"geoip.dat\", 168, 
\"http://www.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz\";);
     ]
   "
     (list_option (tuple3_option (string_option, int_option, string_option)))
@@ -1046,7 +1046,7 @@
       ("contact.dat", 168,
         "http://download.overnet.org/contact.dat";);
       ("geoip.dat", 0,
-        "http://www.maxmind.com/download/geoip/database/GeoIP.dat.gz";);
+        
"http://www.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz";);
       ("nodes.gzip", 0,
         "http://update.kceasy.com/update/fasttrack/nodes.gzip";);
       ("hublist", 0,
@@ -1638,7 +1638,7 @@
 let options_version = define_expert_option current_section ["options_version"]
   ~internal: true
   "(internal option)"
-    int_option 20
+    int_option 21
 
 let max_comments_per_file = define_expert_option current_section 
["max_comments_per_file"]
   "Maximum number of comments per file"
@@ -2219,4 +2219,9 @@
       if !!share_scan_interval = 5 then share_scan_interval =:= 30;
       update 20
 
+  | 20 ->
+      web_infos_remove 
"http://www.maxmind.com/download/geoip/database/GeoIP.dat.gz";;
+      web_infos_add "geoip.dat" 0 
"http://www.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz";;
+      update 21
+
   | _ -> ()