Update Mirror list

3 files changed, 367 insertions, 59 deletions

diff --git a/lib/cached.list.php b/lib/cached.list.php
index 865f90d5c..6b1e93505 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -27,46 +27,130 @@
   array (
     0 => 
     array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Beijing',
+      'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
+    ),
+    1 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'http://mirrors.ustc.edu.cn/mageia',
+    ),
+    2 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'https://mirrors.ustc.edu.cn/mageia',
+    ),
+    3 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Nanjing',
+      'url' => 'http://mirrors.nju.edu.cn/mageia',
+    ),
+    4 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Nanjing',
+      'url' => 'https://mirrors.nju.edu.cn/mageia',
+    ),
+    5 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Shanghai',
+      'url' => 'http://ftp.sjtu.edu.cn/mageia',
+    ),
+    6 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Shanghai',
+      'url' => 'https://ftp.sjtu.edu.cn/mageia',
+    ),
+    7 => 
+    array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    1 => 
+    8 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'https://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    2 => 
+    9 => 
+    array (
+      'zone' => 'PH',
+      'country' => 'PH',
+      'city' => 'Cebu',
+      'url' => 'ftp://mirror.rise.ph/mageia',
+    ),
+    10 => 
+    array (
+      'zone' => 'PH',
+      'country' => 'PH',
+      'city' => 'Cebu',
+      'url' => 'http://mirror.rise.ph/mageia',
+    ),
+    11 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    3 => 
+    12 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    4 => 
+    13 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'https://ftp.linux.org.tr/mageia',
     ),
-    5 => 
+    14 => 
+    array (
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'HsinChu',
+      'url' => 'ftp://free.nchc.org.tw/mageia',
+    ),
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
+    16 => 
+    array (
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'HsinChu',
+      'url' => 'http://free.nchc.org.tw/mageia',
+    ),
+    17 => 
+    array (
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'HsinChu',
+      'url' => 'https://free.nchc.org.tw/mageia',
+    ),
   ),
   '_C:EU' => 
   array (
@@ -411,57 +495,57 @@
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
-      'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
     49 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
+      'city' => 'Amsterdam',
+      'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+    ),
+    50 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    50 => 
+    51 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    51 => 
+    52 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    52 => 
+    53 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    53 => 
+    54 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    54 => 
+    55 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    55 => 
-    array (
-      'zone' => 'RU',
-      'country' => 'RU',
-      'city' => 'Краснодар',
-      'url' => 'ftp://mirror.yandex.ru/mageia',
-    ),
     56 => 
     array (
       'zone' => 'RU',
@@ -502,13 +586,27 @@
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
-      'url' => 'http://mageia.ip-connect.info',
+      'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
     62 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
+      'url' => 'http://mageia.ip-connect.info',
+    ),
+    63 => 
+    array (
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
+      'url' => 'http://mageia.ip-connect.vn.ua',
+    ),
+    64 => 
+    array (
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
       'url' => 'https://mageia.ip-connect.info',
     ),
   ),
diff --git a/lib/cached.list_doc.php b/lib/cached.list_doc.php
index 865f90d5c..dae37db42 100644
--- a/lib/cached.list_doc.php
+++ b/lib/cached.list_doc.php
@@ -27,46 +27,130 @@
   array (
     0 => 
     array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Beijing',
+      'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
+    ),
+    1 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'http://mirrors.ustc.edu.cn/mageia',
+    ),
+    2 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'https://mirrors.ustc.edu.cn/mageia',
+    ),
+    3 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Nanjing',
+      'url' => 'http://mirrors.nju.edu.cn/mageia',
+    ),
+    4 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Nanjing',
+      'url' => 'https://mirrors.nju.edu.cn/mageia',
+    ),
+    5 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Shanghai',
+      'url' => 'http://ftp.sjtu.edu.cn/mageia',
+    ),
+    6 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Shanghai',
+      'url' => 'https://ftp.sjtu.edu.cn/mageia',
+    ),
+    7 => 
+    array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    1 => 
+    8 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'https://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    2 => 
+    9 => 
+    array (
+      'zone' => 'PH',
+      'country' => 'PH',
+      'city' => 'Cebu',
+      'url' => 'ftp://mirror.rise.ph/mageia',
+    ),
+    10 => 
+    array (
+      'zone' => 'PH',
+      'country' => 'PH',
+      'city' => 'Cebu',
+      'url' => 'http://mirror.rise.ph/mageia',
+    ),
+    11 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    3 => 
+    12 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    4 => 
+    13 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'https://ftp.linux.org.tr/mageia',
     ),
