Patch KyivNotKiev for *Configuration Issues Bug #80254

Patch version 2020-10-18 19:12 UTC

• 2020-10-18 19:12 UTC [diff to current]

Developer: valeriy.drotenko@gmail.com

diff --git a/ext/date/lib/timezonedb.h b/ext/date/lib/timezonedb.h
index 2feea5d6e1..32a9de3e89 100644
--- a/ext/date/lib/timezonedb.h
+++ b/ext/date/lib/timezonedb.h
@@ -452,7 +452,7 @@ const timelib_tzdb_index_entry timezonedb_idx_builtin[594] = {
 	{ "Europe/Istanbul"                   , FOR_V2(0x07B6B2, 0x02FAB1) },
 	{ "Europe/Jersey"                     , FOR_V2(0x07BE59, 0x02FD9E) },
 	{ "Europe/Kaliningrad"                , FOR_V2(0x07CCA5, 0x0302D9) },
-	{ "Europe/Kiev"                       , FOR_V2(0x07D29A, 0x030540) },
+	{ "Europe/Kyiv"                       , FOR_V2(0x07D29A, 0x030540) },
 	{ "Europe/Kirov"                      , FOR_V2(0x07DAE2, 0x030873) },
 	{ "Europe/Lisbon"                     , FOR_V2(0x07DF7D, 0x030A49) },
 	{ "Europe/Ljubljana"                  , FOR_V2(0x07ED29, 0x030F65) },
@@ -35003,7 +35003,7 @@ const unsigned char timelib_timezone_db_data_builtin[269025] = {
 0x30, 0x31, 0x20, 0x2D, 0x20, 0x4B, 0x61, 0x6C, 0x69, 0x6E, 0x69, 0x6E, 0x67, 0x72, 0x61, 0x64,
 
 
-/* Europe/Kiev */
+/* Europe/Kyiv */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x55, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x22, 0x80, 0x00, 0x00, 0x00,
diff --git a/ext/date/lib/timezonemap.h b/ext/date/lib/timezonemap.h
index 21b7998fcf..eea97075c9 100644
--- a/ext/date/lib/timezonemap.h
+++ b/ext/date/lib/timezonemap.h
@@ -254,7 +254,7 @@
 	{ "cest",  1,   7200, "Europe/Copenhagen"             },
 	{ "cest",  1,   7200, "Europe/Gibraltar"              },
 	{ "cest",  1,   7200, "Europe/Kaliningrad"            },
-	{ "cest",  1,   7200, "Europe/Kiev"                   },
+	{ "cest",  1,   7200, "Europe/Kyiv"                   },
 	{ "cest",  1,   7200, "Europe/Lisbon"                 },
 	{ "cest",  1,   7200, "Europe/Ljubljana"              },
 	{ "cest",  1,   7200, "Europe/Luxembourg"             },
@@ -306,7 +306,7 @@
 	{ "cet",   0,   3600, "Europe/Copenhagen"             },
 	{ "cet",   0,   3600, "Europe/Gibraltar"              },
 	{ "cet",   0,   3600, "Europe/Kaliningrad"            },
-	{ "cet",   0,   3600, "Europe/Kiev"                   },
+	{ "cet",   0,   3600, "Europe/Kyiv"                   },
 	{ "cet",   0,   3600, "Europe/Lisbon"                 },
 	{ "cet",   0,   3600, "Europe/Ljubljana"              },
 	{ "cet",   0,   3600, "Europe/Luxembourg"             },
@@ -528,7 +528,7 @@
 	{ "eest",  1,  10800, "Europe/Chisinau"               },
 	{ "eest",  1,  10800, "Europe/Istanbul"               },
 	{ "eest",  1,  10800, "Europe/Kaliningrad"            },
-	{ "eest",  1,  10800, "Europe/Kiev"                   },
+	{ "eest",  1,  10800, "Europe/Kyiv"                   },
 	{ "eest",  1,  10800, "Europe/Mariehamn"              },
 	{ "eest",  1,  10800, "Europe/Minsk"                  },
 	{ "eest",  1,  10800, "Europe/Moscow"                 },
@@ -558,7 +558,7 @@
 	{ "eet",   0,   7200, "Europe/Chisinau"               },
 	{ "eet",   0,   7200, "Europe/Istanbul"               },
 	{ "eet",   0,   7200, "Europe/Kaliningrad"            },
-	{ "eet",   0,   7200, "Europe/Kiev"                   },
+	{ "eet",   0,   7200, "Europe/Kyiv"                   },
 	{ "eet",   0,   7200, "Europe/Mariehamn"              },
 	{ "eet",   0,   7200, "Europe/Minsk"                  },
 	{ "eet",   0,   7200, "Europe/Moscow"                 },
@@ -726,7 +726,7 @@
 	{ "kmt",   0,   5736, "Europe/Vilnius"                },
 	{ "kmt",   0, -18430, "America/Grand_Turk"            },
 	{ "kmt",   0, -18430, "America/Jamaica"               },
-	{ "kmt",   0,   7324, "Europe/Kiev"                   },
+	{ "kmt",   0,   7324, "Europe/Kyiv"                   },
 	{ "kst",   0,  30600, "Asia/Seoul"                    },
 	{ "kst",   0,  32400, "Asia/Pyongyang"                },
 	{ "kst",   0,  32400, "Asia/Seoul"                    },
@@ -789,7 +789,7 @@
 	{ "msd",   1,  14400, "Europe/Moscow"                 },
 	{ "msd",   1,  14400, "Europe/Chisinau"               },
 	{ "msd",   1,  14400, "Europe/Kaliningrad"            },
-	{ "msd",   1,  14400, "Europe/Kiev"                   },
+	{ "msd",   1,  14400, "Europe/Kyiv"                   },
 	{ "msd",   1,  14400, "Europe/Minsk"                  },
 	{ "msd",   1,  14400, "Europe/Riga"                   },
 	{ "msd",   1,  14400, "Europe/Simferopol"             },
@@ -802,7 +802,7 @@
 	{ "msk",   0,  14400, "Europe/Moscow"                 },
 	{ "msk",   0,  10800, "Europe/Chisinau"               },
 	{ "msk",   0,  10800, "Europe/Kaliningrad"            },
-	{ "msk",   0,  10800, "Europe/Kiev"                   },
+	{ "msk",   0,  10800, "Europe/Kyiv"                   },
 	{ "msk",   0,  10800, "Europe/Minsk"                  },
 	{ "msk",   0,  10800, "Europe/Riga"                   },
 	{ "msk",   0,  10800, "Europe/Simferopol"             },
diff --git a/ext/date/tests/bug52577.phpt b/ext/date/tests/bug52577.phpt
index 7a58f2a21a..137e821a53 100644
--- a/ext/date/tests/bug52577.phpt
+++ b/ext/date/tests/bug52577.phpt
@@ -2,7 +2,7 @@
 Bug #52577 (Incorrect date returning)
 --FILE--
 <?php
-date_default_timezone_set('Europe/Kiev');
+date_default_timezone_set('Europe/Kyiv');
 $date = '7.8.2010';
 echo "String: ".$date."\n";
 $date_format = DATE_RFC2822;