summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorDerick Rethans <derick@php.net>2010-12-12 16:06:41 +0000
committerDerick Rethans <derick@php.net>2010-12-12 16:06:41 +0000
commit79aaaf417960e685b55c18cfdf30f078cff03dea (patch)
tree3dcf53211fd2b010fa7616a87f1331efffcb3af6 /ext
parent95c4e449d15aa110d5c67bdf89f5fecf494bb9ac (diff)
downloadphp-git-79aaaf417960e685b55c18cfdf30f078cff03dea.tar.gz
- Fixed a few test cases
- Updated timezone mapping table; to remove unparsable timezones.
Diffstat (limited to 'ext')
-rw-r--r--ext/date/lib/timezonemap.h222
-rw-r--r--ext/date/tests/010.phpt22
-rw-r--r--ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt4
-rw-r--r--ext/date/tests/DateTime_modify_variation1.phpt52
-rw-r--r--ext/date/tests/date_modify_variation2.phpt52
-rw-r--r--ext/date/tests/timezone_abbreviations_list_basic1.phpt4
6 files changed, 73 insertions, 283 deletions
diff --git a/ext/date/lib/timezonemap.h b/ext/date/lib/timezonemap.h
index 292cab93c4..4601923ac9 100644
--- a/ext/date/lib/timezonemap.h
+++ b/ext/date/lib/timezonemap.h
@@ -26,22 +26,17 @@
{ "aft", 0, 14400, "Asia/Kabul" },
{ "aft", 0, 16200, "Asia/Kabul" },
{ "ahdt", 1, -32400, "America/Anchorage" },
- { "ahdt", 1, -32400, "US/Alaska" },
{ "ahst", 0, -36000, "America/Anchorage" },
{ "ahst", 0, -36000, "America/Adak" },
{ "ahst", 0, -36000, "America/Atka" },
- { "ahst", 0, -36000, "US/Alaska" },
- { "ahst", 0, -36000, "US/Aleutian" },
{ "akdt", 1, -28800, "America/Anchorage" },
{ "akdt", 1, -28800, "America/Juneau" },
{ "akdt", 1, -28800, "America/Nome" },
{ "akdt", 1, -28800, "America/Yakutat" },
- { "akdt", 1, -28800, "US/Alaska" },
{ "akst", 0, -32400, "America/Anchorage" },
{ "akst", 0, -32400, "America/Juneau" },
{ "akst", 0, -32400, "America/Nome" },
{ "akst", 0, -32400, "America/Yakutat" },
- { "akst", 0, -32400, "US/Alaska" },
{ "aktst", 1, 21600, "Asia/Aqtobe" },
{ "aktt", 0, 14400, "Asia/Aqtobe" },
{ "aktt", 0, 18000, "Asia/Aqtobe" },
@@ -250,11 +245,9 @@
{ "bdst", 1, 7200, "Europe/Isle_of_Man" },
{ "bdst", 1, 7200, "Europe/Jersey" },
{ "bdst", 1, 7200, "GB" },
- { "bdst", 1, 7200, "GB-Eire" },
{ "bdt", 1, -36000, "America/Adak" },
{ "bdt", 1, -36000, "America/Atka" },
{ "bdt", 1, -36000, "America/Nome" },
- { "bdt", 1, -36000, "US/Aleutian" },
{ "bdt", 0, 21600, "Asia/Dacca" },
{ "bdt", 0, 21600, "Asia/Dhaka" },
{ "beat", 0, 9000, "Africa/Mogadishu" },
@@ -303,15 +296,11 @@
{ "bst", 0, -39600, "Pacific/Midway" },
{ "bst", 0, -39600, "Pacific/Pago_Pago" },
{ "bst", 0, -39600, "Pacific/Samoa" },
- { "bst", 0, -39600, "US/Aleutian" },
- { "bst", 0, -39600, "US/Samoa" },
{ "bst", 0, 3600, "Europe/Belfast" },
{ "bst", 0, 3600, "Europe/Guernsey" },
{ "bst", 0, 3600, "Europe/Isle_of_Man" },
{ "bst", 0, 3600, "Europe/Jersey" },
{ "bst", 0, 3600, "GB" },
- { "bst", 0, 3600, "GB-Eire" },
- { "bst", 1, 3600, "Eire" },
{ "bst", 1, 3600, "Europe/Belfast" },
{ "bst", 1, 3600, "Europe/Dublin" },
{ "bst", 1, 3600, "Europe/Gibraltar" },
@@ -319,7 +308,6 @@
{ "bst", 1, 3600, "Europe/Isle_of_Man" },
{ "bst", 1, 3600, "Europe/Jersey" },
{ "bst", 1, 3600, "GB" },
- { "bst", 1, 3600, "GB-Eire" },
{ "btt", 0, 21600, "Asia/Thimbu" },
{ "btt", 0, 21600, "Asia/Thimphu" },
{ "burt", 0, 23400, "Asia/Kolkata" },
@@ -329,13 +317,11 @@
{ "burt", 0, 23400, "Asia/Rangoon" },
{ "cant", 0, -3600, "Atlantic/Canary" },
{ "capt", 1, -32400, "America/Anchorage" },
- { "capt", 1, -32400, "US/Alaska" },
{ "cast", 0, 34200, "Australia/Adelaide" },
{ "cast", 1, 10800, "Africa/Gaborone" },
{ "cast", 1, 10800, "Africa/Khartoum" },
{ "cast", 0, 39600, "Antarctica/Casey" },
{ "cat", 0, -36000, "America/Anchorage" },
- { "cat", 0, -36000, "US/Alaska" },
{ "cat", 0, 7200, "Africa/Khartoum" },
{ "cat", 0, 7200, "Africa/Blantyre" },
{ "cat", 0, 7200, "Africa/Bujumbura" },
@@ -347,15 +333,14 @@
{ "cat", 0, 7200, "Africa/Maputo" },
{ "cat", 0, 7200, "Africa/Windhoek" },
{ "cawt", 1, -32400, "America/Anchorage" },
- { "cawt", 1, -32400, "US/Alaska" },
{ "cct", 0, 23400, "Indian/Cocos" },
{ "cddt", 1, -14400, "America/Rankin_Inlet" },
{ "cddt", 1, -14400, "America/Resolute" },
{ "cdt", 1, -18000, "America/Chicago" },
{ "cdt", 1, -14400, "America/Havana" },
- { "cdt", 1, -14400, "Cuba" },
{ "cdt", 0, -18000, "America/Resolute" },
{ "cdt", 1, -18000, "America/Atikokan" },
+ { "cdt", 1, -18000, "America/Bahia_Banderas" },
{ "cdt", 1, -18000, "America/Belize" },
{ "cdt", 1, -18000, "America/Cambridge_Bay" },
{ "cdt", 1, -18000, "America/Cancun" },
@@ -395,11 +380,7 @@
{ "cdt", 1, -18000, "America/Tegucigalpa" },
{ "cdt", 1, -18000, "America/Winnipeg" },
{ "cdt", 1, -18000, "Canada/Central" },
- { "cdt", 1, -18000, "CST6CDT" },
{ "cdt", 1, -18000, "Mexico/General" },
- { "cdt", 1, -18000, "US/Central" },
- { "cdt", 1, -18000, "US/East-Indiana" },
- { "cdt", 1, -18000, "US/Indiana-Starke" },
{ "cdt", 1, 32400, "Asia/Shanghai" },
{ "cdt", 1, 32400, "Asia/Chongqing" },
{ "cdt", 1, 32400, "Asia/Chungking" },
@@ -463,9 +444,6 @@
{ "cest", 1, 7200, "Europe/Zagreb" },
{ "cest", 1, 7200, "Europe/Zaporozhye" },
{ "cest", 1, 7200, "Europe/Zurich" },
- { "cest", 1, 7200, "Libya" },
- { "cest", 1, 7200, "Poland" },
- { "cest", 1, 7200, "Portugal" },
{ "cest", 1, 7200, "WET" },
{ "cet", 0, 3600, "Europe/Berlin" },
{ "cet", 0, 3600, "Africa/Algiers" },
@@ -519,30 +497,27 @@
{ "cet", 0, 3600, "Europe/Zagreb" },
{ "cet", 0, 3600, "Europe/Zaporozhye" },
{ "cet", 0, 3600, "Europe/Zurich" },
- { "cet", 0, 3600, "Libya" },
- { "cet", 0, 3600, "Poland" },
- { "cet", 0, 3600, "Portugal" },
{ "cet", 0, 3600, "WET" },
{ "cet", 0, 7200, "Europe/Kaliningrad" },
{ "cgst", 1, -3600, "America/Scoresbysund" },
{ "cgt", 0, -7200, "America/Scoresbysund" },
{ "chadt", 1, 49500, "Pacific/Chatham" },
- { "chadt", 1, 49500, "NZ-CHAT" },
{ "chast", 0, 45900, "Pacific/Chatham" },
- { "chast", 0, 45900, "NZ-CHAT" },
{ "chat", 0, 30600, "Asia/Harbin" },
{ "chat", 0, 32400, "Asia/Harbin" },
{ "chdt", 1, -19800, "America/Belize" },
{ "chost", 1, 36000, "Asia/Choibalsan" },
{ "chot", 0, 28800, "Asia/Choibalsan" },
{ "chot", 0, 32400, "Asia/Choibalsan" },
+ { "chut", 0, 36000, "Pacific/Chuuk" },
+ { "chut", 0, 36000, "Pacific/Truk" },
+ { "chut", 0, 36000, "Pacific/Yap" },
{ "cit", 0, 28800, "Asia/Dili" },
{ "cit", 0, 28800, "Asia/Makassar" },
{ "cit", 0, 28800, "Asia/Pontianak" },
{ "cit", 0, 28800, "Asia/Ujung_Pandang" },
{ "cjt", 0, 32400, "Asia/Sakhalin" },
{ "cjt", 0, 32400, "Asia/Tokyo" },
- { "cjt", 0, 32400, "Japan" },
{ "ckhst", 1, -34200, "Pacific/Rarotonga" },
{ "ckt", 0, -36000, "Pacific/Rarotonga" },
{ "ckt", 0, -37800, "Pacific/Rarotonga" },
@@ -604,14 +579,10 @@
{ "cpt", 1, -18000, "America/Rainy_River" },
{ "cpt", 1, -18000, "America/Winnipeg" },
{ "cpt", 1, -18000, "Canada/Central" },
- { "cpt", 1, -18000, "CST6CDT" },
- { "cpt", 1, -18000, "US/Central" },
- { "cpt", 1, -18000, "US/East-Indiana" },
- { "cpt", 1, -18000, "US/Indiana-Starke" },
{ "cst", 0, -21600, "America/Chicago" },
{ "cst", 0, -18000, "America/Havana" },
- { "cst", 0, -18000, "Cuba" },
{ "cst", 0, -21600, "America/Atikokan" },
+ { "cst", 0, -21600, "America/Bahia_Banderas" },
{ "cst", 0, -21600, "America/Belize" },
{ "cst", 0, -21600, "America/Cambridge_Bay" },
{ "cst", 0, -21600, "America/Cancun" },
@@ -659,13 +630,8 @@
{ "cst", 0, -21600, "Canada/Central" },
{ "cst", 0, -21600, "Canada/East-Saskatchewan" },
{ "cst", 0, -21600, "Canada/Saskatchewan" },
- { "cst", 0, -21600, "CST6CDT" },
{ "cst", 0, -21600, "Mexico/BajaSur" },
{ "cst", 0, -21600, "Mexico/General" },
- { "cst", 0, -21600, "US/Central" },
- { "cst", 0, -21600, "US/East-Indiana" },
- { "cst", 0, -21600, "US/Indiana-Starke" },
- { "cst", 0, -21600, "US/Michigan" },
{ "cst", 0, 28800, "Asia/Chongqing" },
{ "cst", 0, 28800, "Asia/Chungking" },
{ "cst", 0, 28800, "Asia/Harbin" },
@@ -718,11 +684,7 @@
{ "cwt", 1, -18000, "America/Rainy_River" },
{ "cwt", 1, -18000, "America/Winnipeg" },
{ "cwt", 1, -18000, "Canada/Central" },
- { "cwt", 1, -18000, "CST6CDT" },
{ "cwt", 1, -18000, "Mexico/General" },
- { "cwt", 1, -18000, "US/Central" },
- { "cwt", 1, -18000, "US/East-Indiana" },
- { "cwt", 1, -18000, "US/Indiana-Starke" },
{ "cxt", 0, 25200, "Indian/Christmas" },
{ "chst", 0, 36000, "Pacific/Guam" },
{ "chst", 0, 36000, "Pacific/Saipan" },
@@ -731,7 +693,6 @@
{ "davt", 0, 18000, "Antarctica/Davis" },
{ "davt", 0, 25200, "Antarctica/Davis" },
{ "ddut", 0, 36000, "Antarctica/DumontDUrville" },
- { "dmt", 0, -1521, "Eire" },
{ "dmt", 0, -1521, "Europe/Dublin" },
{ "dusst", 1, 21600, "Asia/Dushanbe" },
{ "dusst", 1, 25200, "Asia/Dushanbe" },
@@ -789,11 +750,6 @@
{ "edt", 1, -14400, "America/Toronto" },
{ "edt", 1, -14400, "Canada/Eastern" },
{ "edt", 1, -14400, "EST" },
- { "edt", 1, -14400, "EST5EDT" },
- { "edt", 1, -14400, "Jamaica" },
- { "edt", 1, -14400, "US/East-Indiana" },
- { "edt", 1, -14400, "US/Eastern" },
- { "edt", 1, -14400, "US/Michigan" },
{ "eest", 1, 10800, "Europe/Helsinki" },
{ "eest", 1, 10800, "Africa/Cairo" },
{ "eest", 1, 10800, "Asia/Amman" },
@@ -803,7 +759,6 @@
{ "eest", 1, 10800, "Asia/Istanbul" },
{ "eest", 1, 10800, "Asia/Nicosia" },
{ "eest", 1, 10800, "EET" },
- { "eest", 1, 10800, "Egypt" },
{ "eest", 1, 10800, "Europe/Athens" },
{ "eest", 1, 10800, "Europe/Bucharest" },
{ "eest", 1, 10800, "Europe/Chisinau" },
@@ -823,9 +778,6 @@
{ "eest", 1, 10800, "Europe/Vilnius" },
{ "eest", 1, 10800, "Europe/Warsaw" },
{ "eest", 1, 10800, "Europe/Zaporozhye" },
- { "eest", 1, 10800, "Poland" },
- { "eest", 1, 10800, "Turkey" },
- { "eest", 1, 10800, "W-SU" },
{ "eet", 0, 7200, "Europe/Helsinki" },
{ "eet", 1, 10800, "Asia/Gaza" },
{ "eet", 0, 7200, "Africa/Cairo" },
@@ -837,7 +789,6 @@
{ "eet", 0, 7200, "Asia/Istanbul" },
{ "eet", 0, 7200, "Asia/Nicosia" },
{ "eet", 0, 7200, "EET" },
- { "eet", 0, 7200, "Egypt" },
{ "eet", 0, 7200, "Europe/Athens" },
{ "eet", 0, 7200, "Europe/Bucharest" },
{ "eet", 0, 7200, "Europe/Chisinau" },
@@ -857,10 +808,6 @@
{ "eet", 0, 7200, "Europe/Vilnius" },
{ "eet", 0, 7200, "Europe/Warsaw" },
{ "eet", 0, 7200, "Europe/Zaporozhye" },
- { "eet", 0, 7200, "Libya" },
- { "eet", 0, 7200, "Poland" },
- { "eet", 0, 7200, "Turkey" },
- { "eet", 0, 7200, "W-SU" },
{ "egst", 1, 0, "America/Scoresbysund" },
{ "egt", 0, -3600, "America/Scoresbysund" },
{ "ehdt", 1, -16200, "America/Santo_Domingo" },
@@ -876,9 +823,6 @@
{ "ept", 1, -14400, "America/Toronto" },
{ "ept", 1, -14400, "Canada/Eastern" },
{ "ept", 1, -14400, "EST" },
- { "ept", 1, -14400, "EST5EDT" },
- { "ept", 1, -14400, "US/Eastern" },
- { "ept", 1, -14400, "US/Michigan" },
{ "est", 0, -18000, "America/New_York" },
{ "est", 0, -18000, "America/Antigua" },
{ "est", 0, -18000, "America/Atikokan" },
@@ -922,13 +866,7 @@
{ "est", 0, -18000, "America/Toronto" },
{ "est", 0, -18000, "Canada/Eastern" },
{ "est", 0, -18000, "EST" },
- { "est", 0, -18000, "EST5EDT" },
- { "est", 0, -18000, "Jamaica" },
- { "est", 0, -18000, "US/Central" },
- { "est", 0, -18000, "US/East-Indiana" },
- { "est", 0, -18000, "US/Eastern" },
- { "est", 0, -18000, "US/Indiana-Starke" },
- { "est", 0, -18000, "US/Michigan" },
+ { "est", 0, 36000, "Antarctica/Macquarie" },
{ "est", 0, 36000, "Australia/ACT" },
{ "est", 0, 36000, "Australia/Brisbane" },
{ "est", 0, 36000, "Australia/Canberra" },
@@ -944,6 +882,7 @@
{ "est", 0, 36000, "Australia/Tasmania" },
{ "est", 0, 36000, "Australia/Victoria" },
{ "est", 1, 39600, "Australia/Melbourne" },
+ { "est", 1, 39600, "Antarctica/Macquarie" },
{ "est", 1, 39600, "Australia/ACT" },
{ "est", 1, 39600, "Australia/Brisbane" },
{ "est", 1, 39600, "Australia/Canberra" },
@@ -964,9 +903,6 @@
{ "ewt", 1, -14400, "America/Toronto" },
{ "ewt", 1, -14400, "Canada/Eastern" },
{ "ewt", 1, -14400, "EST" },
- { "ewt", 1, -14400, "EST5EDT" },
- { "ewt", 1, -14400, "US/Eastern" },
- { "ewt", 1, -14400, "US/Michigan" },
{ "ffmt", 0, -14660, "America/Martinique" },
{ "fjst", 1, 46800, "Pacific/Fiji" },
{ "fjt", 0, 43200, "Pacific/Fiji" },
@@ -997,32 +933,6 @@
{ "gft", 0, -14400, "America/Cayenne" },
{ "ghst", 1, 1200, "Africa/Accra" },
{ "gilt", 0, 43200, "Pacific/Tarawa" },
- { "gmt+10", 0, -36000, "Etc/GMT+10" },
- { "gmt+11", 0, -39600, "Etc/GMT+11" },
- { "gmt+12", 0, -43200, "Etc/GMT+12" },
- { "gmt+1", 0, -3600, "Etc/GMT+1" },
- { "gmt+2", 0, -7200, "Etc/GMT+2" },
- { "gmt+3", 0, -10800, "Etc/GMT+3" },
- { "gmt+4", 0, -14400, "Etc/GMT+4" },
- { "gmt+5", 0, -18000, "Etc/GMT+5" },
- { "gmt+6", 0, -21600, "Etc/GMT+6" },
- { "gmt+7", 0, -25200, "Etc/GMT+7" },
- { "gmt+8", 0, -28800, "Etc/GMT+8" },
- { "gmt+9", 0, -32400, "Etc/GMT+9" },
- { "gmt-10", 0, 36000, "Etc/GMT-10" },
- { "gmt-11", 0, 39600, "Etc/GMT-11" },
- { "gmt-12", 0, 43200, "Etc/GMT-12" },
- { "gmt-13", 0, 46800, "Etc/GMT-13" },
- { "gmt-14", 0, 50400, "Etc/GMT-14" },
- { "gmt-1", 0, 3600, "Etc/GMT-1" },
- { "gmt-2", 0, 7200, "Etc/GMT-2" },
- { "gmt-3", 0, 10800, "Etc/GMT-3" },
- { "gmt-4", 0, 14400, "Etc/GMT-4" },
- { "gmt-5", 0, 18000, "Etc/GMT-5" },
- { "gmt-6", 0, 21600, "Etc/GMT-6" },
- { "gmt-7", 0, 25200, "Etc/GMT-7" },
- { "gmt-8", 0, 28800, "Etc/GMT-8" },
- { "gmt-9", 0, 32400, "Etc/GMT-9" },
{ "gmt", 0, 0, "Africa/Abidjan" },
{ "gmt", 0, 0, "Africa/Accra" },
{ "gmt", 0, 0, "Africa/Bamako" },
@@ -1043,11 +953,7 @@
{ "gmt", 0, 0, "America/Danmarkshavn" },
{ "gmt", 0, 0, "Atlantic/Reykjavik" },
{ "gmt", 0, 0, "Atlantic/St_Helena" },
- { "gmt", 0, 0, "Eire" },
{ "gmt", 0, 0, "Etc/GMT" },
- { "gmt", 0, 0, "Etc/GMT+0" },
- { "gmt", 0, 0, "Etc/GMT-0" },
- { "gmt", 0, 0, "Etc/GMT0" },
{ "gmt", 0, 0, "Etc/Greenwich" },
{ "gmt", 0, 0, "Europe/Belfast" },
{ "gmt", 0, 0, "Europe/Dublin" },
@@ -1057,12 +963,6 @@
{ "gmt", 0, 0, "Europe/Jersey" },
{ "gmt", 0, 0, "Europe/London" },
{ "gmt", 0, 0, "GB" },
- { "gmt", 0, 0, "GB-Eire" },
- { "gmt", 0, 0, "GMT+0" },
- { "gmt", 0, 0, "GMT-0" },
- { "gmt", 0, 0, "GMT0" },
- { "gmt", 0, 0, "Greenwich" },
- { "gmt", 0, 0, "Iceland" },
{ "gst", 0, 14400, "Asia/Dubai" },
{ "gst", 0, -7200, "Atlantic/South_Georgia" },
{ "gst", 0, 14400, "Asia/Bahrain" },
@@ -1074,19 +974,13 @@
{ "gyt", 0, -14400, "America/Guyana" },
{ "hadt", 1, -32400, "America/Adak" },
{ "hadt", 1, -32400, "America/Atka" },
- { "hadt", 1, -32400, "US/Aleutian" },
{ "hast", 0, -36000, "America/Adak" },
{ "hast", 0, -36000, "America/Atka" },
- { "hast", 0, -36000, "US/Aleutian" },
{ "hdt", 1, -34200, "Pacific/Honolulu" },
{ "hdt", 1, -34200, "HST" },
- { "hdt", 1, -34200, "US/Hawaii" },
{ "hkst", 1, 32400, "Asia/Hong_Kong" },
- { "hkst", 1, 32400, "Hongkong" },
{ "hkt", 0, 28800, "Asia/Hong_Kong" },
- { "hkt", 0, 28800, "Hongkong" },
{ "hmt", 0, -19776, "America/Havana" },
- { "hmt", 0, -19776, "Cuba" },
{ "hmt", 0, -6872, "Atlantic/Azores" },
{ "hmt", 0, 21200, "Asia/Calcutta" },
{ "hmt", 0, 21200, "Asia/Dacca" },
@@ -1100,17 +994,13 @@
{ "hovt", 0, 25200, "Asia/Hovd" },
{ "hpt", 1, -34200, "Pacific/Honolulu" },
{ "hpt", 1, -34200, "HST" },
- { "hpt", 1, -34200, "US/Hawaii" },
{ "hst", 0, -36000, "Pacific/Honolulu" },
{ "hst", 0, -37800, "Pacific/Honolulu" },
{ "hst", 0, -36000, "HST" },
{ "hst", 0, -36000, "Pacific/Johnston" },
- { "hst", 0, -36000, "US/Hawaii" },
{ "hst", 0, -37800, "HST" },
- { "hst", 0, -37800, "US/Hawaii" },
{ "hwt", 1, -34200, "Pacific/Honolulu" },
{ "hwt", 1, -34200, "HST" },
- { "hwt", 1, -34200, "US/Hawaii" },
{ "ict", 0, 25200, "Asia/Bangkok" },
{ "ict", 0, 25200, "Asia/Ho_Chi_Minh" },
{ "ict", 0, 25200, "Asia/Phnom_Penh" },
@@ -1122,35 +1012,26 @@
{ "ict", 0, 28800, "Asia/Vientiane" },
{ "iddt", 1, 14400, "Asia/Jerusalem" },
{ "iddt", 1, 14400, "Asia/Tel_Aviv" },
- { "iddt", 1, 14400, "Israel" },
{ "idt", 1, 10800, "Asia/Jerusalem" },
{ "idt", 1, 10800, "Asia/Gaza" },
{ "idt", 1, 10800, "Asia/Tel_Aviv" },
- { "idt", 1, 10800, "Israel" },
{ "ihst", 1, 21600, "Asia/Colombo" },
{ "imt", 0, 25040, "Asia/Irkutsk" },
{ "imt", 0, 7016, "Asia/Istanbul" },
{ "imt", 0, 7016, "Europe/Istanbul" },
- { "imt", 0, 7016, "Turkey" },
{ "iot", 0, 18000, "Indian/Chagos" },
{ "iot", 0, 21600, "Indian/Chagos" },
{ "irdt", 1, 16200, "Asia/Tehran" },
{ "irdt", 1, 18000, "Asia/Tehran" },
- { "irdt", 1, 16200, "Iran" },
- { "irdt", 1, 18000, "Iran" },
{ "irkst", 1, 28800, "Asia/Irkutsk" },
{ "irkst", 1, 32400, "Asia/Irkutsk" },
{ "irkt", 0, 25200, "Asia/Irkutsk" },
{ "irkt", 0, 28800, "Asia/Irkutsk" },
{ "irst", 0, 12600, "Asia/Tehran" },
{ "irst", 0, 14400, "Asia/Tehran" },
- { "irst", 0, 12600, "Iran" },
- { "irst", 0, 14400, "Iran" },
{ "isst", 1, 0, "Atlantic/Reykjavik" },
- { "isst", 1, 0, "Iceland" },
{ "ist", 0, 7200, "Asia/Jerusalem" },
{ "ist", 0, -3600, "Atlantic/Reykjavik" },
- { "ist", 0, -3600, "Iceland" },
{ "ist", 0, 19800, "Asia/Calcutta" },
{ "ist", 0, 19800, "Asia/Colombo" },
{ "ist", 0, 19800, "Asia/Dacca" },
@@ -1161,27 +1042,21 @@
{ "ist", 0, 19800, "Asia/Kolkata" },
{ "ist", 0, 19800, "Asia/Thimbu" },
{ "ist", 0, 19800, "Asia/Thimphu" },
- { "ist", 1, 2079, "Eire" },
{ "ist", 1, 2079, "Europe/Dublin" },
{ "ist", 1, 23400, "Asia/Calcutta" },
{ "ist", 1, 23400, "Asia/Colombo" },
{ "ist", 1, 23400, "Asia/Karachi" },
{ "ist", 1, 23400, "Asia/Kolkata" },
- { "ist", 0, 3600, "Eire" },
{ "ist", 0, 3600, "Europe/Dublin" },
- { "ist", 1, 3600, "Eire" },
{ "ist", 1, 3600, "Europe/Dublin" },
{ "ist", 0, 7200, "Asia/Gaza" },
{ "ist", 0, 7200, "Asia/Tel_Aviv" },
- { "ist", 0, 7200, "Israel" },
{ "javt", 0, 26400, "Asia/Jakarta" },
{ "jdt", 1, 36000, "Asia/Tokyo" },
- { "jdt", 1, 36000, "Japan" },
{ "jmt", 0, -1368, "Atlantic/St_Helena" },
{ "jmt", 0, 25632, "Asia/Jakarta" },
{ "jmt", 0, 8440, "Asia/Jerusalem" },
{ "jmt", 0, 8440, "Asia/Tel_Aviv" },
- { "jmt", 0, 8440, "Israel" },
{ "jst", 0, 32400, "Asia/Tokyo" },
{ "jst", 0, 32400, "Asia/Dili" },
{ "jst", 0, 32400, "Asia/Hong_Kong" },
@@ -1195,10 +1070,7 @@
{ "jst", 0, 32400, "Asia/Sakhalin" },
{ "jst", 0, 32400, "Asia/Singapore" },
{ "jst", 0, 32400, "Asia/Ujung_Pandang" },
- { "jst", 0, 32400, "Hongkong" },
- { "jst", 0, 32400, "Japan" },
{ "jst", 0, 32400, "Pacific/Nauru" },
- { "jst", 0, 32400, "Singapore" },
{ "kart", 0, 18000, "Asia/Karachi" },
{ "kast", 0, 18000, "Asia/Kashgar" },
{ "kast", 0, 19800, "Asia/Kashgar" },
@@ -1218,7 +1090,6 @@
{ "kmt", 0, -18432, "America/Cayman" },
{ "kmt", 0, -18432, "America/Grand_Turk" },
{ "kmt", 0, -18432, "America/Jamaica" },
- { "kmt", 0, -18432, "Jamaica" },
{ "kmt", 0, 7324, "Europe/Kiev" },
{ "kost", 0, 39600, "Pacific/Kosrae" },
{ "kost", 0, 43200, "Pacific/Kosrae" },
@@ -1245,7 +1116,6 @@
{ "kuyt", 0, 10800, "Europe/Samara" },
{ "kuyt", 0, 14400, "Europe/Samara" },
{ "kwat", 0, -43200, "Pacific/Kwajalein" },
- { "kwat", 0, -43200, "Kwajalein" },
{ "lhst", 0, 37800, "Australia/Lord_Howe" },
{ "lhst", 1, 39600, "Australia/Lord_Howe" },
{ "lhst", 1, 41400, "Australia/Lord_Howe" },
@@ -1306,7 +1176,6 @@
{ "lmt", 0, -1920, "Africa/Bamako" },
{ "lmt", 0, -1920, "Africa/Timbuktu" },
{ "lmt", 0, -19931, "America/Detroit" },
- { "lmt", 0, -19931, "US/Michigan" },
{ "lmt", 0, -20824, "America/Cancun" },
{ "lmt", 0, -20932, "America/Tegucigalpa" },
{ "lmt", 0, -21168, "America/Belize" },
@@ -1316,7 +1185,6 @@
{ "lmt", 0, -21724, "America/Guatemala" },
{ "lmt", 0, -2192, "Africa/Sao_Tome" },
{ "lmt", 0, -2192, "Europe/Lisbon" },
- { "lmt", 0, -2192, "Portugal" },
{ "lmt", 0, -23796, "America/Mexico_City" },
{ "lmt", 0, -23796, "Mexico/General" },
{ "lmt", 0, -24000, "America/Matamoros" },
@@ -1325,6 +1193,7 @@
{ "lmt", 0, -25116, "America/Regina" },
{ "lmt", 0, -25116, "Canada/East-Saskatchewan" },
{ "lmt", 0, -25116, "Canada/Saskatchewan" },
+ { "lmt", 0, -25260, "America/Bahia_Banderas" },
{ "lmt", 0, -25460, "America/Chihuahua" },
{ "lmt", 0, -25540, "America/Mazatlan" },
{ "lmt", 0, -25540, "Mexico/BajaSur" },
@@ -1348,7 +1217,6 @@
{ "lmt", 0, -3996, "Africa/Banjul" },
{ "lmt", 0, -40968, "Pacific/Pago_Pago" },
{ "lmt", 0, -40968, "Pacific/Samoa" },
- { "lmt", 0, -40968, "US/Samoa" },
{ "lmt", 0, -41216, "Pacific/Apia" },
{ "lmt", 0, -4184, "Africa/Dakar" },
{ "lmt", 0, -4480, "America/Danmarkshavn" },
@@ -1377,7 +1245,6 @@
{ "lmt", 0, 12140, "Asia/Bahrain" },
{ "lmt", 0, 12324, "Asia/Oral" },
{ "lmt", 0, 12344, "Asia/Tehran" },
- { "lmt", 0, 12344, "Iran" },
{ "lmt", 0, 12368, "Asia/Qatar" },
{ "lmt", 0, 13272, "Asia/Dubai" },
{ "lmt", 0, 13308, "Indian/Mahe" },
@@ -1423,7 +1290,6 @@
{ "lmt", 0, 27260, "Asia/Macao" },
{ "lmt", 0, 27260, "Asia/Macau" },
{ "lmt", 0, 27396, "Asia/Hong_Kong" },
- { "lmt", 0, 27396, "Hongkong" },
{ "lmt", 0, 27480, "Asia/Choibalsan" },
{ "lmt", 0, 27580, "Asia/Brunei" },
{ "lmt", 0, 28656, "Asia/Makassar" },
@@ -1434,7 +1300,6 @@
{ "lmt", 0, 30404, "Asia/Harbin" },
{ "lmt", 0, 31120, "Asia/Yakutsk" },
{ "lmt", 0, 3164, "Africa/Tripoli" },
- { "lmt", 0, 3164, "Libya" },
{ "lmt", 0, 31664, "Asia/Vladivostok" },
{ "lmt", 0, 33768, "Asia/Jayapura" },
{ "lmt", 0, 34248, "Asia/Sakhalin" },
@@ -1448,7 +1313,6 @@
{ "lmt", 0, 40396, "Pacific/Efate" },
{ "lmt", 0, 42596, "Asia/Anadyr" },
{ "lmt", 0, 42820, "Pacific/Fiji" },
- { "lmt", 0, 44028, "NZ-CHAT" },
{ "lmt", 0, 44028, "Pacific/Chatham" },
{ "lmt", 0, 4460, "Africa/Bangui" },
{ "lmt", 0, 4760, "Europe/Tirane" },
@@ -1474,7 +1338,6 @@
{ "lont", 0, 25200, "Asia/Chungking" },
{ "lrt", 0, -2670, "Africa/Monrovia" },
{ "lst", 1, 9384, "Europe/Riga" },
- { "local time zone must be set--see zic manual page", 0, 0, "Factory" },
{ "madmt", 1, 3600, "Atlantic/Madeira" },
{ "madst", 1, 0, "Atlantic/Madeira" },
{ "madt", 0, -3600, "Atlantic/Madeira" },
@@ -1484,24 +1347,20 @@
{ "magt", 0, 39600, "Asia/Magadan" },
{ "malst", 1, 26400, "Asia/Singapore" },
{ "malst", 1, 26400, "Asia/Kuala_Lumpur" },
- { "malst", 1, 26400, "Singapore" },
{ "malt", 0, 25200, "Asia/Singapore" },
{ "malt", 0, 26400, "Asia/Singapore" },
{ "malt", 0, 27000, "Asia/Singapore" },
{ "malt", 0, 25200, "Asia/Kuala_Lumpur" },
- { "malt", 0, 25200, "Singapore" },
{ "malt", 0, 26400, "Asia/Kuala_Lumpur" },
- { "malt", 0, 26400, "Singapore" },
{ "malt", 0, 27000, "Asia/Kuala_Lumpur" },
- { "malt", 0, 27000, "Singapore" },
{ "mart", 0, -34200, "Pacific/Marquesas" },
{ "mawt", 0, 18000, "Antarctica/Mawson" },
{ "mawt", 0, 21600, "Antarctica/Mawson" },
{ "mddt", 1, -18000, "America/Cambridge_Bay" },
{ "mddt", 1, -18000, "America/Yellowknife" },
{ "mdst", 1, 16248, "Europe/Moscow" },
- { "mdst", 1, 16248, "W-SU" },
{ "mdt", 1, -21600, "America/Denver" },
+ { "mdt", 1, -21600, "America/Bahia_Banderas" },
{ "mdt", 1, -21600, "America/Boise" },
{ "mdt", 1, -21600, "America/Cambridge_Bay" },
{ "mdt", 1, -21600, "America/Chihuahua" },
@@ -1522,18 +1381,13 @@
{ "mdt", 1, -21600, "Canada/Saskatchewan" },
{ "mdt", 1, -21600, "Mexico/BajaSur" },
{ "mdt", 1, -21600, "MST" },
- { "mdt", 1, -21600, "MST7MDT" },
- { "mdt", 1, -21600, "Navajo" },
- { "mdt", 1, -21600, "US/Arizona" },
- { "mdt", 1, -21600, "US/Mountain" },
{ "mest", 1, 7200, "MET" },
{ "met", 0, 3600, "MET" },
{ "mht", 0, 39600, "Pacific/Kwajalein" },
{ "mht", 0, 43200, "Pacific/Kwajalein" },
- { "mht", 0, 39600, "Kwajalein" },
{ "mht", 0, 39600, "Pacific/Majuro" },
- { "mht", 0, 43200, "Kwajalein" },
{ "mht", 0, 43200, "Pacific/Majuro" },
+ { "mist", 0, 39600, "Antarctica/Macquarie" },
{ "mmt", 0, 9000, "Europe/Moscow" },
{ "mmt", 0, 9048, "Europe/Moscow" },
{ "mmt", 0, -13484, "America/Montevideo" },
@@ -1545,8 +1399,6 @@
{ "mmt", 0, 28656, "Asia/Makassar" },
{ "mmt", 0, 28656, "Asia/Ujung_Pandang" },
{ "mmt", 0, 6600, "Europe/Minsk" },
- { "mmt", 0, 9000, "W-SU" },
- { "mmt", 0, 9048, "W-SU" },
{ "most", 1, 32400, "Asia/Macao" },
{ "most", 1, 32400, "Asia/Macau" },
{ "mot", 0, 28800, "Asia/Macao" },
@@ -1565,9 +1417,6 @@
{ "mpt", 1, -21600, "Canada/Mountain" },
{ "mpt", 1, -21600, "Canada/Saskatchewan" },
{ "mpt", 1, -21600, "MST" },
- { "mpt", 1, -21600, "MST7MDT" },
- { "mpt", 1, -21600, "Navajo" },
- { "mpt", 1, -21600, "US/Mountain" },
{ "mpt", 0, 32400, "Pacific/Saipan" },
{ "mpt", 0, 36000, "Pacific/Saipan" },
{ "msd", 1, 14400, "Europe/Moscow" },
@@ -1583,8 +1432,6 @@
{ "msd", 1, 14400, "Europe/Uzhgorod" },
{ "msd", 1, 14400, "Europe/Vilnius" },
{ "msd", 1, 14400, "Europe/Zaporozhye" },
- { "msd", 1, 14400, "W-SU" },
- { "msd", 1, 18000, "W-SU" },
{ "msk", 0, 10800, "Europe/Moscow" },
{ "msk", 0, 10800, "Europe/Chisinau" },
{ "msk", 0, 10800, "Europe/Kaliningrad" },
@@ -1597,8 +1444,8 @@
{ "msk", 0, 10800, "Europe/Uzhgorod" },
{ "msk", 0, 10800, "Europe/Vilnius" },
{ "msk", 0, 10800, "Europe/Zaporozhye" },
- { "msk", 0, 10800, "W-SU" },
{ "mst", 0, -25200, "America/Denver" },
+ { "mst", 0, -25200, "America/Bahia_Banderas" },
{ "mst", 0, -25200, "America/Boise" },
{ "mst", 0, -25200, "America/Cambridge_Bay" },
{ "mst", 0, -25200, "America/Chihuahua" },
@@ -1626,12 +1473,7 @@
{ "mst", 0, -25200, "Mexico/BajaSur" },
{ "mst", 0, -25200, "Mexico/General" },
{ "mst", 0, -25200, "MST" },
- { "mst", 0, -25200, "MST7MDT" },
- { "mst", 0, -25200, "Navajo" },
- { "mst", 0, -25200, "US/Arizona" },
- { "mst", 0, -25200, "US/Mountain" },
{ "mst", 1, 12648, "Europe/Moscow" },
- { "mst", 1, 12648, "W-SU" },
{ "must", 1, 18000, "Indian/Mauritius" },
{ "mut", 0, 14400, "Indian/Mauritius" },
{ "mvt", 0, 18000, "Indian/Maldives" },
@@ -1650,10 +1492,6 @@
{ "mwt", 1, -21600, "Canada/Mountain" },
{ "mwt", 1, -21600, "Canada/Saskatchewan" },
{ "mwt", 1, -21600, "MST" },
- { "mwt", 1, -21600, "MST7MDT" },
- { "mwt", 1, -21600, "Navajo" },
- { "mwt", 1, -21600, "US/Arizona" },
- { "mwt", 1, -21600, "US/Mountain" },
{ "myt", 0, 28800, "Asia/Kuala_Lumpur" },
{ "myt", 0, 28800, "Asia/Kuching" },
{ "ncst", 1, 43200, "Pacific/Noumea" },
@@ -1683,7 +1521,6 @@
{ "npt", 1, -36000, "America/Adak" },
{ "npt", 1, -36000, "America/Atka" },
{ "npt", 1, -36000, "America/Nome" },
- { "npt", 1, -36000, "US/Aleutian" },
{ "npt", 1, -9000, "America/Goose_Bay" },
{ "npt", 1, -9000, "Canada/Newfoundland" },
{ "npt", 0, 20700, "Asia/Katmandu" },
@@ -1702,8 +1539,6 @@
{ "nst", 0, -39600, "Pacific/Midway" },
{ "nst", 0, -39600, "Pacific/Pago_Pago" },
{ "nst", 0, -39600, "Pacific/Samoa" },
- { "nst", 0, -39600, "US/Aleutian" },
- { "nst", 0, -39600, "US/Samoa" },
{ "nst", 1, 4772, "Europe/Amsterdam" },
{ "nut", 0, -39600, "Pacific/Niue" },
{ "nut", 0, -40800, "Pacific/Niue" },
@@ -1712,7 +1547,6 @@
{ "nwt", 1, -36000, "America/Adak" },
{ "nwt", 1, -36000, "America/Atka" },
{ "nwt", 1, -36000, "America/Nome" },
- { "nwt", 1, -36000, "US/Aleutian" },
{ "nwt", 1, -9000, "America/Goose_Bay" },
{ "nwt", 1, -9000, "Canada/Newfoundland" },
{ "nzdt", 1, 46800, "Pacific/Auckland" },
@@ -1750,9 +1584,6 @@
{ "pdt", 1, -25200, "Canada/Pacific" },
{ "pdt", 1, -25200, "Canada/Yukon" },
{ "pdt", 1, -25200, "Mexico/BajaNorte" },
- { "pdt", 1, -25200, "PST8PDT" },
- { "pdt", 1, -25200, "US/Pacific" },
- { "pdt", 1, -25200, "US/Pacific-New" },
{ "pest", 1, -14400, "America/Lima" },
{ "petst", 1, 43200, "Asia/Kamchatka" },
{ "petst", 1, 46800, "Asia/Kamchatka" },
@@ -1779,6 +1610,7 @@
{ "pmt", 0, 561, "Europe/Paris" },
{ "pmt", 0, 561, "WET" },
{ "pnt", 0, -30600, "Pacific/Pitcairn" },
+ { "pont", 0, 39600, "Pacific/Pohnpei" },
{ "pont", 0, 39600, "Pacific/Ponape" },
{ "ppmt", 0, -17340, "America/Port-au-Prince" },
{ "ppt", 1, -25200, "America/Los_Angeles" },
@@ -1790,10 +1622,8 @@
{ "ppt", 1, -25200, "America/Vancouver" },
{ "ppt", 1, -25200, "Canada/Pacific" },
{ "ppt", 1, -25200, "Mexico/BajaNorte" },
- { "ppt", 1, -25200, "PST8PDT" },
- { "ppt", 1, -25200, "US/Pacific" },
- { "ppt", 1, -25200, "US/Pacific-New" },
{ "pst", 0, -28800, "America/Los_Angeles" },
+ { "pst", 0, -28800, "America/Bahia_Banderas" },
{ "pst", 0, -28800, "America/Boise" },
{ "pst", 0, -28800, "America/Dawson" },
{ "pst", 0, -28800, "America/Dawson_Creek" },
@@ -1811,9 +1641,6 @@
{ "pst", 0, -28800, "Mexico/BajaNorte" },
{ "pst", 0, -28800, "Mexico/BajaSur" },
{ "pst", 0, -28800, "Pacific/Pitcairn" },
- { "pst", 0, -28800, "PST8PDT" },
- { "pst", 0, -28800, "US/Pacific" },
- { "pst", 0, -28800, "US/Pacific-New" },
{ "pwt", 1, -25200, "America/Los_Angeles" },
{ "pwt", 1, -25200, "America/Dawson_Creek" },
{ "pwt", 1, -25200, "America/Ensenada" },
@@ -1823,9 +1650,6 @@
{ "pwt", 1, -25200, "America/Vancouver" },
{ "pwt", 1, -25200, "Canada/Pacific" },
{ "pwt", 1, -25200, "Mexico/BajaNorte" },
- { "pwt", 1, -25200, "PST8PDT" },
- { "pwt", 1, -25200, "US/Pacific" },
- { "pwt", 1, -25200, "US/Pacific-New" },
{ "pwt", 0, 32400, "Pacific/Palau" },
{ "pyst", 1, -10800, "America/Asuncion" },
{ "pyt", 0, -10800, "America/Asuncion" },
@@ -1837,7 +1661,6 @@
{ "ret", 0, 14400, "Indian/Reunion" },
{ "rmt", 0, 5784, "Europe/Riga" },
{ "rmt", 0, -5268, "Atlantic/Reykjavik" },
- { "rmt", 0, -5268, "Iceland" },
{ "rmt", 0, 23076, "Asia/Rangoon" },
{ "rott", 0, -10800, "Antarctica/Rothera" },
{ "sakst", 1, 39600, "Asia/Sakhalin" },
@@ -1845,13 +1668,13 @@
{ "sakt", 0, 36000, "Asia/Sakhalin" },
{ "sakt", 0, 39600, "Asia/Sakhalin" },
{ "samst", 1, 21600, "Asia/Samarkand" },
+ { "samst", 1, 14400, "Europe/Samara" },
{ "samst", 1, 18000, "Europe/Samara" },
{ "samt", 0, 14400, "Asia/Samarkand" },
{ "samt", 0, 18000, "Asia/Samarkand" },
{ "samt", 0, -41400, "Pacific/Apia" },
{ "samt", 0, -41400, "Pacific/Pago_Pago" },
{ "samt", 0, -41400, "Pacific/Samoa" },
- { "samt", 0, -41400, "US/Samoa" },
{ "samt", 0, 10800, "Europe/Samara" },
{ "samt", 0, 14400, "Europe/Samara" },
{ "sast", 1, 10800, "Africa/Johannesburg" },
@@ -1867,8 +1690,6 @@
{ "sdmt", 0, -16800, "America/Santo_Domingo" },
{ "sgt", 0, 27000, "Asia/Singapore" },
{ "sgt", 0, 28800, "Asia/Singapore" },
- { "sgt", 0, 27000, "Singapore" },
- { "sgt", 0, 28800, "Singapore" },
{ "shest", 1, 21600, "Asia/Aqtau" },
{ "shet", 0, 18000, "Asia/Aqtau" },
{ "shet", 0, 21600, "Asia/Aqtau" },
@@ -1881,7 +1702,6 @@
{ "smt", 0, -16966, "Chile/Continental" },
{ "smt", 0, 24925, "Asia/Kuala_Lumpur" },
{ "smt", 0, 24925, "Asia/Singapore" },
- { "smt", 0, 24925, "Singapore" },
{ "smt", 0, 25580, "Asia/Ho_Chi_Minh" },
{ "smt", 0, 25580, "Asia/Phnom_Penh" },
{ "smt", 0, 25580, "Asia/Vientiane" },
@@ -1891,7 +1711,6 @@
{ "sst", 0, -39600, "Pacific/Samoa" },
{ "sst", 0, -39600, "Pacific/Midway" },
{ "sst", 0, -39600, "Pacific/Pago_Pago" },
- { "sst", 0, -39600, "US/Samoa" },
{ "stat", 0, 10800, "Europe/Volgograd" },
{ "stat", 0, 14400, "Europe/Volgograd" },
{ "svest", 1, 18000, "Asia/Yekaterinburg" },
@@ -1918,7 +1737,6 @@
{ "tlt", 0, 28800, "Asia/Dili" },
{ "tlt", 0, 32400, "Asia/Dili" },
{ "tmt", 0, 12344, "Asia/Tehran" },
- { "tmt", 0, 12344, "Iran" },
{ "tmt", 0, 14400, "Asia/Ashgabat" },
{ "tmt", 0, 14400, "Asia/Ashkhabad" },
{ "tmt", 0, 18000, "Asia/Ashgabat" },
@@ -1929,12 +1747,8 @@
{ "tot", 0, 46800, "Pacific/Tongatapu" },
{ "trst", 1, 14400, "Europe/Istanbul" },
{ "trst", 1, 14400, "Asia/Istanbul" },
- { "trst", 1, 14400, "Turkey" },
{ "trt", 0, 10800, "Europe/Istanbul" },
{ "trt", 0, 10800, "Asia/Istanbul" },
- { "trt", 0, 10800, "Turkey" },
- { "trut", 0, 36000, "Pacific/Truk" },
- { "trut", 0, 36000, "Pacific/Yap" },
{ "tsat", 0, 10800, "Europe/Volgograd" },
{ "tvt", 0, 43200, "Pacific/Funafuti" },
{ "uct", 0, 0, "Etc/UCT" },
@@ -1957,9 +1771,7 @@
{ "utc", 0, 0, "Etc/UTC" },
{ "utc", 0, 0, "Etc/Zulu" },
{ "utc", 0, 0, "GMT" },
- { "utc", 0, 0, "Universal" },
{ "utc", 0, 0, "UTC" },
- { "utc", 0, 0, "Zulu" },
{ "utc", 0, 0, "UTC" },
{ "uyhst", 1, -10800, "America/Montevideo" },
{ "uyhst", 1, -9000, "America/Montevideo" },
@@ -2036,7 +1848,6 @@
{ "wemt", 1, 7200, "Europe/Madrid" },
{ "wemt", 1, 7200, "Europe/Monaco" },
{ "wemt", 1, 7200, "Europe/Paris" },
- { "wemt", 1, 7200, "Portugal" },
{ "wemt", 1, 7200, "WET" },
{ "west", 1, 3600, "Europe/Paris" },
{ "west", 1, 3600, "Africa/Algiers" },
@@ -2051,7 +1862,6 @@
{ "west", 1, 3600, "Europe/Luxembourg" },
{ "west", 1, 3600, "Europe/Madrid" },
{ "west", 1, 3600, "Europe/Monaco" },
- { "west", 1, 3600, "Portugal" },
{ "west", 1, 3600, "WET" },
{ "west", 1, 7200, "Europe/Luxembourg" },
{ "wet", 0, 0, "Europe/Paris" },
@@ -2070,7 +1880,6 @@
{ "wet", 0, 0, "Europe/Luxembourg" },
{ "wet", 0, 0, "Europe/Madrid" },
{ "wet", 0, 0, "Europe/Monaco" },
- { "wet", 0, 0, "Portugal" },
{ "wet", 0, 0, "WET" },
{ "wet", 0, 3600, "Europe/Luxembourg" },
{ "wft", 0, 43200, "Pacific/Wallis" },
@@ -2086,7 +1895,6 @@
{ "wit", 0, 28800, "Asia/Pontianak" },
{ "wmt", 0, 5040, "Europe/Vilnius" },
{ "wmt", 0, 5040, "Europe/Warsaw" },
- { "wmt", 0, 5040, "Poland" },
{ "wsdt", 1, -36000, "Pacific/Apia" },
{ "wst", 0, 28800, "Australia/Perth" },
{ "wst", 1, 32400, "Australia/Perth" },
@@ -2122,7 +1930,6 @@
{ "yst", 0, -32400, "America/Whitehorse" },
{ "yst", 0, -32400, "America/Yakutat" },
{ "yst", 0, -32400, "Canada/Yukon" },
- { "yst", 0, -32400, "US/Alaska" },
{ "ywt", 1, -28800, "America/Dawson" },
{ "ywt", 1, -28800, "America/Whitehorse" },
{ "ywt", 1, -28800, "America/Yakutat" },
@@ -2161,6 +1968,7 @@
{ "zzz", 0, 0, "America/Yellowknife" },
{ "zzz", 0, 0, "Antarctica/Casey" },
{ "zzz", 0, 0, "Antarctica/DumontDUrville" },
+ { "zzz", 0, 0, "Antarctica/Macquarie" },
{ "zzz", 0, 0, "Antarctica/Mawson" },
{ "zzz", 0, 0, "Antarctica/McMurdo" },
{ "zzz", 0, 0, "Antarctica/Palmer" },
diff --git a/ext/date/tests/010.phpt b/ext/date/tests/010.phpt
index aad5b70128..58b0ce80ab 100644
--- a/ext/date/tests/010.phpt
+++ b/ext/date/tests/010.phpt
@@ -8,7 +8,7 @@ date_default_timezone_set('UTC');
echo "Done\n";
?>
--EXPECTF--
-array(8) {
+array(6) {
[0]=>
array(3) {
["dst"]=>
@@ -52,27 +52,9 @@ array(8) {
["offset"]=>
int(0)
["timezone_id"]=>
- string(9) "Universal"
- }
- [5]=>
- array(3) {
- ["dst"]=>
- bool(false)
- ["offset"]=>
- int(0)
- ["timezone_id"]=>
string(3) "UTC"
}
- [6]=>
- array(3) {
- ["dst"]=>
- bool(false)
- ["offset"]=>
- int(0)
- ["timezone_id"]=>
- string(4) "Zulu"
- }
- [7]=>
+ [5]=>
array(3) {
["dst"]=>
bool(false)
diff --git a/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt b/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt
index 126c4b8327..015c9e8ec6 100644
--- a/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt
+++ b/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt
@@ -23,10 +23,10 @@ var_dump( $abbr["acst"] );
?>
===DONE===
---EXPECT--
+--EXPECTF--
*** Testing DateTimeZone::listAbbreviations() : basic functionality ***
string(5) "array"
-int(399)
+int(%d)
-- Format a sample entry --
array(4) {
diff --git a/ext/date/tests/DateTime_modify_variation1.phpt b/ext/date/tests/DateTime_modify_variation1.phpt
index e4d9067de0..4d27071d04 100644
--- a/ext/date/tests/DateTime_modify_variation1.phpt
+++ b/ext/date/tests/DateTime_modify_variation1.phpt
@@ -112,22 +112,22 @@ fclose( $file_handle );
-- int 0 --
-Warning: DateTime::modify(): Failed to parse time string (0) at position 0 (0): Unexpected character in /home/derick/dev/php/php-src/trunk/ext/date/tests/DateTime_modify_variation1.php on line 99
+Warning: DateTime::modify(): Failed to parse time string (0) at position 0 (0): Unexpected character in %sDateTime_modify_variation1.php on line 99
bool(false)
-- int 1 --
-Warning: DateTime::modify(): Failed to parse time string (1) at position 0 (1): Unexpected character in /home/derick/dev/php/php-src/trunk/ext/date/tests/DateTime_modify_variation1.php on line 99
+Warning: DateTime::modify(): Failed to parse time string (1) at position 0 (1): Unexpected character in %sDateTime_modify_variation1.php on line 99
bool(false)
-- int 12345 --
-Warning: DateTime::modify(): Failed to parse time string (12345) at position 4 (5): Unexpected character in /home/derick/dev/php/php-src/trunk/ext/date/tests/DateTime_modify_variation1.php on line 99
+Warning: DateTime::modify(): Failed to parse time string (12345) at position 4 (5): Unexpected character in %sDateTime_modify_variation1.php on line 99
bool(false)
-- int -12345 --
-Warning: DateTime::modify(): Failed to parse time string (-12345) at position 5 (5): Unexpected character in /home/derick/dev/php/php-src/trunk/ext/date/tests/DateTime_modify_variation1.php on line 99
+Warning: DateTime::modify(): Failed to parse time string (-12345) at position 5 (5): Unexpected character in %sDateTime_modify_variation1.php on line 99
bool(false)
-- float 10.5 --
@@ -142,7 +142,7 @@ object(DateTime)#3 (3) {
-- float -10.5 --
-Warning: DateTime::modify(): Failed to parse time string (-10.5) at position 4 (5): Unexpected character in /home/derick/dev/php/php-src/trunk/ext/date/tests/DateTime_modify_variation1.php on line 99
+Warning: DateTime::modify(): Failed to parse time string (-10.5) at position 4 (5): Unexpected character in %sDateTime_modify_variation1.php on line 99
bool(false)
-- float .5 --
@@ -157,106 +157,106 @@ object(DateTime)#3 (3) {
-- empty array --
-Warning: DateTime::modify() expects parameter 1 to be string, array given in /home/derick/dev/php/php-src/trunk/ext/date/tests/DateTime_modify_variation1.php on line 99
+Warning: DateTime::modify() expects parameter 1 to be string, array given in %sDateTime_modify_variation1.php on line 99
bool(false)
-- int indexed array --
-Warning: DateTime::modify() expects parameter 1 to be string, array given in /home/derick/dev/php/php-src/trunk/ext/date/tests/DateTime_modify_variation1.php on line 99
+Warning: DateTime::modify() expects parameter 1 to be string, array given in %sDateTime_modify_variation1.php on line 99
bool(false)
-- associative array --
-Warning: DateTime::modify() expects parameter 1 to be string, array given in /home/derick/dev/php/php-src/trunk/ext/date/tests/DateTime_modify_variation1.php on line 99
+Warning: DateTime::modify() expects parameter 1 to be string, array given in %sDateTime_modify_variation1.php on line 99
bool(false)
-- nested arrays --
-Warning: DateTime::modify() expects parameter 1 to be string, array given in /home/derick/dev/php/php-src/trunk/ext/date/tests/DateTime_modify_variation1.php on line 99
+Warning: DateTime::modify() expects parameter 1 to be string, array given in %sDateTime_modify_variation1.php on line 99
bool(false)
-- uppercase NULL --
-Warning: DateTime::modify(): Failed to parse time string () at position 0 ( in /home/derick/dev/php/php-src/trunk/ext/date/tests/DateTime_modify_variation1.php on line 99
+Warning: DateTime::modify(): Failed to parse time string () at position 0 ( in %sDateTime_modify_variation1.php on line 99
bool(false)
-- lowercase null --
-Warning: DateTime::modify(): Failed to parse time string () at position 0 ( in /home/derick/dev/php/php-src/trunk/ext/date/tests/DateTime_modify_variation1.php on line 99
+Warning: DateTime::modify(): Failed to parse time string () at position 0 ( in %sDateTime_modify_variation1.php on line 99
bool(false)
-- lowercase true --
-Warning: DateTime::modify(): Failed to parse time string (1) at position 0 (1): Unexpected character in /home/derick/dev/php/php-src/trunk/ext/date/tests/DateTime_modify_variation1.php on line 99
+Warning: DateTime::modify(): Failed to parse time string (1) at position 0 (1): Unexpected character in %sDateTime_modify_variation1.php on line 99
bool(false)
-- lowercase false --
-Warning: DateTime::modify(): Failed to parse time string () at position 0 ( in /home/derick/dev/php/php-src/trunk/ext/date/tests/DateTime_modify_variation1.php on line 99
+Warning: DateTime::modify(): Failed to parse time string () at position 0 ( in %sDateTime_modify_variation1.php on line 99
bool(false)
-- uppercase TRUE --
-Warning: DateTime::modify(): Failed to parse time string (1) at position 0 (1): Unexpected character in /home/derick/dev/php/php-src/trunk/ext/date/tests/DateTime_modify_variation1.php on line 99
+Warning: DateTime::modify(): Failed to parse time string (1) at position 0 (1): Unexpected character in %sDateTime_modify_variation1.php on line 99
bool(false)
-- uppercase FALSE --
-Warning: DateTime::modify(): Failed to parse time string () at position 0 ( in /home/derick/dev/php/php-src/trunk/ext/date/tests/DateTime_modify_variation1.php on line 99
+Warning: DateTime::modify(): Failed to parse time string () at position 0 ( in %sDateTime_modify_variation1.php on line 99
bool(false)
-- empty string DQ --
-Warning: DateTime::modify(): Failed to parse time string () at position 0 ( in /home/derick/dev/php/php-src/trunk/ext/date/tests/DateTime_modify_variation1.php on line 99
+Warning: DateTime::modify(): Failed to parse time string () at position 0 ( in %sDateTime_modify_variation1.php on line 99
bool(false)
-- empty string SQ --
-Warning: DateTime::modify(): Failed to parse time string () at position 0 ( in /home/derick/dev/php/php-src/trunk/ext/date/tests/DateTime_modify_variation1.php on line 99
+Warning: DateTime::modify(): Failed to parse time string () at position 0 ( in %sDateTime_modify_variation1.php on line 99
bool(false)
-- string DQ --
-Warning: DateTime::modify(): Failed to parse time string (string) at position 0 (s): The timezone could not be found in the database in /home/derick/dev/php/php-src/trunk/ext/date/tests/DateTime_modify_variation1.php on line 99
+Warning: DateTime::modify(): Failed to parse time string (string) at position 0 (s): The timezone could not be found in the database in %sDateTime_modify_variation1.php on line 99
bool(false)
-- string SQ --
-Warning: DateTime::modify(): Failed to parse time string (string) at position 0 (s): The timezone could not be found in the database in /home/derick/dev/php/php-src/trunk/ext/date/tests/DateTime_modify_variation1.php on line 99
+Warning: DateTime::modify(): Failed to parse time string (string) at position 0 (s): The timezone could not be found in the database in %sDateTime_modify_variation1.php on line 99
bool(false)
-- mixed case string --
-Warning: DateTime::modify(): Failed to parse time string (sTrInG) at position 0 (s): The timezone could not be found in the database in /home/derick/dev/php/php-src/trunk/ext/date/tests/DateTime_modify_variation1.php on line 99
+Warning: DateTime::modify(): Failed to parse time string (sTrInG) at position 0 (s): The timezone could not be found in the database in %sDateTime_modify_variation1.php on line 99
bool(false)
-- heredoc --
-Warning: DateTime::modify(): Failed to parse time string (hello world) at position 0 (h): The timezone could not be found in the database in /home/derick/dev/php/php-src/trunk/ext/date/tests/DateTime_modify_variation1.php on line 99
+Warning: DateTime::modify(): Failed to parse time string (hello world) at position 0 (h): The timezone could not be found in the database in %sDateTime_modify_variation1.php on line 99
bool(false)
-- instance of classWithToString --
-Warning: DateTime::modify(): Failed to parse time string (Class A object) at position 0 (C): The timezone could not be found in the database in /home/derick/dev/php/php-src/trunk/ext/date/tests/DateTime_modify_variation1.php on line 99
+Warning: DateTime::modify(): Failed to parse time string (Class A object) at position 0 (C): The timezone could not be found in the database in %sDateTime_modify_variation1.php on line 99
bool(false)
-- instance of classWithoutToString --
-Warning: DateTime::modify() expects parameter 1 to be string, object given in /home/derick/dev/php/php-src/trunk/ext/date/tests/DateTime_modify_variation1.php on line 99
+Warning: DateTime::modify() expects parameter 1 to be string, object given in %sDateTime_modify_variation1.php on line 99
bool(false)
-- undefined var --
-Warning: DateTime::modify(): Failed to parse time string () at position 0 ( in /home/derick/dev/php/php-src/trunk/ext/date/tests/DateTime_modify_variation1.php on line 99
+Warning: DateTime::modify(): Failed to parse time string () at position 0 ( in %sDateTime_modify_variation1.php on line 99
bool(false)
-- unset var --
-Warning: DateTime::modify(): Failed to parse time string () at position 0 ( in /home/derick/dev/php/php-src/trunk/ext/date/tests/DateTime_modify_variation1.php on line 99
+Warning: DateTime::modify(): Failed to parse time string () at position 0 ( in %sDateTime_modify_variation1.php on line 99
bool(false)
-- resource --
-Warning: DateTime::modify() expects parameter 1 to be string, resource given in /home/derick/dev/php/php-src/trunk/ext/date/tests/DateTime_modify_variation1.php on line 99
+Warning: DateTime::modify() expects parameter 1 to be string, resource given in %sDateTime_modify_variation1.php on line 99
bool(false)
===DONE===
diff --git a/ext/date/tests/date_modify_variation2.phpt b/ext/date/tests/date_modify_variation2.phpt
index 8dc563e25c..08db14cf89 100644
--- a/ext/date/tests/date_modify_variation2.phpt
+++ b/ext/date/tests/date_modify_variation2.phpt
@@ -112,22 +112,22 @@ fclose( $file_handle );
-- int 0 --
-Warning: date_modify(): Failed to parse time string (0) at position 0 (0): Unexpected character in /home/derick/dev/php/php-src/trunk/ext/date/tests/date_modify_variation2.php on line 99
+Warning: date_modify(): Failed to parse time string (0) at position 0 (0): Unexpected character in %sdate_modify_variation2.php on line 99
bool(false)
-- int 1 --
-Warning: date_modify(): Failed to parse time string (1) at position 0 (1): Unexpected character in /home/derick/dev/php/php-src/trunk/ext/date/tests/date_modify_variation2.php on line 99
+Warning: date_modify(): Failed to parse time string (1) at position 0 (1): Unexpected character in %sdate_modify_variation2.php on line 99
bool(false)
-- int 12345 --
-Warning: date_modify(): Failed to parse time string (12345) at position 4 (5): Unexpected character in /home/derick/dev/php/php-src/trunk/ext/date/tests/date_modify_variation2.php on line 99
+Warning: date_modify(): Failed to parse time string (12345) at position 4 (5): Unexpected character in %sdate_modify_variation2.php on line 99
bool(false)
-- int -12345 --
-Warning: date_modify(): Failed to parse time string (-12345) at position 5 (5): Unexpected character in /home/derick/dev/php/php-src/trunk/ext/date/tests/date_modify_variation2.php on line 99
+Warning: date_modify(): Failed to parse time string (-12345) at position 5 (5): Unexpected character in %sdate_modify_variation2.php on line 99
bool(false)
-- float 10.5 --
@@ -142,7 +142,7 @@ object(DateTime)#%d (3) {
-- float -10.5 --
-Warning: date_modify(): Failed to parse time string (-10.5) at position 4 (5): Unexpected character in /home/derick/dev/php/php-src/trunk/ext/date/tests/date_modify_variation2.php on line 99
+Warning: date_modify(): Failed to parse time string (-10.5) at position 4 (5): Unexpected character in %sdate_modify_variation2.php on line 99
bool(false)
-- float .5 --
@@ -157,106 +157,106 @@ object(DateTime)#%d (3) {
-- empty array --
-Warning: date_modify() expects parameter 2 to be string, array given in /home/derick/dev/php/php-src/trunk/ext/date/tests/date_modify_variation2.php on line 99
+Warning: date_modify() expects parameter 2 to be string, array given in %sdate_modify_variation2.php on line 99
bool(false)
-- int indexed array --
-Warning: date_modify() expects parameter 2 to be string, array given in /home/derick/dev/php/php-src/trunk/ext/date/tests/date_modify_variation2.php on line 99
+Warning: date_modify() expects parameter 2 to be string, array given in %sdate_modify_variation2.php on line 99
bool(false)
-- associative array --
-Warning: date_modify() expects parameter 2 to be string, array given in /home/derick/dev/php/php-src/trunk/ext/date/tests/date_modify_variation2.php on line 99
+Warning: date_modify() expects parameter 2 to be string, array given in %sdate_modify_variation2.php on line 99
bool(false)
-- nested arrays --
-Warning: date_modify() expects parameter 2 to be string, array given in /home/derick/dev/php/php-src/trunk/ext/date/tests/date_modify_variation2.php on line 99
+Warning: date_modify() expects parameter 2 to be string, array given in %sdate_modify_variation2.php on line 99
bool(false)
-- uppercase NULL --
-Warning: date_modify(): Failed to parse time string () at position 0 ( in /home/derick/dev/php/php-src/trunk/ext/date/tests/date_modify_variation2.php on line 99
+Warning: date_modify(): Failed to parse time string () at position 0 ( in %sdate_modify_variation2.php on line 99
bool(false)
-- lowercase null --
-Warning: date_modify(): Failed to parse time string () at position 0 ( in /home/derick/dev/php/php-src/trunk/ext/date/tests/date_modify_variation2.php on line 99
+Warning: date_modify(): Failed to parse time string () at position 0 ( in %sdate_modify_variation2.php on line 99
bool(false)
-- lowercase true --
-Warning: date_modify(): Failed to parse time string (1) at position 0 (1): Unexpected character in /home/derick/dev/php/php-src/trunk/ext/date/tests/date_modify_variation2.php on line 99
+Warning: date_modify(): Failed to parse time string (1) at position 0 (1): Unexpected character in %sdate_modify_variation2.php on line 99
bool(false)
-- lowercase false --
-Warning: date_modify(): Failed to parse time string () at position 0 ( in /home/derick/dev/php/php-src/trunk/ext/date/tests/date_modify_variation2.php on line 99
+Warning: date_modify(): Failed to parse time string () at position 0 ( in %sdate_modify_variation2.php on line 99
bool(false)
-- uppercase TRUE --
-Warning: date_modify(): Failed to parse time string (1) at position 0 (1): Unexpected character in /home/derick/dev/php/php-src/trunk/ext/date/tests/date_modify_variation2.php on line 99
+Warning: date_modify(): Failed to parse time string (1) at position 0 (1): Unexpected character in %sdate_modify_variation2.php on line 99
bool(false)
-- uppercase FALSE --
-Warning: date_modify(): Failed to parse time string () at position 0 ( in /home/derick/dev/php/php-src/trunk/ext/date/tests/date_modify_variation2.php on line 99
+Warning: date_modify(): Failed to parse time string () at position 0 ( in %sdate_modify_variation2.php on line 99
bool(false)
-- empty string DQ --
-Warning: date_modify(): Failed to parse time string () at position 0 ( in /home/derick/dev/php/php-src/trunk/ext/date/tests/date_modify_variation2.php on line 99
+Warning: date_modify(): Failed to parse time string () at position 0 ( in %sdate_modify_variation2.php on line 99
bool(false)
-- empty string SQ --
-Warning: date_modify(): Failed to parse time string () at position 0 ( in /home/derick/dev/php/php-src/trunk/ext/date/tests/date_modify_variation2.php on line 99
+Warning: date_modify(): Failed to parse time string () at position 0 ( in %sdate_modify_variation2.php on line 99
bool(false)
-- string DQ --
-Warning: date_modify(): Failed to parse time string (string) at position 0 (s): The timezone could not be found in the database in /home/derick/dev/php/php-src/trunk/ext/date/tests/date_modify_variation2.php on line 99
+Warning: date_modify(): Failed to parse time string (string) at position 0 (s): The timezone could not be found in the database in %sdate_modify_variation2.php on line 99
bool(false)
-- string SQ --
-Warning: date_modify(): Failed to parse time string (string) at position 0 (s): The timezone could not be found in the database in /home/derick/dev/php/php-src/trunk/ext/date/tests/date_modify_variation2.php on line 99
+Warning: date_modify(): Failed to parse time string (string) at position 0 (s): The timezone could not be found in the database in %sdate_modify_variation2.php on line 99
bool(false)
-- mixed case string --
-Warning: date_modify(): Failed to parse time string (sTrInG) at position 0 (s): The timezone could not be found in the database in /home/derick/dev/php/php-src/trunk/ext/date/tests/date_modify_variation2.php on line 99
+Warning: date_modify(): Failed to parse time string (sTrInG) at position 0 (s): The timezone could not be found in the database in %sdate_modify_variation2.php on line 99
bool(false)
-- heredoc --
-Warning: date_modify(): Failed to parse time string (hello world) at position 0 (h): The timezone could not be found in the database in /home/derick/dev/php/php-src/trunk/ext/date/tests/date_modify_variation2.php on line 99
+Warning: date_modify(): Failed to parse time string (hello world) at position 0 (h): The timezone could not be found in the database in %sdate_modify_variation2.php on line 99
bool(false)
-- instance of classWithToString --
-Warning: date_modify(): Failed to parse time string (Class A object) at position 0 (C): The timezone could not be found in the database in /home/derick/dev/php/php-src/trunk/ext/date/tests/date_modify_variation2.php on line 99
+Warning: date_modify(): Failed to parse time string (Class A object) at position 0 (C): The timezone could not be found in the database in %sdate_modify_variation2.php on line 99
bool(false)
-- instance of classWithoutToString --
-Warning: date_modify() expects parameter 2 to be string, object given in /home/derick/dev/php/php-src/trunk/ext/date/tests/date_modify_variation2.php on line 99
+Warning: date_modify() expects parameter 2 to be string, object given in %sdate_modify_variation2.php on line 99
bool(false)
-- undefined var --
-Warning: date_modify(): Failed to parse time string () at position 0 ( in /home/derick/dev/php/php-src/trunk/ext/date/tests/date_modify_variation2.php on line 99
+Warning: date_modify(): Failed to parse time string () at position 0 ( in %sdate_modify_variation2.php on line 99
bool(false)
-- unset var --
-Warning: date_modify(): Failed to parse time string () at position 0 ( in /home/derick/dev/php/php-src/trunk/ext/date/tests/date_modify_variation2.php on line 99
+Warning: date_modify(): Failed to parse time string () at position 0 ( in %sdate_modify_variation2.php on line 99
bool(false)
-- resource --
-Warning: date_modify() expects parameter 2 to be string, resource given in /home/derick/dev/php/php-src/trunk/ext/date/tests/date_modify_variation2.php on line 99
+Warning: date_modify() expects parameter 2 to be string, resource given in %sdate_modify_variation2.php on line 99
bool(false)
===DONE===
diff --git a/ext/date/tests/timezone_abbreviations_list_basic1.phpt b/ext/date/tests/timezone_abbreviations_list_basic1.phpt
index 845a69c34f..e5dfe5d6a7 100644
--- a/ext/date/tests/timezone_abbreviations_list_basic1.phpt
+++ b/ext/date/tests/timezone_abbreviations_list_basic1.phpt
@@ -23,10 +23,10 @@ var_dump( $abbr["acst"] );
?>
===DONE===
---EXPECT--
+--EXPECTF--
*** Testing timezone_abbreviations_list() : basic functionality ***
string(5) "array"
-int(399)
+int(%d)
-- Format a sample entry --
array(4) {
View Lorry Controller Status