mirror of
https://github.com/php/php-src.git
synced 2026-04-24 00:18:23 +02:00
Merge branch 'PHP-5.3' into PHP-5.4
This commit is contained in:
Derick Rethans
+84
-68
@@ -515,69 +515,69 @@ const timelib_tzdb_index_entry timezonedb_idx_builtin[576] = {
|
||||
{ "Pacific/Enderbury" , 0x03A11D },
|
||||
{ "Pacific/Fakaofo" , 0x03A18B },
|
||||
{ "Pacific/Fiji" , 0x03A1DC },
|
||||
{ "Pacific/Funafuti" , 0x03A270 },
|
||||
{ "Pacific/Galapagos" , 0x03A2B4 },
|
||||
{ "Pacific/Gambier" , 0x03A32C },
|
||||
{ "Pacific/Guadalcanal" , 0x03A391 },
|
||||
{ "Pacific/Guam" , 0x03A3E6 },
|
||||
{ "Pacific/Honolulu" , 0x03A43C },
|
||||
{ "Pacific/Johnston" , 0x03A4B3 },
|
||||
{ "Pacific/Kiritimati" , 0x03A505 },
|
||||
{ "Pacific/Kosrae" , 0x03A570 },
|
||||
{ "Pacific/Kwajalein" , 0x03A5CD },
|
||||
{ "Pacific/Majuro" , 0x03A639 },
|
||||
{ "Pacific/Marquesas" , 0x03A698 },
|
||||
{ "Pacific/Midway" , 0x03A6FF },
|
||||
{ "Pacific/Nauru" , 0x03A789 },
|
||||
{ "Pacific/Niue" , 0x03A801 },
|
||||
{ "Pacific/Norfolk" , 0x03A85F },
|
||||
{ "Pacific/Noumea" , 0x03A8B4 },
|
||||
{ "Pacific/Pago_Pago" , 0x03A944 },
|
||||
{ "Pacific/Palau" , 0x03A9CD },
|
||||
{ "Pacific/Pitcairn" , 0x03AA11 },
|
||||
{ "Pacific/Pohnpei" , 0x03AA66 },
|
||||
{ "Pacific/Ponape" , 0x03AABB },
|
||||
{ "Pacific/Port_Moresby" , 0x03AB00 },
|
||||
{ "Pacific/Rarotonga" , 0x03AB44 },
|
||||
{ "Pacific/Saipan" , 0x03AC20 },
|
||||
{ "Pacific/Samoa" , 0x03AC83 },
|
||||
{ "Pacific/Tahiti" , 0x03AD0C },
|
||||
{ "Pacific/Tarawa" , 0x03AD71 },
|
||||
{ "Pacific/Tongatapu" , 0x03ADC5 },
|
||||
{ "Pacific/Truk" , 0x03AE51 },
|
||||
{ "Pacific/Wake" , 0x03AE96 },
|
||||
{ "Pacific/Wallis" , 0x03AEE6 },
|
||||
{ "Pacific/Yap" , 0x03AF2A },
|
||||
{ "Poland" , 0x03AF6F },
|
||||
{ "Portugal" , 0x03B350 },
|
||||
{ "PRC" , 0x03B84C },
|
||||
{ "PST8PDT" , 0x03B8FD },
|
||||
{ "ROC" , 0x03BC4E },
|
||||
{ "ROK" , 0x03BD66 },
|
||||
{ "Singapore" , 0x03BE0A },
|
||||
{ "Turkey" , 0x03BEC1 },
|
||||
{ "UCT" , 0x03C2AE },
|
||||
{ "Universal" , 0x03C2F2 },
|
||||
{ "US/Alaska" , 0x03C336 },
|
||||
{ "US/Aleutian" , 0x03C69F },
|
||||
{ "US/Arizona" , 0x03CA05 },
|
||||
{ "US/Central" , 0x03CA93 },
|
||||
{ "US/East-Indiana" , 0x03D49D },
|
||||
{ "US/Eastern" , 0x03CF9E },
|
||||
{ "US/Hawaii" , 0x03D707 },
|
||||
{ "US/Indiana-Starke" , 0x03D778 },
|
||||
{ "US/Michigan" , 0x03DAE9 },
|
||||
{ "US/Mountain" , 0x03DE20 },
|
||||
{ "US/Pacific" , 0x03E199 },
|
||||
{ "US/Pacific-New" , 0x03E59E },
|
||||
{ "US/Samoa" , 0x03E9A3 },
|
||||
{ "UTC" , 0x03EA2C },
|
||||
{ "W-SU" , 0x03ED23 },
|
||||
{ "WET" , 0x03EA70 },
|
||||
{ "Zulu" , 0x03EF5D },
|
||||
{ "Pacific/Funafuti" , 0x03A36F },
|
||||
{ "Pacific/Galapagos" , 0x03A3B3 },
|
||||
{ "Pacific/Gambier" , 0x03A42B },
|
||||
{ "Pacific/Guadalcanal" , 0x03A490 },
|
||||
{ "Pacific/Guam" , 0x03A4E5 },
|
||||
{ "Pacific/Honolulu" , 0x03A53B },
|
||||
{ "Pacific/Johnston" , 0x03A5B2 },
|
||||
{ "Pacific/Kiritimati" , 0x03A604 },
|
||||
{ "Pacific/Kosrae" , 0x03A66F },
|
||||
{ "Pacific/Kwajalein" , 0x03A6CC },
|
||||
{ "Pacific/Majuro" , 0x03A738 },
|
||||
{ "Pacific/Marquesas" , 0x03A797 },
|
||||
{ "Pacific/Midway" , 0x03A7FE },
|
||||
{ "Pacific/Nauru" , 0x03A888 },
|
||||
{ "Pacific/Niue" , 0x03A900 },
|
||||
{ "Pacific/Norfolk" , 0x03A95E },
|
||||
{ "Pacific/Noumea" , 0x03A9B3 },
|
||||
{ "Pacific/Pago_Pago" , 0x03AA43 },
|
||||
{ "Pacific/Palau" , 0x03AACC },
|
||||
{ "Pacific/Pitcairn" , 0x03AB10 },
|
||||
{ "Pacific/Pohnpei" , 0x03AB65 },
|
||||
{ "Pacific/Ponape" , 0x03ABBA },
|
||||
{ "Pacific/Port_Moresby" , 0x03ABFF },
|
||||
{ "Pacific/Rarotonga" , 0x03AC43 },
|
||||
{ "Pacific/Saipan" , 0x03AD1F },
|
||||
{ "Pacific/Samoa" , 0x03AD82 },
|
||||
{ "Pacific/Tahiti" , 0x03AE0B },
|
||||
{ "Pacific/Tarawa" , 0x03AE70 },
|
||||
{ "Pacific/Tongatapu" , 0x03AEC4 },
|
||||
{ "Pacific/Truk" , 0x03AF50 },
|
||||
{ "Pacific/Wake" , 0x03AF95 },
|
||||
{ "Pacific/Wallis" , 0x03AFE5 },
|
||||
{ "Pacific/Yap" , 0x03B029 },
|
||||
{ "Poland" , 0x03B06E },
|
||||
{ "Portugal" , 0x03B44F },
|
||||
{ "PRC" , 0x03B94B },
|
||||
{ "PST8PDT" , 0x03B9FC },
|
||||
{ "ROC" , 0x03BD4D },
|
||||
{ "ROK" , 0x03BE65 },
|
||||
{ "Singapore" , 0x03BF09 },
|
||||
{ "Turkey" , 0x03BFC0 },
|
||||
{ "UCT" , 0x03C3AD },
|
||||
{ "Universal" , 0x03C3F1 },
|
||||
{ "US/Alaska" , 0x03C435 },
|
||||
{ "US/Aleutian" , 0x03C79E },
|
||||
{ "US/Arizona" , 0x03CB04 },
|
||||
{ "US/Central" , 0x03CB92 },
|
||||
{ "US/East-Indiana" , 0x03D59C },
|
||||
{ "US/Eastern" , 0x03D09D },
|
||||
{ "US/Hawaii" , 0x03D806 },
|
||||
{ "US/Indiana-Starke" , 0x03D877 },
|
||||
{ "US/Michigan" , 0x03DBE8 },
|
||||
{ "US/Mountain" , 0x03DF1F },
|
||||
{ "US/Pacific" , 0x03E298 },
|
||||
{ "US/Pacific-New" , 0x03E69D },
|
||||
{ "US/Samoa" , 0x03EAA2 },
|
||||
{ "UTC" , 0x03EB2B },
|
||||
{ "W-SU" , 0x03EE22 },
|
||||
{ "WET" , 0x03EB6F },
|
||||
{ "Zulu" , 0x03F05C },
|
||||
};
|
||||
/* This is a generated file, do not modify */
|
||||
const unsigned char timelib_timezone_db_data_builtin[257953] = {
|
||||
const unsigned char timelib_timezone_db_data_builtin[258208] = {
|
||||
|
||||
|
||||
/* Africa/Abidjan */
|
||||
@@ -16776,14 +16776,30 @@ const unsigned char timelib_timezone_db_data_builtin[257953] = {
|
||||
/* Pacific/Fiji */
|
||||
0x50, 0x48, 0x50, 0x31, 0x01, 0x46, 0x4A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0D, 0x9A, 0x13, 0xB2, 0x3C,
|
||||
0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0D, 0x9A, 0x13, 0xB2, 0x3C,
|
||||
0x36, 0x3B, 0x17, 0xE0, 0x36, 0xD7, 0xFA, 0x60, 0x38, 0x24, 0x34, 0x60, 0x38, 0xB7, 0xDC, 0x60,
|
||||
0x4B, 0x11, 0x2C, 0xE0, 0x4B, 0xAE, 0x0F, 0x60, 0x4C, 0xC2, 0xEA, 0x60, 0x4D, 0x72, 0x41, 0xE0,
|
||||
0x4E, 0xA2, 0xCC, 0x60, 0x4F, 0x1A, 0xC4, 0xE0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
|
||||
0x02, 0x01, 0x02, 0x00, 0x00, 0xA7, 0x44, 0x00, 0x00, 0x00, 0x00, 0xB6, 0xD0, 0x01, 0x04, 0x00,
|
||||
0x00, 0xA8, 0xC0, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x46, 0x4A, 0x53, 0x54, 0x00, 0x46, 0x4A,
|
||||
0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6D, 0xA8, 0xEA, 0x02, 0x22, 0xE6, 0x82,
|
||||
0x00, 0x00, 0x00, 0x00,
|
||||
0x4E, 0xA2, 0xCC, 0x60, 0x4F, 0x1A, 0xC4, 0xE0, 0x50, 0x82, 0xAE, 0x60, 0x50, 0xFA, 0xA6, 0xE0,
|
||||
0x52, 0x62, 0x90, 0x60, 0x52, 0xDA, 0x88, 0xE0, 0x54, 0x42, 0x72, 0x60, 0x54, 0xBA, 0x6A, 0xE0,
|
||||
0x56, 0x22, 0x54, 0x60, 0x56, 0xA3, 0x87, 0x60, 0x58, 0x0B, 0x70, 0xE0, 0x58, 0x83, 0x69, 0x60,
|
||||
0x59, 0xEB, 0x52, 0xE0, 0x5A, 0x63, 0x4B, 0x60, 0x5B, 0xCB, 0x34, 0xE0, 0x5C, 0x43, 0x2D, 0x60,
|
||||
0x5D, 0xAB, 0x16, 0xE0, 0x5E, 0x23, 0x0F, 0x60, 0x5F, 0x8A, 0xF8, 0xE0, 0x60, 0x0C, 0x2B, 0xE0,
|
||||
0x61, 0x74, 0x15, 0x60, 0x61, 0xEC, 0x0D, 0xE0, 0x63, 0x53, 0xF7, 0x60, 0x63, 0xCB, 0xEF, 0xE0,
|
||||
0x65, 0x33, 0xD9, 0x60, 0x65, 0xAB, 0xD1, 0xE0, 0x67, 0x13, 0xBB, 0x60, 0x67, 0x8B, 0xB3, 0xE0,
|
||||
0x68, 0xF3, 0x9D, 0x60, 0x69, 0x6B, 0x95, 0xE0, 0x6A, 0xD3, 0x7F, 0x60, 0x6B, 0x54, 0xB2, 0x60,
|
||||
0x6C, 0xBC, 0x9B, 0xE0, 0x6D, 0x34, 0x94, 0x60, 0x6E, 0x9C, 0x7D, 0xE0, 0x6F, 0x14, 0x76, 0x60,
|
||||
0x70, 0x7C, 0x5F, 0xE0, 0x70, 0xF4, 0x58, 0x60, 0x72, 0x5C, 0x41, 0xE0, 0x72, 0xD4, 0x3A, 0x60,
|
||||
0x74, 0x3C, 0x23, 0xE0, 0x74, 0xB4, 0x1C, 0x60, 0x76, 0x25, 0x40, 0x60, 0x76, 0x9D, 0x38, 0xE0,
|
||||
0x78, 0x05, 0x22, 0x60, 0x78, 0x7D, 0x1A, 0xE0, 0x79, 0xE5, 0x04, 0x60, 0x7A, 0x5C, 0xFC, 0xE0,
|
||||
0x7B, 0xC4, 0xE6, 0x60, 0x7C, 0x3C, 0xDE, 0xE0, 0x7D, 0xA4, 0xC8, 0x60, 0x7E, 0x1C, 0xC0, 0xE0,
|
||||
0x7F, 0x84, 0xAA, 0x60, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
|
||||
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
|
||||
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
|
||||
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
|
||||
0x02, 0x01, 0x00, 0x00, 0xA7, 0x44, 0x00, 0x00, 0x00, 0x00, 0xB6, 0xD0, 0x01, 0x04, 0x00, 0x00,
|
||||
0xA8, 0xC0, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x46, 0x4A, 0x53, 0x54, 0x00, 0x46, 0x4A, 0x54,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6D, 0xA8, 0xEA, 0x02, 0x22, 0xE6, 0x82, 0x00,
|
||||
0x00, 0x00, 0x00,
|
||||
|
||||
/* Pacific/Funafuti */
|
||||
0x50, 0x48, 0x50, 0x31, 0x01, 0x54, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
@@ -18175,4 +18191,4 @@ const unsigned char timelib_timezone_db_data_builtin[257953] = {
|
||||
0x00, 0x00, 0x55, 0x54, 0x43, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80,
|
||||
0x00, 0x00, 0x00, 0x00, };
|
||||
|
||||
const timelib_tzdb timezonedb_builtin = { "2012.5", 576, timezonedb_idx_builtin, timelib_timezone_db_data_builtin };
|
||||
const timelib_tzdb timezonedb_builtin = { "2012.6", 576, timezonedb_idx_builtin, timelib_timezone_db_data_builtin };
|
||||
|
||||
Reference in New Issue
Block a user