-    5 => 
+    14 => 
+    array (
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'HsinChu',
+      'url' => 'ftp://free.nchc.org.tw/mageia',
+    ),
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
+    16 => 
+    array (
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'HsinChu',
+      'url' => 'http://free.nchc.org.tw/mageia',
+    ),
+    17 => 
+    array (
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'HsinChu',
+      'url' => 'https://free.nchc.org.tw/mageia',
+    ),
   ),
   '_C:EU' => 
   array (
@@ -411,57 +495,57 @@
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
-      'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
     49 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
+      'city' => 'Amsterdam',
+      'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+    ),
+    50 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    50 => 
+    51 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    51 => 
+    52 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    52 => 
+    53 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    53 => 
+    54 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    54 => 
+    55 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    55 => 
-    array (
-      'zone' => 'RU',
-      'country' => 'RU',
-      'city' => 'Краснодар',
-      'url' => 'ftp://mirror.yandex.ru/mageia',
-    ),
     56 => 
     array (
       'zone' => 'RU',
@@ -502,13 +586,27 @@
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
-      'url' => 'http://mageia.ip-connect.info',
+      'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
     62 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
+      'url' => 'http://mageia.ip-connect.info',
+    ),
+    63 => 
+    array (
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
+      'url' => 'http://mageia.ip-connect.vn.ua',
+    ),
+    64 => 
+    array (
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
       'url' => 'https://mageia.ip-connect.info',
     ),
   ),
@@ -549,10 +647,17 @@
     array (
       'zone' => 'AU',
       'country' => 'AU',
+      'city' => 'Adelaide',
+      'url' => 'http://mirror.internode.on.net/pub/mageia',
+    ),
+    1 => 
+    array (
+      'zone' => 'AU',
+      'country' => 'AU',
       'city' => 'Brisbane',
       'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
     ),
-    1 => 
+    2 => 
     array (
       'zone' => 'AU',
       'country' => 'AU',
diff --git a/lib/cached.list_mirrorlist.php b/lib/cached.list_mirrorlist.php
index 0e93da376..6022445c3 100644
--- a/lib/cached.list_mirrorlist.php
+++ b/lib/cached.list_mirrorlist.php
@@ -27,46 +27,123 @@
   array (
     0 => 
     array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'http://mirrors.ustc.edu.cn/mageia',
+    ),
+    1 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Hefei',
+      'url' => 'https://mirrors.ustc.edu.cn/mageia',
+    ),
+    2 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Nanjing',
+      'url' => 'http://mirrors.nju.edu.cn/mageia',
+    ),
+    3 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Nanjing',
+      'url' => 'https://mirrors.nju.edu.cn/mageia',
+    ),
+    4 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Shanghai',
+      'url' => 'http://ftp.sjtu.edu.cn/mageia',
+    ),
+    5 => 
+    array (
+      'zone' => 'CN',
+      'country' => 'CN',
+      'city' => 'Shanghai',
+      'url' => 'https://ftp.sjtu.edu.cn/mageia',
+    ),
+    6 => 
+    array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    1 => 
+    7 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'https://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    2 => 
+    8 => 
+    array (
+      'zone' => 'PH',
+      'country' => 'PH',
+      'city' => 'Cebu',
+      'url' => 'ftp://mirror.rise.ph/mageia',
+    ),
+    9 => 
+    array (
+      'zone' => 'PH',
+      'country' => 'PH',
+      'city' => 'Cebu',
+      'url' => 'http://mirror.rise.ph/mageia',
+    ),
+    10 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    3 => 
+    11 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    4 => 
+    12 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'https://ftp.linux.org.tr/mageia',
     ),
-    5 => 
+    13 => 
+    array (
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'HsinChu',
+      'url' => 'ftp://free.nchc.org.tw/mageia',
+    ),
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
+    15 => 
+    array (
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'HsinChu',
+      'url' => 'http://free.nchc.org.tw/mageia',
+    ),
+    16 => 
+    array (
+      'zone' => 'TW',
+      'country' => 'TW',
+      'city' => 'HsinChu',
+      'url' => 'https://free.nchc.org.tw/mageia',
+    ),
   ),
   '_C:EU' => 
   array (
@@ -411,93 +488,114 @@
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
-      'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
     49 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
+      'city' => 'Amsterdam',
+      'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+    ),
+    50 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    50 => 
+    51 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    51 => 
+    52 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    52 => 
+    53 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    53 => 
+    54 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    54 => 
+    55 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    55 => 
+    56 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
-      'url' => 'ftp://mirror.yandex.ru/mageia',
+      'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    56 => 
+    57 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'https://mirror.yandex.ru/mageia',
     ),
-    57 => 
+    58 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    58 => 
+    59 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'https://ftp.acc.umu.se/mirror/mageia',
     ),
-    59 => 
+    60 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.info/mirror/mageia',
     ),
-    60 => 
+    61 => 
+    array (
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
+      'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
+    ),
+    62 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.info',
     ),
-    61 => 
+    63 => 
+    array (
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
+      'url' => 'http://mageia.ip-connect.vn.ua',
+    ),
+    64 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -542,10 +640,17 @@
     array (
       'zone' => 'AU',
       'country' => 'AU',
+      'city' => 'Adelaide',
+      'url' => 'http://mirror.internode.on.net/pub/mageia',
+    ),
+    1 => 
+    array (
+      'zone' => 'AU',
+      'country' => 'AU',
       'city' => 'Brisbane',
       'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
     ),
-    1 => 
+    2 => 
     array (
       'zone' => 'AU',
       'country' => 'AU',