mirror of
https://github.com/bdnugget/php-src.git
synced 2026-11-15 21:16:38 +00:00
Compare commits
52
Commits
php-5.3.24
...
php-5.3.26
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4e573053dc | ||
|
|
882aa9c687 | ||
|
|
eeb7f93294 | ||
|
|
9e28f20fba | ||
|
|
c50cef1dc5 | ||
|
|
d4ad889824 | ||
|
|
2d5695cbc5 | ||
|
|
4828f7343b | ||
|
|
46b05bc57a | ||
|
|
3eb1745643 | ||
|
|
86db5fb4c2 | ||
|
|
ba1af29805 | ||
|
|
533e636a62 | ||
|
|
fe21accfb4 | ||
|
|
d6505acbf5 | ||
|
|
1cc2162b83 | ||
|
|
5c701d19ac | ||
|
|
f1269d80c5 | ||
|
|
b1ea0b7a7a | ||
|
|
aa448adc83 | ||
|
|
4a34d4a83c | ||
|
|
0549e55d82 | ||
|
|
444e59eb20 | ||
|
|
331540d20c | ||
|
|
d0c40220d1 | ||
|
|
8492bbefbb | ||
|
|
a7d6cb2360 | ||
|
|
ab117573cd | ||
|
|
15b554cd9b | ||
|
|
c7b8368ed5 | ||
|
|
bf5506f511 | ||
|
|
63434524f8 | ||
|
|
671ef9fda7 | ||
|
|
18fdab5a09 | ||
|
|
4cf0647399 | ||
|
|
f082d6311b | ||
|
|
70b67f2e50 | ||
|
|
0802961bd1 | ||
|
|
323fdb9879 | ||
|
|
a9271a8b0d | ||
|
|
56b028e590 | ||
|
|
968ae4a56a | ||
|
|
224a67fb9f | ||
|
|
ecdf8bcc45 | ||
|
|
88b3cdc4e9 | ||
|
|
4d4adf47e0 | ||
|
|
1b60c189ad | ||
|
|
934dfae4e1 | ||
|
|
c96a5bc6be | ||
|
|
9456dac54e | ||
|
|
fecce5a55f | ||
|
|
46ee57f2d7 |
No files matched your search
+4
-5
@@ -1,10 +1,9 @@
|
||||
language: php
|
||||
|
||||
php:
|
||||
# We only specify one version so we only get one worker
|
||||
- 5.4
|
||||
branches:
|
||||
except:
|
||||
- /^PHP-5\.3.*/
|
||||
- /^PHP-5\.4.*/
|
||||
|
||||
notifications:
|
||||
email: false
|
||||
|
||||
script: exit 0
|
||||
@@ -1,6 +1,52 @@
|
||||
PHP NEWS
|
||||
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||
?? ??? 2013, PHP 5.3.24
|
||||
06 Jun 2013, PHP 5.3.26
|
||||
|
||||
- Core:
|
||||
. Fixed bug #64879 (Heap based buffer overflow in quoted_printable_encode,
|
||||
CVE 2013-2110). (Stas)
|
||||
|
||||
- Calendar:
|
||||
. Fixed bug #64895 (Integer overflow in SndToJewish). (Remi)
|
||||
|
||||
- FPM:
|
||||
. Fixed some possible memory or resource leaks and possible null dereference
|
||||
detected by code coverity scan. (Remi)
|
||||
. Log a warning when a syscall fails. (Remi)
|
||||
|
||||
- MySQLi:
|
||||
. Fixed bug #64726 (Segfault when calling fetch_object on a use_result and DB
|
||||
pointer has closed). (Laruence)
|
||||
|
||||
- Phar
|
||||
. Fixed bug #64214 (PHAR PHPTs intermittently crash when run on DFS, SMB or
|
||||
with non std tmp dir). (Pierre)
|
||||
|
||||
- Streams:
|
||||
. Fixed bug #64770 (stream_select() fails with pipes returned by proc_open()
|
||||
on Windows x64). (Anatol)
|
||||
|
||||
- Zend Engine:
|
||||
. Fixed bug #64821 (Custom Exception crash when internal properties
|
||||
overridden). (Anatol)
|
||||
|
||||
09 May 2013, PHP 5.3.25
|
||||
|
||||
- Core:
|
||||
. Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap:
|
||||
segfault). (Laruence)
|
||||
. Fixed bug #64458 (dns_get_record result with string of length -1). (Stas)
|
||||
. Fixed bugs #47675 and #64577 (fd leak on Solaris). (Rasmus)
|
||||
|
||||
- Streams:
|
||||
. Fixed Windows x64 version of stream_socket_pair() and improved error
|
||||
handling. (Anatol Belski)
|
||||
|
||||
- Zip:
|
||||
. Fixed bug #64342 (ZipArchive::addFile() has to check for file existence).
|
||||
(Anatol)
|
||||
|
||||
11 Apr 2013, PHP 5.3.24
|
||||
|
||||
- Core
|
||||
. Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT']).
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
--TEST--
|
||||
Bug #64578 (debug_backtrace in set_error_handler corrupts zend heap: segfault)
|
||||
--FILE--
|
||||
<?php
|
||||
function x($s) {
|
||||
$resource = fopen("php://input", "r");
|
||||
$s[$resource] = '2';
|
||||
}
|
||||
$y = "1";
|
||||
x($y);
|
||||
var_dump($y);
|
||||
?>
|
||||
--EXPECTF--
|
||||
Warning: Illegal offset type in %sbug64578.php on line %d
|
||||
string(1) "1"
|
||||
@@ -0,0 +1,22 @@
|
||||
--TEST--
|
||||
Bug #64821 Custom Exceptions crash when internal properties overridden (variation 1)
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
class a extends exception {
|
||||
public function __construct() {
|
||||
$this->message = NULL;
|
||||
$this->string = NULL;
|
||||
$this->code = array();
|
||||
$this->line = "hello";
|
||||
}
|
||||
}
|
||||
|
||||
throw new a;
|
||||
|
||||
?>
|
||||
--EXPECTF--
|
||||
Fatal error: Uncaught exception 'a' in %s:0
|
||||
Stack trace:
|
||||
#0 {main}
|
||||
thrown in %s on line %d
|
||||
@@ -0,0 +1,19 @@
|
||||
--TEST--
|
||||
Bug #64821 Custom Exceptions crash when internal properties overridden (variation 2)
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
class a extends exception {
|
||||
public function __construct() {
|
||||
$this->line = array();
|
||||
}
|
||||
}
|
||||
|
||||
throw new a;
|
||||
|
||||
?>
|
||||
--EXPECTF--
|
||||
Fatal error: Uncaught exception 'a' in %s:0
|
||||
Stack trace:
|
||||
#0 {main}
|
||||
thrown in %s on line %d
|
||||
@@ -0,0 +1,20 @@
|
||||
--TEST--
|
||||
Bug #64821 Custom Exceptions crash when internal properties overridden (variation 3)
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
class a extends exception {
|
||||
public function __construct() {
|
||||
$this->line = array();
|
||||
$this->file = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
throw new a;
|
||||
|
||||
?>
|
||||
--EXPECTF--
|
||||
Fatal error: Uncaught exception 'a' in :0
|
||||
Stack trace:
|
||||
#0 {main}
|
||||
thrown in Unknown on line %d
|
||||
+1
-1
@@ -90,7 +90,7 @@ typedef struct _zend_fcall_info_cache {
|
||||
#define ZEND_NS_RAW_FENTRY(ns, zend_name, name, arg_info, flags) ZEND_RAW_FENTRY(ZEND_NS_NAME(ns, zend_name), name, arg_info, flags)
|
||||
#define ZEND_NS_RAW_NAMED_FE(ns, zend_name, name, arg_info) ZEND_NS_RAW_FENTRY(ns, #zend_name, name, arg_info, 0)
|
||||
|
||||
#define ZEND_NS_NAMED_FE(ns, zend_name, name, arg_info) ZEND_NS_FENTRY(ns, #zend_name, name, arg_info, 0)
|
||||
#define ZEND_NS_NAMED_FE(ns, zend_name, name, arg_info) ZEND_NS_FENTRY(ns, zend_name, name, arg_info, 0)
|
||||
#define ZEND_NS_FE(ns, name, arg_info) ZEND_NS_FENTRY(ns, name, ZEND_FN(name), arg_info, 0)
|
||||
#define ZEND_NS_DEP_FE(ns, name, arg_info) ZEND_NS_FENTRY(ns, name, ZEND_FN(name), arg_info, ZEND_ACC_DEPRECATED)
|
||||
#define ZEND_NS_FALIAS(ns, name, alias, arg_info) ZEND_NS_FENTRY(ns, name, ZEND_FN(alias), arg_info, 0)
|
||||
|
||||
@@ -803,6 +803,10 @@ ZEND_API void zend_exception_error(zval *exception, int severity TSRMLS_DC) /* {
|
||||
if (instanceof_function(ce_exception, default_exception_ce TSRMLS_CC)) {
|
||||
file = zend_read_property(default_exception_ce, EG(exception), "file", sizeof("file")-1, 1 TSRMLS_CC);
|
||||
line = zend_read_property(default_exception_ce, EG(exception), "line", sizeof("line")-1, 1 TSRMLS_CC);
|
||||
|
||||
convert_to_string(file);
|
||||
file = (Z_STRLEN_P(file) > 0) ? file : NULL;
|
||||
line = (Z_TYPE_P(line) == IS_LONG) ? line : NULL;
|
||||
} else {
|
||||
file = NULL;
|
||||
line = NULL;
|
||||
@@ -814,7 +818,11 @@ ZEND_API void zend_exception_error(zval *exception, int severity TSRMLS_DC) /* {
|
||||
file = zend_read_property(default_exception_ce, exception, "file", sizeof("file")-1, 1 TSRMLS_CC);
|
||||
line = zend_read_property(default_exception_ce, exception, "line", sizeof("line")-1, 1 TSRMLS_CC);
|
||||
|
||||
zend_error_va(severity, Z_STRVAL_P(file), Z_LVAL_P(line), "Uncaught %s\n thrown", Z_STRVAL_P(str));
|
||||
convert_to_string(str);
|
||||
convert_to_string(file);
|
||||
convert_to_long(line);
|
||||
|
||||
zend_error_va(severity, (Z_STRLEN_P(file) > 0) ? Z_STRVAL_P(file) : NULL, Z_LVAL_P(line), "Uncaught %s\n thrown", Z_STRVAL_P(str));
|
||||
} else {
|
||||
zend_error(severity, "Uncaught exception '%s'", ce_exception->name);
|
||||
}
|
||||
|
||||
+4
-3
@@ -937,6 +937,10 @@ convert_to_array:
|
||||
zend_error_noreturn(E_ERROR, "[] operator not supported for strings");
|
||||
}
|
||||
|
||||
if (type != BP_VAR_UNSET) {
|
||||
SEPARATE_ZVAL_IF_NOT_REF(container_ptr);
|
||||
}
|
||||
|
||||
if (Z_TYPE_P(dim) != IS_LONG) {
|
||||
switch(Z_TYPE_P(dim)) {
|
||||
/* case IS_LONG: */
|
||||
@@ -956,9 +960,6 @@ convert_to_array:
|
||||
convert_to_long(&tmp);
|
||||
dim = &tmp;
|
||||
}
|
||||
if (type != BP_VAR_UNSET) {
|
||||
SEPARATE_ZVAL_IF_NOT_REF(container_ptr);
|
||||
}
|
||||
container = *container_ptr;
|
||||
result->str_offset.str = container;
|
||||
PZVAL_LOCK(container);
|
||||
|
||||
+3
-1
@@ -2710,7 +2710,9 @@ ZEND_VM_HANDLER(67, ZEND_SEND_REF, VAR|CV, ANY)
|
||||
ZEND_VM_NEXT_OPCODE();
|
||||
}
|
||||
|
||||
if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION && !ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->op2.u.opline_num)) {
|
||||
if (opline->extended_value == ZEND_DO_FCALL_BY_NAME &&
|
||||
EX(function_state).function->type == ZEND_INTERNAL_FUNCTION &&
|
||||
!ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->op2.u.opline_num)) {
|
||||
ZEND_VM_DISPATCH_TO_HELPER(zend_send_by_var_helper);
|
||||
}
|
||||
|
||||
|
||||
@@ -8399,7 +8399,9 @@ static int ZEND_FASTCALL ZEND_SEND_REF_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG
|
||||
ZEND_VM_NEXT_OPCODE();
|
||||
}
|
||||
|
||||
if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION && !ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->op2.u.opline_num)) {
|
||||
if (opline->extended_value == ZEND_DO_FCALL_BY_NAME &&
|
||||
EX(function_state).function->type == ZEND_INTERNAL_FUNCTION &&
|
||||
!ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->op2.u.opline_num)) {
|
||||
return zend_send_by_var_helper_SPEC_VAR(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
|
||||
}
|
||||
|
||||
@@ -22312,7 +22314,9 @@ static int ZEND_FASTCALL ZEND_SEND_REF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
|
||||
ZEND_VM_NEXT_OPCODE();
|
||||
}
|
||||
|
||||
if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION && !ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->op2.u.opline_num)) {
|
||||
if (opline->extended_value == ZEND_DO_FCALL_BY_NAME &&
|
||||
EX(function_state).function->type == ZEND_INTERNAL_FUNCTION &&
|
||||
!ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->op2.u.opline_num)) {
|
||||
return zend_send_by_var_helper_SPEC_CV(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
|
||||
}
|
||||
|
||||
|
||||
+3
-3
@@ -41,8 +41,8 @@ AC_CONFIG_HEADER(main/php_config.h)
|
||||
|
||||
PHP_MAJOR_VERSION=5
|
||||
PHP_MINOR_VERSION=3
|
||||
PHP_RELEASE_VERSION=24
|
||||
PHP_EXTRA_VERSION="-dev"
|
||||
PHP_RELEASE_VERSION=26
|
||||
PHP_EXTRA_VERSION=""
|
||||
PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
|
||||
PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
|
||||
|
||||
@@ -712,7 +712,7 @@ if test "$PHP_GCOV" = "yes"; then
|
||||
AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
|
||||
fi
|
||||
|
||||
ltp_version_list="1.5 1.6 1.7"
|
||||
ltp_version_list="1.5 1.6 1.7 1.9 1.10"
|
||||
|
||||
AC_CHECK_PROG(LTP, lcov, lcov)
|
||||
AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml)
|
||||
|
||||
@@ -272,6 +272,7 @@
|
||||
#define HALAKIM_PER_METONIC_CYCLE (HALAKIM_PER_LUNAR_CYCLE * (12 * 19 + 7))
|
||||
|
||||
#define JEWISH_SDN_OFFSET 347997
|
||||
#define JEWISH_SDN_MAX 324542846L /* 12/13/887605, greater value raises interger overflow */
|
||||
#define NEW_MOON_OF_CREATION 31524
|
||||
|
||||
#define SUNDAY 0
|
||||
@@ -519,7 +520,7 @@ void SdnToJewish(
|
||||
int tishri1After;
|
||||
int yearLength;
|
||||
|
||||
if (sdn <= JEWISH_SDN_OFFSET) {
|
||||
if (sdn <= JEWISH_SDN_OFFSET || sdn > JEWISH_SDN_MAX) {
|
||||
*pYear = 0;
|
||||
*pMonth = 0;
|
||||
*pDay = 0;
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
--TEST--
|
||||
Bug #64895: Integer overflow in SndToJewish
|
||||
--SKIPIF--
|
||||
<?php
|
||||
include 'skipif.inc';
|
||||
if (PHP_INT_SIZE == 4) {
|
||||
die("skip this test is for 64bit platform only");
|
||||
}
|
||||
?>
|
||||
--FILE--
|
||||
<?php
|
||||
$a = array(38245310, 324542846, 324542847, 9223372036854743639);
|
||||
|
||||
foreach ($a as $x) var_dump(jdtojewish($x));
|
||||
--EXPECTF--
|
||||
string(11) "2/22/103759"
|
||||
string(12) "12/13/887605"
|
||||
string(5) "0/0/0"
|
||||
string(5) "0/0/0"
|
||||
+469
-441
@@ -221,366 +221,366 @@ const timelib_tzdb_index_entry timezonedb_idx_builtin[579] = {
|
||||
{ "Antarctica/Davis" , 0x0179E5 },
|
||||
{ "Antarctica/DumontDUrville" , 0x017A86 },
|
||||
{ "Antarctica/Macquarie" , 0x017B18 },
|
||||
{ "Antarctica/Mawson" , 0x017D92 },
|
||||
{ "Antarctica/McMurdo" , 0x017E0E },
|
||||
{ "Antarctica/Palmer" , 0x018110 },
|
||||
{ "Antarctica/Rothera" , 0x01842C },
|
||||
{ "Antarctica/South_Pole" , 0x0184A2 },
|
||||
{ "Antarctica/Syowa" , 0x0187AA },
|
||||
{ "Antarctica/Vostok" , 0x018818 },
|
||||
{ "Arctic/Longyearbyen" , 0x018889 },
|
||||
{ "Asia/Aden" , 0x018BBB },
|
||||
{ "Asia/Almaty" , 0x018C10 },
|
||||
{ "Asia/Amman" , 0x018D8F },
|
||||
{ "Asia/Anadyr" , 0x019045 },
|
||||
{ "Asia/Aqtau" , 0x01922A },
|
||||
{ "Asia/Aqtobe" , 0x019429 },
|
||||
{ "Asia/Ashgabat" , 0x0195E1 },
|
||||
{ "Asia/Ashkhabad" , 0x0196FE },
|
||||
{ "Asia/Baghdad" , 0x01981B },
|
||||
{ "Asia/Bahrain" , 0x019990 },
|
||||
{ "Asia/Baku" , 0x0199F6 },
|
||||
{ "Asia/Bangkok" , 0x019CDE },
|
||||
{ "Asia/Beirut" , 0x019D33 },
|
||||
{ "Asia/Bishkek" , 0x01A040 },
|
||||
{ "Asia/Brunei" , 0x01A1EC },
|
||||
{ "Asia/Calcutta" , 0x01A24E },
|
||||
{ "Asia/Choibalsan" , 0x01A2C7 },
|
||||
{ "Asia/Chongqing" , 0x01A440 },
|
||||
{ "Asia/Chungking" , 0x01A52F },
|
||||
{ "Asia/Colombo" , 0x01A5DE },
|
||||
{ "Asia/Dacca" , 0x01A67A },
|
||||
{ "Asia/Damascus" , 0x01A720 },
|
||||
{ "Asia/Dhaka" , 0x01AA70 },
|
||||
{ "Asia/Dili" , 0x01AB16 },
|
||||
{ "Asia/Dubai" , 0x01AB9F },
|
||||
{ "Asia/Dushanbe" , 0x01ABF4 },
|
||||
{ "Asia/Gaza" , 0x01ACF7 },
|
||||
{ "Asia/Harbin" , 0x01AF50 },
|
||||
{ "Asia/Hebron" , 0x01B037 },
|
||||
{ "Asia/Ho_Chi_Minh" , 0x01B299 },
|
||||
{ "Asia/Hong_Kong" , 0x01B311 },
|
||||
{ "Asia/Hovd" , 0x01B4D3 },
|
||||
{ "Asia/Irkutsk" , 0x01B64B },
|
||||
{ "Asia/Istanbul" , 0x01B831 },
|
||||
{ "Asia/Jakarta" , 0x01BC1E },
|
||||
{ "Asia/Jayapura" , 0x01BCC8 },
|
||||
{ "Asia/Jerusalem" , 0x01BD64 },
|
||||
{ "Asia/Kabul" , 0x01C093 },
|
||||
{ "Asia/Kamchatka" , 0x01C0E4 },
|
||||
{ "Asia/Karachi" , 0x01C2C0 },
|
||||
{ "Asia/Kashgar" , 0x01C375 },
|
||||
{ "Asia/Kathmandu" , 0x01C446 },
|
||||
{ "Asia/Katmandu" , 0x01C4AC },
|
||||
{ "Asia/Khandyga" , 0x01C512 },
|
||||
{ "Asia/Kolkata" , 0x01C737 },
|
||||
{ "Asia/Krasnoyarsk" , 0x01C7B0 },
|
||||
{ "Asia/Kuala_Lumpur" , 0x01C998 },
|
||||
{ "Asia/Kuching" , 0x01CA55 },
|
||||
{ "Asia/Kuwait" , 0x01CB43 },
|
||||
{ "Asia/Macao" , 0x01CB98 },
|
||||
{ "Asia/Macau" , 0x01CCD3 },
|
||||
{ "Asia/Magadan" , 0x01CE0E },
|
||||
{ "Asia/Makassar" , 0x01CFF0 },
|
||||
{ "Asia/Manila" , 0x01D0B4 },
|
||||
{ "Asia/Muscat" , 0x01D139 },
|
||||
{ "Asia/Nicosia" , 0x01D18E },
|
||||
{ "Asia/Novokuznetsk" , 0x01D476 },
|
||||
{ "Asia/Novosibirsk" , 0x01D678 },
|
||||
{ "Asia/Omsk" , 0x01D863 },
|
||||
{ "Asia/Oral" , 0x01DA4A },
|
||||
{ "Asia/Phnom_Penh" , 0x01DC1A },
|
||||
{ "Asia/Pontianak" , 0x01DC92 },
|
||||
{ "Asia/Pyongyang" , 0x01DD53 },
|
||||
{ "Asia/Qatar" , 0x01DDC0 },
|
||||
{ "Asia/Qyzylorda" , 0x01DE26 },
|
||||
{ "Asia/Rangoon" , 0x01DFFC },
|
||||
{ "Asia/Riyadh" , 0x01E074 },
|
||||
{ "Asia/Saigon" , 0x01E0C9 },
|
||||
{ "Asia/Sakhalin" , 0x01E141 },
|
||||
{ "Asia/Samarkand" , 0x01E338 },
|
||||
{ "Asia/Seoul" , 0x01E46E },
|
||||
{ "Asia/Shanghai" , 0x01E512 },
|
||||
{ "Asia/Singapore" , 0x01E5F2 },
|
||||
{ "Asia/Taipei" , 0x01E6A9 },
|
||||
{ "Asia/Tashkent" , 0x01E7C1 },
|
||||
{ "Asia/Tbilisi" , 0x01E8F2 },
|
||||
{ "Asia/Tehran" , 0x01EAAC },
|
||||
{ "Asia/Tel_Aviv" , 0x01ED1A },
|
||||
{ "Asia/Thimbu" , 0x01F049 },
|
||||
{ "Asia/Thimphu" , 0x01F0AF },
|
||||
{ "Asia/Tokyo" , 0x01F115 },
|
||||
{ "Asia/Ujung_Pandang" , 0x01F19E },
|
||||
{ "Asia/Ulaanbaatar" , 0x01F21A },
|
||||
{ "Asia/Ulan_Bator" , 0x01F375 },
|
||||
{ "Asia/Urumqi" , 0x01F4C2 },
|
||||
{ "Asia/Ust-Nera" , 0x01F589 },
|
||||
{ "Asia/Vientiane" , 0x01F78E },
|
||||
{ "Asia/Vladivostok" , 0x01F806 },
|
||||
{ "Asia/Yakutsk" , 0x01F9F2 },
|
||||
{ "Asia/Yekaterinburg" , 0x01FBD7 },
|
||||
{ "Asia/Yerevan" , 0x01FDE2 },
|
||||
{ "Atlantic/Azores" , 0x01FFE2 },
|
||||
{ "Atlantic/Bermuda" , 0x0204E5 },
|
||||
{ "Atlantic/Canary" , 0x0207C6 },
|
||||
{ "Atlantic/Cape_Verde" , 0x020A9C },
|
||||
{ "Atlantic/Faeroe" , 0x020B15 },
|
||||
{ "Atlantic/Faroe" , 0x020DB9 },
|
||||
{ "Atlantic/Jan_Mayen" , 0x02105D },
|
||||
{ "Atlantic/Madeira" , 0x02138F },
|
||||
{ "Atlantic/Reykjavik" , 0x021898 },
|
||||
{ "Atlantic/South_Georgia" , 0x021A51 },
|
||||
{ "Atlantic/St_Helena" , 0x021C63 },
|
||||
{ "Atlantic/Stanley" , 0x021A95 },
|
||||
{ "Australia/ACT" , 0x021CB8 },
|
||||
{ "Australia/Adelaide" , 0x021FD5 },
|
||||
{ "Australia/Brisbane" , 0x022301 },
|
||||
{ "Australia/Broken_Hill" , 0x0223C8 },
|
||||
{ "Australia/Canberra" , 0x022706 },
|
||||
{ "Australia/Currie" , 0x022A23 },
|
||||
{ "Australia/Darwin" , 0x022D56 },
|
||||
{ "Australia/Eucla" , 0x022DDC },
|
||||
{ "Australia/Hobart" , 0x022EB1 },
|
||||
{ "Australia/LHI" , 0x02320F },
|
||||
{ "Australia/Lindeman" , 0x0234AA },
|
||||
{ "Australia/Lord_Howe" , 0x02358B },
|
||||
{ "Australia/Melbourne" , 0x023836 },
|
||||
{ "Australia/North" , 0x023B5B },
|
||||
{ "Australia/NSW" , 0x023BCF },
|
||||
{ "Australia/Perth" , 0x023EEC },
|
||||
{ "Australia/Queensland" , 0x023FC4 },
|
||||
{ "Australia/South" , 0x024070 },
|
||||
{ "Australia/Sydney" , 0x02438D },
|
||||
{ "Australia/Tasmania" , 0x0246CA },
|
||||
{ "Australia/Victoria" , 0x024A0F },
|
||||
{ "Australia/West" , 0x024D2C },
|
||||
{ "Australia/Yancowinna" , 0x024DE2 },
|
||||
{ "Brazil/Acre" , 0x025104 },
|
||||
{ "Brazil/DeNoronha" , 0x025203 },
|
||||
{ "Brazil/East" , 0x025323 },
|
||||
{ "Brazil/West" , 0x025600 },
|
||||
{ "Canada/Atlantic" , 0x0256F8 },
|
||||
{ "Canada/Central" , 0x025BE0 },
|
||||
{ "Canada/East-Saskatchewan" , 0x0264EA },
|
||||
{ "Canada/Eastern" , 0x025FFA },
|
||||
{ "Canada/Mountain" , 0x026673 },
|
||||
{ "Canada/Newfoundland" , 0x0269E9 },
|
||||
{ "Canada/Pacific" , 0x026F14 },
|
||||
{ "Canada/Saskatchewan" , 0x02732D },
|
||||
{ "Canada/Yukon" , 0x0274B6 },
|
||||
{ "CET" , 0x0277B9 },
|
||||
{ "Chile/Continental" , 0x027AC2 },
|
||||
{ "Chile/EasterIsland" , 0x027E5D },
|
||||
{ "CST6CDT" , 0x02819F },
|
||||
{ "Cuba" , 0x0284F0 },
|
||||
{ "EET" , 0x028863 },
|
||||
{ "Egypt" , 0x028B16 },
|
||||
{ "Eire" , 0x028DD9 },
|
||||
{ "EST" , 0x0292EA },
|
||||
{ "EST5EDT" , 0x02932E },
|
||||
{ "Etc/GMT" , 0x02967F },
|
||||
{ "Etc/GMT+0" , 0x02974B },
|
||||
{ "Etc/GMT+1" , 0x0297D5 },
|
||||
{ "Etc/GMT+10" , 0x029862 },
|
||||
{ "Etc/GMT+11" , 0x0298F0 },
|
||||
{ "Etc/GMT+12" , 0x02997E },
|
||||
{ "Etc/GMT+2" , 0x029A99 },
|
||||
{ "Etc/GMT+3" , 0x029B25 },
|
||||
{ "Etc/GMT+4" , 0x029BB1 },
|
||||
{ "Etc/GMT+5" , 0x029C3D },
|
||||
{ "Etc/GMT+6" , 0x029CC9 },
|
||||
{ "Etc/GMT+7" , 0x029D55 },
|
||||
{ "Etc/GMT+8" , 0x029DE1 },
|
||||
{ "Etc/GMT+9" , 0x029E6D },
|
||||
{ "Etc/GMT-0" , 0x029707 },
|
||||
{ "Etc/GMT-1" , 0x02978F },
|
||||
{ "Etc/GMT-10" , 0x02981B },
|
||||
{ "Etc/GMT-11" , 0x0298A9 },
|
||||
{ "Etc/GMT-12" , 0x029937 },
|
||||
{ "Etc/GMT-13" , 0x0299C5 },
|
||||
{ "Etc/GMT-14" , 0x029A0C },
|
||||
{ "Etc/GMT-2" , 0x029A53 },
|
||||
{ "Etc/GMT-3" , 0x029ADF },
|
||||
{ "Etc/GMT-4" , 0x029B6B },
|
||||
{ "Etc/GMT-5" , 0x029BF7 },
|
||||
{ "Etc/GMT-6" , 0x029C83 },
|
||||
{ "Etc/GMT-7" , 0x029D0F },
|
||||
{ "Etc/GMT-8" , 0x029D9B },
|
||||
{ "Etc/GMT-9" , 0x029E27 },
|
||||
{ "Etc/GMT0" , 0x0296C3 },
|
||||
{ "Etc/Greenwich" , 0x029EB3 },
|
||||
{ "Etc/UCT" , 0x029EF7 },
|
||||
{ "Etc/Universal" , 0x029F3B },
|
||||
{ "Etc/UTC" , 0x029F7F },
|
||||
{ "Etc/Zulu" , 0x029FC3 },
|
||||
{ "Europe/Amsterdam" , 0x02A007 },
|
||||
{ "Europe/Andorra" , 0x02A445 },
|
||||
{ "Europe/Athens" , 0x02A6C1 },
|
||||
{ "Europe/Belfast" , 0x02AA04 },
|
||||
{ "Europe/Belgrade" , 0x02AF3B },
|
||||
{ "Europe/Berlin" , 0x02B204 },
|
||||
{ "Europe/Bratislava" , 0x02B568 },
|
||||
{ "Europe/Brussels" , 0x02B89A },
|
||||
{ "Europe/Bucharest" , 0x02BCD1 },
|
||||
{ "Europe/Budapest" , 0x02BFFB },
|
||||
{ "Europe/Busingen" , 0x02C36E },
|
||||
{ "Europe/Chisinau" , 0x02C625 },
|
||||
{ "Europe/Copenhagen" , 0x02C9B3 },
|
||||
{ "Europe/Dublin" , 0x02CCBD },
|
||||
{ "Europe/Gibraltar" , 0x02D1CE },
|
||||
{ "Europe/Guernsey" , 0x02D625 },
|
||||
{ "Europe/Helsinki" , 0x02DB5C },
|
||||
{ "Europe/Isle_of_Man" , 0x02DE12 },
|
||||
{ "Europe/Istanbul" , 0x02E349 },
|
||||
{ "Europe/Jersey" , 0x02E736 },
|
||||
{ "Europe/Kaliningrad" , 0x02EC6D },
|
||||
{ "Europe/Kiev" , 0x02EED3 },
|
||||
{ "Europe/Lisbon" , 0x02F1EA },
|
||||
{ "Europe/Ljubljana" , 0x02F6EE },
|
||||
{ "Europe/London" , 0x02F9B7 },
|
||||
{ "Europe/Luxembourg" , 0x02FEEE },
|
||||
{ "Europe/Madrid" , 0x030344 },
|
||||
{ "Europe/Malta" , 0x03070A },
|
||||
{ "Europe/Mariehamn" , 0x030AC3 },
|
||||
{ "Europe/Minsk" , 0x030D79 },
|
||||
{ "Europe/Monaco" , 0x030F87 },
|
||||
{ "Europe/Moscow" , 0x0313C2 },
|
||||
{ "Europe/Nicosia" , 0x031613 },
|
||||
{ "Europe/Oslo" , 0x0318FB },
|
||||
{ "Europe/Paris" , 0x031C2D },
|
||||
{ "Europe/Podgorica" , 0x032073 },
|
||||
{ "Europe/Prague" , 0x03233C },
|
||||
{ "Europe/Riga" , 0x03266E },
|
||||
{ "Europe/Rome" , 0x0329B3 },
|
||||
{ "Europe/Samara" , 0x032D76 },
|
||||
{ "Europe/San_Marino" , 0x032FA9 },
|
||||
{ "Europe/Sarajevo" , 0x03336C },
|
||||
{ "Europe/Simferopol" , 0x033635 },
|
||||
{ "Europe/Skopje" , 0x033960 },
|
||||
{ "Europe/Sofia" , 0x033C29 },
|
||||
{ "Europe/Stockholm" , 0x033F31 },
|
||||
{ "Europe/Tallinn" , 0x0341E0 },
|
||||
{ "Europe/Tirane" , 0x03451A },
|
||||
{ "Europe/Tiraspol" , 0x034820 },
|
||||
{ "Europe/Uzhgorod" , 0x034BAE },
|
||||
{ "Europe/Vaduz" , 0x034EC5 },
|
||||
{ "Europe/Vatican" , 0x035158 },
|
||||
{ "Europe/Vienna" , 0x03551B },
|
||||
{ "Europe/Vilnius" , 0x035848 },
|
||||
{ "Europe/Volgograd" , 0x035B87 },
|
||||
{ "Europe/Warsaw" , 0x035D87 },
|
||||
{ "Europe/Zagreb" , 0x036168 },
|
||||
{ "Europe/Zaporozhye" , 0x036431 },
|
||||
{ "Europe/Zurich" , 0x036772 },
|
||||
{ "Factory" , 0x036A21 },
|
||||
{ "GB" , 0x036A92 },
|
||||
{ "GB-Eire" , 0x036FC9 },
|
||||
{ "GMT" , 0x037500 },
|
||||
{ "GMT+0" , 0x0375CC },
|
||||
{ "GMT-0" , 0x037588 },
|
||||
{ "GMT0" , 0x037544 },
|
||||
{ "Greenwich" , 0x037610 },
|
||||
{ "Hongkong" , 0x037654 },
|
||||
{ "HST" , 0x037816 },
|
||||
{ "Iceland" , 0x03785A },
|
||||
{ "Indian/Antananarivo" , 0x037A13 },
|
||||
{ "Indian/Chagos" , 0x037A87 },
|
||||
{ "Indian/Christmas" , 0x037AE9 },
|
||||
{ "Indian/Cocos" , 0x037B2D },
|
||||
{ "Indian/Comoro" , 0x037B71 },
|
||||
{ "Indian/Kerguelen" , 0x037BC6 },
|
||||
{ "Indian/Mahe" , 0x037C1B },
|
||||
{ "Indian/Maldives" , 0x037C70 },
|
||||
{ "Indian/Mauritius" , 0x037CC5 },
|
||||
{ "Indian/Mayotte" , 0x037D3B },
|
||||
{ "Indian/Reunion" , 0x037D90 },
|
||||
{ "Iran" , 0x037DE5 },
|
||||
{ "Israel" , 0x038053 },
|
||||
{ "Jamaica" , 0x038382 },
|
||||
{ "Japan" , 0x038447 },
|
||||
{ "Kwajalein" , 0x0384D0 },
|
||||
{ "Libya" , 0x038533 },
|
||||
{ "MET" , 0x03872C },
|
||||
{ "Mexico/BajaNorte" , 0x038A35 },
|
||||
{ "Mexico/BajaSur" , 0x038D9E },
|
||||
{ "Mexico/General" , 0x038FE3 },
|
||||
{ "MST" , 0x039241 },
|
||||
{ "MST7MDT" , 0x039285 },
|
||||
{ "Navajo" , 0x0395D6 },
|
||||
{ "NZ" , 0x03994F },
|
||||
{ "NZ-CHAT" , 0x039CCD },
|
||||
{ "Pacific/Apia" , 0x039FB5 },
|
||||
{ "Pacific/Auckland" , 0x03A151 },
|
||||
{ "Pacific/Chatham" , 0x03A4DD },
|
||||
{ "Pacific/Chuuk" , 0x03A7D4 },
|
||||
{ "Pacific/Easter" , 0x03A82D },
|
||||
{ "Pacific/Efate" , 0x03AB8B },
|
||||
{ "Pacific/Enderbury" , 0x03AC51 },
|
||||
{ "Pacific/Fakaofo" , 0x03ACBF },
|
||||
{ "Pacific/Fiji" , 0x03AD10 },
|
||||
{ "Pacific/Funafuti" , 0x03AEA3 },
|
||||
{ "Pacific/Galapagos" , 0x03AEE7 },
|
||||
{ "Pacific/Gambier" , 0x03AF5F },
|
||||
{ "Pacific/Guadalcanal" , 0x03AFC4 },
|
||||
{ "Pacific/Guam" , 0x03B019 },
|
||||
{ "Pacific/Honolulu" , 0x03B06F },
|
||||
{ "Pacific/Johnston" , 0x03B0E6 },
|
||||
{ "Pacific/Kiritimati" , 0x03B138 },
|
||||
{ "Pacific/Kosrae" , 0x03B1A3 },
|
||||
{ "Pacific/Kwajalein" , 0x03B200 },
|
||||
{ "Pacific/Majuro" , 0x03B26C },
|
||||
{ "Pacific/Marquesas" , 0x03B2CB },
|
||||
{ "Pacific/Midway" , 0x03B332 },
|
||||
{ "Pacific/Nauru" , 0x03B3BC },
|
||||
{ "Pacific/Niue" , 0x03B434 },
|
||||
{ "Pacific/Norfolk" , 0x03B492 },
|
||||
{ "Pacific/Noumea" , 0x03B4E7 },
|
||||
{ "Pacific/Pago_Pago" , 0x03B577 },
|
||||
{ "Pacific/Palau" , 0x03B600 },
|
||||
{ "Pacific/Pitcairn" , 0x03B644 },
|
||||
{ "Pacific/Pohnpei" , 0x03B699 },
|
||||
{ "Pacific/Ponape" , 0x03B6EE },
|
||||
{ "Pacific/Port_Moresby" , 0x03B733 },
|
||||
{ "Pacific/Rarotonga" , 0x03B777 },
|
||||
{ "Pacific/Saipan" , 0x03B853 },
|
||||
{ "Pacific/Samoa" , 0x03B8B6 },
|
||||
{ "Pacific/Tahiti" , 0x03B93F },
|
||||
{ "Pacific/Tarawa" , 0x03B9A4 },
|
||||
{ "Pacific/Tongatapu" , 0x03B9F8 },
|
||||
{ "Pacific/Truk" , 0x03BA84 },
|
||||
{ "Pacific/Wake" , 0x03BAC9 },
|
||||
{ "Pacific/Wallis" , 0x03BB19 },
|
||||
{ "Pacific/Yap" , 0x03BB5D },
|
||||
{ "Poland" , 0x03BBA2 },
|
||||
{ "Portugal" , 0x03BF83 },
|
||||
{ "PRC" , 0x03C47F },
|
||||
{ "PST8PDT" , 0x03C530 },
|
||||
{ "ROC" , 0x03C881 },
|
||||
{ "ROK" , 0x03C999 },
|
||||
{ "Singapore" , 0x03CA3D },
|
||||
{ "Turkey" , 0x03CAF4 },
|
||||
{ "UCT" , 0x03CEE1 },
|
||||
{ "Universal" , 0x03CF25 },
|
||||
{ "US/Alaska" , 0x03CF69 },
|
||||
{ "US/Aleutian" , 0x03D2D2 },
|
||||
{ "US/Arizona" , 0x03D638 },
|
||||
{ "US/Central" , 0x03D6C6 },
|
||||
{ "US/East-Indiana" , 0x03E0D0 },
|
||||
{ "US/Eastern" , 0x03DBD1 },
|
||||
{ "US/Hawaii" , 0x03E33A },
|
||||
{ "US/Indiana-Starke" , 0x03E3AB },
|
||||
{ "US/Michigan" , 0x03E71C },
|
||||
{ "US/Mountain" , 0x03EA53 },
|
||||
{ "US/Pacific" , 0x03EDCC },
|
||||
{ "US/Pacific-New" , 0x03F1D1 },
|
||||
{ "US/Samoa" , 0x03F5D6 },
|
||||
{ "UTC" , 0x03F65F },
|
||||
{ "W-SU" , 0x03F956 },
|
||||
{ "WET" , 0x03F6A3 },
|
||||
{ "Zulu" , 0x03FB90 },
|
||||
{ "Antarctica/Mawson" , 0x017D5F },
|
||||
{ "Antarctica/McMurdo" , 0x017DDB },
|
||||
{ "Antarctica/Palmer" , 0x0180DD },
|
||||
{ "Antarctica/Rothera" , 0x0183F9 },
|
||||
{ "Antarctica/South_Pole" , 0x01846F },
|
||||
{ "Antarctica/Syowa" , 0x018777 },
|
||||
{ "Antarctica/Vostok" , 0x0187E5 },
|
||||
{ "Arctic/Longyearbyen" , 0x018856 },
|
||||
{ "Asia/Aden" , 0x018B88 },
|
||||
{ "Asia/Almaty" , 0x018BDD },
|
||||
{ "Asia/Amman" , 0x018D5C },
|
||||
{ "Asia/Anadyr" , 0x019012 },
|
||||
{ "Asia/Aqtau" , 0x0191F7 },
|
||||
{ "Asia/Aqtobe" , 0x0193F6 },
|
||||
{ "Asia/Ashgabat" , 0x0195AE },
|
||||
{ "Asia/Ashkhabad" , 0x0196CB },
|
||||
{ "Asia/Baghdad" , 0x0197E8 },
|
||||
{ "Asia/Bahrain" , 0x01995D },
|
||||
{ "Asia/Baku" , 0x0199C3 },
|
||||
{ "Asia/Bangkok" , 0x019CAB },
|
||||
{ "Asia/Beirut" , 0x019D00 },
|
||||
{ "Asia/Bishkek" , 0x01A00D },
|
||||
{ "Asia/Brunei" , 0x01A1B9 },
|
||||
{ "Asia/Calcutta" , 0x01A21B },
|
||||
{ "Asia/Choibalsan" , 0x01A294 },
|
||||
{ "Asia/Chongqing" , 0x01A40D },
|
||||
{ "Asia/Chungking" , 0x01A4FC },
|
||||
{ "Asia/Colombo" , 0x01A5AB },
|
||||
{ "Asia/Dacca" , 0x01A647 },
|
||||
{ "Asia/Damascus" , 0x01A6ED },
|
||||
{ "Asia/Dhaka" , 0x01AA3D },
|
||||
{ "Asia/Dili" , 0x01AAE3 },
|
||||
{ "Asia/Dubai" , 0x01AB6C },
|
||||
{ "Asia/Dushanbe" , 0x01ABC1 },
|
||||
{ "Asia/Gaza" , 0x01ACC4 },
|
||||
{ "Asia/Harbin" , 0x01B017 },
|
||||
{ "Asia/Hebron" , 0x01B0FE },
|
||||
{ "Asia/Ho_Chi_Minh" , 0x01B45A },
|
||||
{ "Asia/Hong_Kong" , 0x01B4D2 },
|
||||
{ "Asia/Hovd" , 0x01B694 },
|
||||
{ "Asia/Irkutsk" , 0x01B80C },
|
||||
{ "Asia/Istanbul" , 0x01B9F2 },
|
||||
{ "Asia/Jakarta" , 0x01BDDF },
|
||||
{ "Asia/Jayapura" , 0x01BE89 },
|
||||
{ "Asia/Jerusalem" , 0x01BF25 },
|
||||
{ "Asia/Kabul" , 0x01C254 },
|
||||
{ "Asia/Kamchatka" , 0x01C2A5 },
|
||||
{ "Asia/Karachi" , 0x01C481 },
|
||||
{ "Asia/Kashgar" , 0x01C536 },
|
||||
{ "Asia/Kathmandu" , 0x01C607 },
|
||||
{ "Asia/Katmandu" , 0x01C66D },
|
||||
{ "Asia/Khandyga" , 0x01C6D3 },
|
||||
{ "Asia/Kolkata" , 0x01C8F8 },
|
||||
{ "Asia/Krasnoyarsk" , 0x01C971 },
|
||||
{ "Asia/Kuala_Lumpur" , 0x01CB59 },
|
||||
{ "Asia/Kuching" , 0x01CC16 },
|
||||
{ "Asia/Kuwait" , 0x01CD04 },
|
||||
{ "Asia/Macao" , 0x01CD59 },
|
||||
{ "Asia/Macau" , 0x01CE94 },
|
||||
{ "Asia/Magadan" , 0x01CFCF },
|
||||
{ "Asia/Makassar" , 0x01D1B1 },
|
||||
{ "Asia/Manila" , 0x01D275 },
|
||||
{ "Asia/Muscat" , 0x01D2FA },
|
||||
{ "Asia/Nicosia" , 0x01D34F },
|
||||
{ "Asia/Novokuznetsk" , 0x01D637 },
|
||||
{ "Asia/Novosibirsk" , 0x01D839 },
|
||||
{ "Asia/Omsk" , 0x01DA24 },
|
||||
{ "Asia/Oral" , 0x01DC0B },
|
||||
{ "Asia/Phnom_Penh" , 0x01DDDB },
|
||||
{ "Asia/Pontianak" , 0x01DE53 },
|
||||
{ "Asia/Pyongyang" , 0x01DF14 },
|
||||
{ "Asia/Qatar" , 0x01DF81 },
|
||||
{ "Asia/Qyzylorda" , 0x01DFE7 },
|
||||
{ "Asia/Rangoon" , 0x01E1BD },
|
||||
{ "Asia/Riyadh" , 0x01E235 },
|
||||
{ "Asia/Saigon" , 0x01E28A },
|
||||
{ "Asia/Sakhalin" , 0x01E302 },
|
||||
{ "Asia/Samarkand" , 0x01E4F9 },
|
||||
{ "Asia/Seoul" , 0x01E62F },
|
||||
{ "Asia/Shanghai" , 0x01E6D3 },
|
||||
{ "Asia/Singapore" , 0x01E7B3 },
|
||||
{ "Asia/Taipei" , 0x01E86A },
|
||||
{ "Asia/Tashkent" , 0x01E982 },
|
||||
{ "Asia/Tbilisi" , 0x01EAB3 },
|
||||
{ "Asia/Tehran" , 0x01EC6D },
|
||||
{ "Asia/Tel_Aviv" , 0x01EEDB },
|
||||
{ "Asia/Thimbu" , 0x01F20A },
|
||||
{ "Asia/Thimphu" , 0x01F270 },
|
||||
{ "Asia/Tokyo" , 0x01F2D6 },
|
||||
{ "Asia/Ujung_Pandang" , 0x01F35F },
|
||||
{ "Asia/Ulaanbaatar" , 0x01F3DB },
|
||||
{ "Asia/Ulan_Bator" , 0x01F536 },
|
||||
{ "Asia/Urumqi" , 0x01F683 },
|
||||
{ "Asia/Ust-Nera" , 0x01F74A },
|
||||
{ "Asia/Vientiane" , 0x01F94F },
|
||||
{ "Asia/Vladivostok" , 0x01F9C7 },
|
||||
{ "Asia/Yakutsk" , 0x01FBB3 },
|
||||
{ "Asia/Yekaterinburg" , 0x01FD98 },
|
||||
{ "Asia/Yerevan" , 0x01FFA3 },
|
||||
{ "Atlantic/Azores" , 0x0201A3 },
|
||||
{ "Atlantic/Bermuda" , 0x0206A6 },
|
||||
{ "Atlantic/Canary" , 0x020987 },
|
||||
{ "Atlantic/Cape_Verde" , 0x020C5D },
|
||||
{ "Atlantic/Faeroe" , 0x020CD6 },
|
||||
{ "Atlantic/Faroe" , 0x020F7A },
|
||||
{ "Atlantic/Jan_Mayen" , 0x02121E },
|
||||
{ "Atlantic/Madeira" , 0x021550 },
|
||||
{ "Atlantic/Reykjavik" , 0x021A59 },
|
||||
{ "Atlantic/South_Georgia" , 0x021C12 },
|
||||
{ "Atlantic/St_Helena" , 0x021E24 },
|
||||
{ "Atlantic/Stanley" , 0x021C56 },
|
||||
{ "Australia/ACT" , 0x021E79 },
|
||||
{ "Australia/Adelaide" , 0x022196 },
|
||||
{ "Australia/Brisbane" , 0x0224C2 },
|
||||
{ "Australia/Broken_Hill" , 0x022589 },
|
||||
{ "Australia/Canberra" , 0x0228C7 },
|
||||
{ "Australia/Currie" , 0x022BE4 },
|
||||
{ "Australia/Darwin" , 0x022F17 },
|
||||
{ "Australia/Eucla" , 0x022F9D },
|
||||
{ "Australia/Hobart" , 0x023072 },
|
||||
{ "Australia/LHI" , 0x0233D0 },
|
||||
{ "Australia/Lindeman" , 0x02366B },
|
||||
{ "Australia/Lord_Howe" , 0x02374C },
|
||||
{ "Australia/Melbourne" , 0x0239F7 },
|
||||
{ "Australia/North" , 0x023D1C },
|
||||
{ "Australia/NSW" , 0x023D90 },
|
||||
{ "Australia/Perth" , 0x0240AD },
|
||||
{ "Australia/Queensland" , 0x024185 },
|
||||
{ "Australia/South" , 0x024231 },
|
||||
{ "Australia/Sydney" , 0x02454E },
|
||||
{ "Australia/Tasmania" , 0x02488B },
|
||||
{ "Australia/Victoria" , 0x024BD0 },
|
||||
{ "Australia/West" , 0x024EED },
|
||||
{ "Australia/Yancowinna" , 0x024FA3 },
|
||||
{ "Brazil/Acre" , 0x0252C5 },
|
||||
{ "Brazil/DeNoronha" , 0x0253C4 },
|
||||
{ "Brazil/East" , 0x0254E4 },
|
||||
{ "Brazil/West" , 0x0257C1 },
|
||||
{ "Canada/Atlantic" , 0x0258B9 },
|
||||
{ "Canada/Central" , 0x025DA1 },
|
||||
{ "Canada/East-Saskatchewan" , 0x0266AB },
|
||||
{ "Canada/Eastern" , 0x0261BB },
|
||||
{ "Canada/Mountain" , 0x026834 },
|
||||
{ "Canada/Newfoundland" , 0x026BAA },
|
||||
{ "Canada/Pacific" , 0x0270D5 },
|
||||
{ "Canada/Saskatchewan" , 0x0274EE },
|
||||
{ "Canada/Yukon" , 0x027677 },
|
||||
{ "CET" , 0x02797A },
|
||||
{ "Chile/Continental" , 0x027C83 },
|
||||
{ "Chile/EasterIsland" , 0x02801E },
|
||||
{ "CST6CDT" , 0x028360 },
|
||||
{ "Cuba" , 0x0286B1 },
|
||||
{ "EET" , 0x028A24 },
|
||||
{ "Egypt" , 0x028CD7 },
|
||||
{ "Eire" , 0x028F9A },
|
||||
{ "EST" , 0x0294AB },
|
||||
{ "EST5EDT" , 0x0294EF },
|
||||
{ "Etc/GMT" , 0x029840 },
|
||||
{ "Etc/GMT+0" , 0x02990C },
|
||||
{ "Etc/GMT+1" , 0x029996 },
|
||||
{ "Etc/GMT+10" , 0x029A23 },
|
||||
{ "Etc/GMT+11" , 0x029AB1 },
|
||||
{ "Etc/GMT+12" , 0x029B3F },
|
||||
{ "Etc/GMT+2" , 0x029C5A },
|
||||
{ "Etc/GMT+3" , 0x029CE6 },
|
||||
{ "Etc/GMT+4" , 0x029D72 },
|
||||
{ "Etc/GMT+5" , 0x029DFE },
|
||||
{ "Etc/GMT+6" , 0x029E8A },
|
||||
{ "Etc/GMT+7" , 0x029F16 },
|
||||
{ "Etc/GMT+8" , 0x029FA2 },
|
||||
{ "Etc/GMT+9" , 0x02A02E },
|
||||
{ "Etc/GMT-0" , 0x0298C8 },
|
||||
{ "Etc/GMT-1" , 0x029950 },
|
||||
{ "Etc/GMT-10" , 0x0299DC },
|
||||
{ "Etc/GMT-11" , 0x029A6A },
|
||||
{ "Etc/GMT-12" , 0x029AF8 },
|
||||
{ "Etc/GMT-13" , 0x029B86 },
|
||||
{ "Etc/GMT-14" , 0x029BCD },
|
||||
{ "Etc/GMT-2" , 0x029C14 },
|
||||
{ "Etc/GMT-3" , 0x029CA0 },
|
||||
{ "Etc/GMT-4" , 0x029D2C },
|
||||
{ "Etc/GMT-5" , 0x029DB8 },
|
||||
{ "Etc/GMT-6" , 0x029E44 },
|
||||
{ "Etc/GMT-7" , 0x029ED0 },
|
||||
{ "Etc/GMT-8" , 0x029F5C },
|
||||
{ "Etc/GMT-9" , 0x029FE8 },
|
||||
{ "Etc/GMT0" , 0x029884 },
|
||||
{ "Etc/Greenwich" , 0x02A074 },
|
||||
{ "Etc/UCT" , 0x02A0B8 },
|
||||
{ "Etc/Universal" , 0x02A0FC },
|
||||
{ "Etc/UTC" , 0x02A140 },
|
||||
{ "Etc/Zulu" , 0x02A184 },
|
||||
{ "Europe/Amsterdam" , 0x02A1C8 },
|
||||
{ "Europe/Andorra" , 0x02A606 },
|
||||
{ "Europe/Athens" , 0x02A882 },
|
||||
{ "Europe/Belfast" , 0x02ABC5 },
|
||||
{ "Europe/Belgrade" , 0x02B0FC },
|
||||
{ "Europe/Berlin" , 0x02B3C5 },
|
||||
{ "Europe/Bratislava" , 0x02B729 },
|
||||
{ "Europe/Brussels" , 0x02BA5B },
|
||||
{ "Europe/Bucharest" , 0x02BE92 },
|
||||
{ "Europe/Budapest" , 0x02C1BC },
|
||||
{ "Europe/Busingen" , 0x02C52F },
|
||||
{ "Europe/Chisinau" , 0x02C7E6 },
|
||||
{ "Europe/Copenhagen" , 0x02CB74 },
|
||||
{ "Europe/Dublin" , 0x02CE7E },
|
||||
{ "Europe/Gibraltar" , 0x02D38F },
|
||||
{ "Europe/Guernsey" , 0x02D7E6 },
|
||||
{ "Europe/Helsinki" , 0x02DD1D },
|
||||
{ "Europe/Isle_of_Man" , 0x02DFD3 },
|
||||
{ "Europe/Istanbul" , 0x02E50A },
|
||||
{ "Europe/Jersey" , 0x02E8F7 },
|
||||
{ "Europe/Kaliningrad" , 0x02EE2E },
|
||||
{ "Europe/Kiev" , 0x02F094 },
|
||||
{ "Europe/Lisbon" , 0x02F3AB },
|
||||
{ "Europe/Ljubljana" , 0x02F8AF },
|
||||
{ "Europe/London" , 0x02FB78 },
|
||||
{ "Europe/Luxembourg" , 0x0300AF },
|
||||
{ "Europe/Madrid" , 0x030505 },
|
||||
{ "Europe/Malta" , 0x0308CB },
|
||||
{ "Europe/Mariehamn" , 0x030C84 },
|
||||
{ "Europe/Minsk" , 0x030F3A },
|
||||
{ "Europe/Monaco" , 0x031148 },
|
||||
{ "Europe/Moscow" , 0x031583 },
|
||||
{ "Europe/Nicosia" , 0x0317D4 },
|
||||
{ "Europe/Oslo" , 0x031ABC },
|
||||
{ "Europe/Paris" , 0x031DEE },
|
||||
{ "Europe/Podgorica" , 0x032234 },
|
||||
{ "Europe/Prague" , 0x0324FD },
|
||||
{ "Europe/Riga" , 0x03282F },
|
||||
{ "Europe/Rome" , 0x032B74 },
|
||||
{ "Europe/Samara" , 0x032F37 },
|
||||
{ "Europe/San_Marino" , 0x03316A },
|
||||
{ "Europe/Sarajevo" , 0x03352D },
|
||||
{ "Europe/Simferopol" , 0x0337F6 },
|
||||
{ "Europe/Skopje" , 0x033B21 },
|
||||
{ "Europe/Sofia" , 0x033DEA },
|
||||
{ "Europe/Stockholm" , 0x0340F2 },
|
||||
{ "Europe/Tallinn" , 0x0343A1 },
|
||||
{ "Europe/Tirane" , 0x0346DB },
|
||||
{ "Europe/Tiraspol" , 0x0349E1 },
|
||||
{ "Europe/Uzhgorod" , 0x034D6F },
|
||||
{ "Europe/Vaduz" , 0x035086 },
|
||||
{ "Europe/Vatican" , 0x035319 },
|
||||
{ "Europe/Vienna" , 0x0356DC },
|
||||
{ "Europe/Vilnius" , 0x035A09 },
|
||||
{ "Europe/Volgograd" , 0x035D48 },
|
||||
{ "Europe/Warsaw" , 0x035F48 },
|
||||
{ "Europe/Zagreb" , 0x036329 },
|
||||
{ "Europe/Zaporozhye" , 0x0365F2 },
|
||||
{ "Europe/Zurich" , 0x036933 },
|
||||
{ "Factory" , 0x036BE2 },
|
||||
{ "GB" , 0x036C53 },
|
||||
{ "GB-Eire" , 0x03718A },
|
||||
{ "GMT" , 0x0376C1 },
|
||||
{ "GMT+0" , 0x03778D },
|
||||
{ "GMT-0" , 0x037749 },
|
||||
{ "GMT0" , 0x037705 },
|
||||
{ "Greenwich" , 0x0377D1 },
|
||||
{ "Hongkong" , 0x037815 },
|
||||
{ "HST" , 0x0379D7 },
|
||||
{ "Iceland" , 0x037A1B },
|
||||
{ "Indian/Antananarivo" , 0x037BD4 },
|
||||
{ "Indian/Chagos" , 0x037C48 },
|
||||
{ "Indian/Christmas" , 0x037CAA },
|
||||
{ "Indian/Cocos" , 0x037CEE },
|
||||
{ "Indian/Comoro" , 0x037D32 },
|
||||
{ "Indian/Kerguelen" , 0x037D87 },
|
||||
{ "Indian/Mahe" , 0x037DDC },
|
||||
{ "Indian/Maldives" , 0x037E31 },
|
||||
{ "Indian/Mauritius" , 0x037E86 },
|
||||
{ "Indian/Mayotte" , 0x037EFC },
|
||||
{ "Indian/Reunion" , 0x037F51 },
|
||||
{ "Iran" , 0x037FA6 },
|
||||
{ "Israel" , 0x038214 },
|
||||
{ "Jamaica" , 0x038543 },
|
||||
{ "Japan" , 0x038608 },
|
||||
{ "Kwajalein" , 0x038691 },
|
||||
{ "Libya" , 0x0386F4 },
|
||||
{ "MET" , 0x0388ED },
|
||||
{ "Mexico/BajaNorte" , 0x038BF6 },
|
||||
{ "Mexico/BajaSur" , 0x038F5F },
|
||||
{ "Mexico/General" , 0x0391A4 },
|
||||
{ "MST" , 0x039402 },
|
||||
{ "MST7MDT" , 0x039446 },
|
||||
{ "Navajo" , 0x039797 },
|
||||
{ "NZ" , 0x039B10 },
|
||||
{ "NZ-CHAT" , 0x039E8E },
|
||||
{ "Pacific/Apia" , 0x03A176 },
|
||||
{ "Pacific/Auckland" , 0x03A312 },
|
||||
{ "Pacific/Chatham" , 0x03A69E },
|
||||
{ "Pacific/Chuuk" , 0x03A995 },
|
||||
{ "Pacific/Easter" , 0x03A9EE },
|
||||
{ "Pacific/Efate" , 0x03AD4C },
|
||||
{ "Pacific/Enderbury" , 0x03AE12 },
|
||||
{ "Pacific/Fakaofo" , 0x03AE80 },
|
||||
{ "Pacific/Fiji" , 0x03AED1 },
|
||||
{ "Pacific/Funafuti" , 0x03B064 },
|
||||
{ "Pacific/Galapagos" , 0x03B0A8 },
|
||||
{ "Pacific/Gambier" , 0x03B120 },
|
||||
{ "Pacific/Guadalcanal" , 0x03B185 },
|
||||
{ "Pacific/Guam" , 0x03B1DA },
|
||||
{ "Pacific/Honolulu" , 0x03B230 },
|
||||
{ "Pacific/Johnston" , 0x03B2A7 },
|
||||
{ "Pacific/Kiritimati" , 0x03B2F9 },
|
||||
{ "Pacific/Kosrae" , 0x03B364 },
|
||||
{ "Pacific/Kwajalein" , 0x03B3C1 },
|
||||
{ "Pacific/Majuro" , 0x03B42D },
|
||||
{ "Pacific/Marquesas" , 0x03B48C },
|
||||
{ "Pacific/Midway" , 0x03B4F3 },
|
||||
{ "Pacific/Nauru" , 0x03B57D },
|
||||
{ "Pacific/Niue" , 0x03B5F5 },
|
||||
{ "Pacific/Norfolk" , 0x03B653 },
|
||||
{ "Pacific/Noumea" , 0x03B6A8 },
|
||||
{ "Pacific/Pago_Pago" , 0x03B738 },
|
||||
{ "Pacific/Palau" , 0x03B7C1 },
|
||||
{ "Pacific/Pitcairn" , 0x03B805 },
|
||||
{ "Pacific/Pohnpei" , 0x03B85A },
|
||||
{ "Pacific/Ponape" , 0x03B8AF },
|
||||
{ "Pacific/Port_Moresby" , 0x03B8F4 },
|
||||
{ "Pacific/Rarotonga" , 0x03B938 },
|
||||
{ "Pacific/Saipan" , 0x03BA14 },
|
||||
{ "Pacific/Samoa" , 0x03BA77 },
|
||||
{ "Pacific/Tahiti" , 0x03BB00 },
|
||||
{ "Pacific/Tarawa" , 0x03BB65 },
|
||||
{ "Pacific/Tongatapu" , 0x03BBB9 },
|
||||
{ "Pacific/Truk" , 0x03BC45 },
|
||||
{ "Pacific/Wake" , 0x03BC8A },
|
||||
{ "Pacific/Wallis" , 0x03BCDA },
|
||||
{ "Pacific/Yap" , 0x03BD1E },
|
||||
{ "Poland" , 0x03BD63 },
|
||||
{ "Portugal" , 0x03C144 },
|
||||
{ "PRC" , 0x03C640 },
|
||||
{ "PST8PDT" , 0x03C6F1 },
|
||||
{ "ROC" , 0x03CA42 },
|
||||
{ "ROK" , 0x03CB5A },
|
||||
{ "Singapore" , 0x03CBFE },
|
||||
{ "Turkey" , 0x03CCB5 },
|
||||
{ "UCT" , 0x03D0A2 },
|
||||
{ "Universal" , 0x03D0E6 },
|
||||
{ "US/Alaska" , 0x03D12A },
|
||||
{ "US/Aleutian" , 0x03D493 },
|
||||
{ "US/Arizona" , 0x03D7F9 },
|
||||
{ "US/Central" , 0x03D887 },
|
||||
{ "US/East-Indiana" , 0x03E291 },
|
||||
{ "US/Eastern" , 0x03DD92 },
|
||||
{ "US/Hawaii" , 0x03E4FB },
|
||||
{ "US/Indiana-Starke" , 0x03E56C },
|
||||
{ "US/Michigan" , 0x03E8DD },
|
||||
{ "US/Mountain" , 0x03EC14 },
|
||||
{ "US/Pacific" , 0x03EF8D },
|
||||
{ "US/Pacific-New" , 0x03F392 },
|
||||
{ "US/Samoa" , 0x03F797 },
|
||||
{ "UTC" , 0x03F820 },
|
||||
{ "W-SU" , 0x03FB17 },
|
||||
{ "WET" , 0x03F864 },
|
||||
{ "Zulu" , 0x03FD51 },
|
||||
};
|
||||
/* This is a generated file, do not modify */
|
||||
const unsigned char timelib_timezone_db_data_builtin[261076] = {
|
||||
const unsigned char timelib_timezone_db_data_builtin[261525] = {
|
||||
|
||||
|
||||
/* Africa/Abidjan */
|
||||
@@ -1868,19 +1868,19 @@ const unsigned char timelib_timezone_db_data_builtin[261076] = {
|
||||
0x45, 0x31, 0xB2, 0x40, 0x45, 0xF3, 0x70, 0xB0, 0x47, 0x1A, 0xCE, 0xC0, 0x47, 0xD3, 0x52, 0xB0,
|
||||
0x48, 0xFA, 0xB0, 0xC0, 0x49, 0xB3, 0x34, 0xB0, 0x4A, 0xDA, 0x92, 0xC0, 0x4B, 0xC1, 0x3B, 0x30,
|
||||
0x4C, 0xA7, 0xFF, 0xC0, 0x4D, 0xA1, 0x1D, 0x30, 0x4E, 0x87, 0xE1, 0xC0, 0x4F, 0x80, 0xFF, 0x30,
|
||||
0x50, 0x70, 0xFE, 0x40, 0x51, 0x4E, 0x6C, 0x30, 0x52, 0x50, 0xE0, 0x40, 0x53, 0x49, 0xFD, 0xB0,
|
||||
0x54, 0x30, 0xC2, 0x40, 0x55, 0x29, 0xDF, 0xB0, 0x56, 0x10, 0xA4, 0x40, 0x57, 0x09, 0xC1, 0xB0,
|
||||
0x57, 0xF0, 0x86, 0x40, 0x58, 0xE9, 0xA3, 0xB0, 0x59, 0xD0, 0x68, 0x40, 0x5A, 0xC9, 0x85, 0xB0,
|
||||
0x5B, 0xB9, 0x84, 0xC0, 0x5C, 0xB2, 0xA2, 0x30, 0x5D, 0x99, 0x66, 0xC0, 0x5E, 0x92, 0x84, 0x30,
|
||||
0x5F, 0x79, 0x48, 0xC0, 0x60, 0x72, 0x66, 0x30, 0x61, 0x59, 0x2A, 0xC0, 0x62, 0x52, 0x48, 0x30,
|
||||
0x63, 0x39, 0x0C, 0xC0, 0x64, 0x32, 0x2A, 0x30, 0x65, 0x18, 0xEE, 0xC0, 0x66, 0x1B, 0x46, 0xB0,
|
||||
0x67, 0x02, 0x0B, 0x40, 0x67, 0xFB, 0x28, 0xB0, 0x68, 0xE1, 0xED, 0x40, 0x69, 0xDB, 0x0A, 0xB0,
|
||||
0x6A, 0xC1, 0xCF, 0x40, 0x6B, 0xBA, 0xEC, 0xB0, 0x6C, 0xA1, 0xB1, 0x40, 0x6D, 0x9A, 0xCE, 0xB0,
|
||||
0x6E, 0x81, 0x93, 0x40, 0x6F, 0x7A, 0xB0, 0xB0, 0x70, 0x6A, 0xAF, 0xC0, 0x71, 0x63, 0xCD, 0x30,
|
||||
0x72, 0x4A, 0x91, 0xC0, 0x73, 0x43, 0xAF, 0x30, 0x74, 0x2A, 0x73, 0xC0, 0x75, 0x23, 0x91, 0x30,
|
||||
0x76, 0x0A, 0x55, 0xC0, 0x77, 0x03, 0x73, 0x30, 0x77, 0xEA, 0x37, 0xC0, 0x78, 0xE3, 0x55, 0x30,
|
||||
0x79, 0xCA, 0x19, 0xC0, 0x7A, 0xC3, 0x37, 0x30, 0x7B, 0xB3, 0x36, 0x40, 0x7C, 0xAC, 0x53, 0xB0,
|
||||
0x7D, 0x93, 0x18, 0x40, 0x7E, 0x8C, 0x35, 0xB0, 0x7F, 0x72, 0xFA, 0x40, 0x01, 0x02, 0x01, 0x03,
|
||||
0x50, 0x70, 0xFE, 0x40, 0x51, 0x4E, 0x6C, 0x30, 0x52, 0x50, 0xE0, 0x40, 0x53, 0x2E, 0x4E, 0x30,
|
||||
0x54, 0x30, 0xC2, 0x40, 0x55, 0x0E, 0x30, 0x30, 0x56, 0x10, 0xA4, 0x40, 0x56, 0xF7, 0x4C, 0xB0,
|
||||
0x57, 0xF0, 0x86, 0x40, 0x58, 0xD7, 0x2E, 0xB0, 0x59, 0xD0, 0x68, 0x40, 0x5A, 0xB7, 0x10, 0xB0,
|
||||
0x5B, 0xB9, 0x84, 0xC0, 0x5C, 0x96, 0xF2, 0xB0, 0x5D, 0x99, 0x66, 0xC0, 0x5E, 0x76, 0xD4, 0xB0,
|
||||
0x5F, 0x79, 0x48, 0xC0, 0x60, 0x5F, 0xF1, 0x30, 0x61, 0x59, 0x2A, 0xC0, 0x62, 0x3F, 0xD3, 0x30,
|
||||
0x63, 0x39, 0x0C, 0xC0, 0x64, 0x1F, 0xB5, 0x30, 0x65, 0x18, 0xEE, 0xC0, 0x65, 0xFF, 0x97, 0x30,
|
||||
0x67, 0x02, 0x0B, 0x40, 0x67, 0xDF, 0x79, 0x30, 0x68, 0xE1, 0xED, 0x40, 0x69, 0xBF, 0x5B, 0x30,
|
||||
0x6A, 0xC1, 0xCF, 0x40, 0x6B, 0xA8, 0x77, 0xB0, 0x6C, 0xA1, 0xB1, 0x40, 0x6D, 0x88, 0x59, 0xB0,
|
||||
0x6E, 0x81, 0x93, 0x40, 0x6F, 0x68, 0x3B, 0xB0, 0x70, 0x6A, 0xAF, 0xC0, 0x71, 0x48, 0x1D, 0xB0,
|
||||
0x72, 0x4A, 0x91, 0xC0, 0x73, 0x27, 0xFF, 0xB0, 0x74, 0x2A, 0x73, 0xC0, 0x75, 0x11, 0x1C, 0x30,
|
||||
0x76, 0x0A, 0x55, 0xC0, 0x76, 0xF0, 0xFE, 0x30, 0x77, 0xEA, 0x37, 0xC0, 0x78, 0xD0, 0xE0, 0x30,
|
||||
0x79, 0xCA, 0x19, 0xC0, 0x7A, 0xB0, 0xC2, 0x30, 0x7B, 0xB3, 0x36, 0x40, 0x7C, 0x90, 0xA4, 0x30,
|
||||
0x7D, 0x93, 0x18, 0x40, 0x7E, 0x70, 0x86, 0x30, 0x7F, 0x72, 0xFA, 0x40, 0x01, 0x02, 0x01, 0x03,
|
||||
0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03,
|
||||
0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03,
|
||||
0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03,
|
||||
@@ -7214,46 +7214,43 @@ const unsigned char timelib_timezone_db_data_builtin[261076] = {
|
||||
0x69, 0x65,
|
||||
|
||||
/* Antarctica/Macquarie */
|
||||
0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0D, 0x91, 0x05, 0x5B, 0x00,
|
||||
0x9B, 0xD5, 0x78, 0x80, 0x9C, 0xBC, 0x20, 0xF0, 0xCB, 0x54, 0xB3, 0x00, 0xCB, 0xC7, 0x57, 0x70,
|
||||
0xCC, 0xB7, 0x56, 0x80, 0xCD, 0xA7, 0x39, 0x70, 0xCE, 0xA0, 0x73, 0x00, 0xCF, 0x87, 0x1B, 0x70,
|
||||
0xFB, 0xC2, 0x8D, 0x00, 0xFC, 0xB2, 0x7E, 0x00, 0xFD, 0xC7, 0x59, 0x00, 0xFE, 0x76, 0xB0, 0x80,
|
||||
0xFF, 0xA7, 0x3B, 0x00, 0x00, 0x56, 0x92, 0x80, 0x01, 0x87, 0x1D, 0x00, 0x02, 0x3F, 0xAF, 0x00,
|
||||
0x03, 0x70, 0x39, 0x80, 0x04, 0x0D, 0x1C, 0x00, 0x05, 0x50, 0x1B, 0x80, 0x05, 0xF6, 0x38, 0x80,
|
||||
0x07, 0x2F, 0xFD, 0x80, 0x07, 0xD6, 0x1A, 0x80, 0x09, 0x0F, 0xDF, 0x80, 0x09, 0xB5, 0xFC, 0x80,
|
||||
0x0A, 0xEF, 0xC1, 0x80, 0x0B, 0x9F, 0x19, 0x00, 0x0C, 0xD8, 0xDE, 0x00, 0x0D, 0x7E, 0xFB, 0x00,
|
||||
0x0E, 0xB8, 0xC0, 0x00, 0x0F, 0x5E, 0xDD, 0x00, 0x10, 0x98, 0xA2, 0x00, 0x11, 0x3E, 0xBF, 0x00,
|
||||
0x12, 0x78, 0x84, 0x00, 0x13, 0x1E, 0xA1, 0x00, 0x14, 0x58, 0x66, 0x00, 0x14, 0xFE, 0x83, 0x00,
|
||||
0x16, 0x38, 0x48, 0x00, 0x17, 0x03, 0x4F, 0x00, 0x18, 0x21, 0x64, 0x80, 0x18, 0xE3, 0x31, 0x00,
|
||||
0x1A, 0x01, 0x46, 0x80, 0x1A, 0xA7, 0x63, 0x80, 0x1B, 0xE1, 0x28, 0x80, 0x1C, 0x87, 0x45, 0x80,
|
||||
0x1D, 0xC1, 0x0A, 0x80, 0x1E, 0x67, 0x27, 0x80, 0x1F, 0x97, 0xB2, 0x00, 0x20, 0x59, 0x7E, 0x80,
|
||||
0x21, 0x80, 0xCE, 0x80, 0x22, 0x42, 0x9B, 0x00, 0x23, 0x69, 0xEB, 0x00, 0x24, 0x22, 0x7D, 0x00,
|
||||
0x25, 0x49, 0xCD, 0x00, 0x26, 0x02, 0x5F, 0x00, 0x27, 0x29, 0xAF, 0x00, 0x27, 0xF4, 0xB6, 0x00,
|
||||
0x28, 0xED, 0xE1, 0x80, 0x29, 0xD4, 0x98, 0x00, 0x2A, 0xCD, 0xC3, 0x80, 0x2B, 0xB4, 0x7A, 0x00,
|
||||
0x2C, 0xAD, 0xA5, 0x80, 0x2D, 0x94, 0x5C, 0x00, 0x2E, 0x8D, 0x87, 0x80, 0x2F, 0x74, 0x3E, 0x00,
|
||||
0x30, 0x6D, 0x69, 0x80, 0x31, 0x5D, 0x5A, 0x80, 0x32, 0x56, 0x86, 0x00, 0x33, 0x3D, 0x3C, 0x80,
|
||||
0x34, 0x36, 0x68, 0x00, 0x35, 0x1D, 0x1E, 0x80, 0x36, 0x16, 0x4A, 0x00, 0x36, 0xFD, 0x00, 0x80,
|
||||
0x37, 0xF6, 0x2C, 0x00, 0x38, 0xDC, 0xE2, 0x80, 0x39, 0xA7, 0xE9, 0x80, 0x3A, 0xBC, 0xC4, 0x80,
|
||||
0x3B, 0xBF, 0x2A, 0x80, 0x3C, 0xA5, 0xE1, 0x00, 0x3D, 0x9F, 0x0C, 0x80, 0x3E, 0x85, 0xC3, 0x00,
|
||||
0x3F, 0x7E, 0xEE, 0x80, 0x40, 0x65, 0xA5, 0x00, 0x41, 0x5E, 0xD0, 0x80, 0x42, 0x45, 0x87, 0x00,
|
||||
0x43, 0x3E, 0xB2, 0x80, 0x44, 0x2E, 0xA3, 0x80, 0x45, 0x1E, 0x94, 0x80, 0x46, 0x05, 0x4B, 0x00,
|
||||
0x47, 0x07, 0xB1, 0x00, 0x47, 0xF7, 0xA2, 0x00, 0x48, 0xE7, 0x93, 0x00, 0x49, 0xD7, 0x84, 0x00,
|
||||
0x4A, 0xC7, 0x75, 0x00, 0x4B, 0xB7, 0x66, 0x00, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
|
||||
0x01, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
|
||||
0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
|
||||
0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
|
||||
0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
|
||||
0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
|
||||
0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8C,
|
||||
0xA0, 0x00, 0x04, 0x00, 0x00, 0x9A, 0xB0, 0x01, 0x04, 0x00, 0x00, 0x9A, 0xB0, 0x01, 0x04, 0x00,
|
||||
0x00, 0x8C, 0xA0, 0x00, 0x04, 0x00, 0x00, 0x9A, 0xB0, 0x00, 0x08, 0x7A, 0x7A, 0x7A, 0x00, 0x45,
|
||||
0x53, 0x54, 0x00, 0x4D, 0x49, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x2B, 0x30, 0x02, 0x05, 0x32, 0x58, 0x00, 0x00, 0x00, 0x2A,
|
||||
0x4D, 0x61, 0x63, 0x71, 0x75, 0x61, 0x72, 0x69, 0x65, 0x20, 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64,
|
||||
0x20, 0x53, 0x74, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x2C, 0x20, 0x4D, 0x61, 0x63, 0x71, 0x75, 0x61,
|
||||
0x72, 0x69, 0x65, 0x20, 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64,
|
||||
0x00, 0x00, 0x00, 0x5A, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0D, 0x9B, 0xD5, 0x78, 0x80,
|
||||
0x9C, 0xBC, 0x20, 0xF0, 0xA0, 0x87, 0xB4, 0x60, 0xD7, 0x0C, 0x68, 0x00, 0xFB, 0xC2, 0x8D, 0x00,
|
||||
0xFC, 0xB2, 0x7E, 0x00, 0xFD, 0xC7, 0x59, 0x00, 0xFE, 0x76, 0xB0, 0x80, 0xFF, 0xA7, 0x3B, 0x00,
|
||||
0x00, 0x56, 0x92, 0x80, 0x01, 0x87, 0x1D, 0x00, 0x02, 0x3F, 0xAF, 0x00, 0x03, 0x70, 0x39, 0x80,
|
||||
0x04, 0x0D, 0x1C, 0x00, 0x05, 0x50, 0x1B, 0x80, 0x05, 0xF6, 0x38, 0x80, 0x07, 0x2F, 0xFD, 0x80,
|
||||
0x07, 0xD6, 0x1A, 0x80, 0x09, 0x0F, 0xDF, 0x80, 0x09, 0xB5, 0xFC, 0x80, 0x0A, 0xEF, 0xC1, 0x80,
|
||||
0x0B, 0x9F, 0x19, 0x00, 0x0C, 0xD8, 0xDE, 0x00, 0x0D, 0x7E, 0xFB, 0x00, 0x0E, 0xB8, 0xC0, 0x00,
|
||||
0x0F, 0x5E, 0xDD, 0x00, 0x10, 0x98, 0xA2, 0x00, 0x11, 0x3E, 0xBF, 0x00, 0x12, 0x78, 0x84, 0x00,
|
||||
0x13, 0x1E, 0xA1, 0x00, 0x14, 0x58, 0x66, 0x00, 0x14, 0xFE, 0x83, 0x00, 0x16, 0x38, 0x48, 0x00,
|
||||
0x17, 0x03, 0x4F, 0x00, 0x18, 0x21, 0x64, 0x80, 0x18, 0xE3, 0x31, 0x00, 0x1A, 0x01, 0x46, 0x80,
|
||||
0x1A, 0xA7, 0x63, 0x80, 0x1B, 0xE1, 0x28, 0x80, 0x1C, 0x87, 0x45, 0x80, 0x1D, 0xC1, 0x0A, 0x80,
|
||||
0x1E, 0x67, 0x27, 0x80, 0x1F, 0x97, 0xB2, 0x00, 0x20, 0x59, 0x7E, 0x80, 0x21, 0x80, 0xCE, 0x80,
|
||||
0x22, 0x42, 0x9B, 0x00, 0x23, 0x69, 0xEB, 0x00, 0x24, 0x22, 0x7D, 0x00, 0x25, 0x49, 0xCD, 0x00,
|
||||
0x26, 0x02, 0x5F, 0x00, 0x27, 0x29, 0xAF, 0x00, 0x27, 0xF4, 0xB6, 0x00, 0x28, 0xED, 0xE1, 0x80,
|
||||
0x29, 0xD4, 0x98, 0x00, 0x2A, 0xCD, 0xC3, 0x80, 0x2B, 0xB4, 0x7A, 0x00, 0x2C, 0xAD, 0xA5, 0x80,
|
||||
0x2D, 0x94, 0x5C, 0x00, 0x2E, 0x8D, 0x87, 0x80, 0x2F, 0x74, 0x3E, 0x00, 0x30, 0x6D, 0x69, 0x80,
|
||||
0x31, 0x5D, 0x5A, 0x80, 0x32, 0x56, 0x86, 0x00, 0x33, 0x3D, 0x3C, 0x80, 0x34, 0x36, 0x68, 0x00,
|
||||
0x35, 0x1D, 0x1E, 0x80, 0x36, 0x16, 0x4A, 0x00, 0x36, 0xFD, 0x00, 0x80, 0x37, 0xF6, 0x2C, 0x00,
|
||||
0x38, 0xDC, 0xE2, 0x80, 0x39, 0xA7, 0xE9, 0x80, 0x3A, 0xBC, 0xC4, 0x80, 0x3B, 0xBF, 0x2A, 0x80,
|
||||
0x3C, 0xA5, 0xE1, 0x00, 0x3D, 0x9F, 0x0C, 0x80, 0x3E, 0x85, 0xC3, 0x00, 0x3F, 0x7E, 0xEE, 0x80,
|
||||
0x40, 0x65, 0xA5, 0x00, 0x41, 0x5E, 0xD0, 0x80, 0x42, 0x45, 0x87, 0x00, 0x43, 0x3E, 0xB2, 0x80,
|
||||
0x44, 0x2E, 0xA3, 0x80, 0x45, 0x1E, 0x94, 0x80, 0x46, 0x05, 0x4B, 0x00, 0x47, 0x07, 0xB1, 0x00,
|
||||
0x47, 0xF7, 0xA2, 0x00, 0x48, 0xE7, 0x93, 0x00, 0x49, 0xD7, 0x84, 0x00, 0x4A, 0xC7, 0x75, 0x00,
|
||||
0x4B, 0xB7, 0x66, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
|
||||
0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
|
||||
0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
|
||||
0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
|
||||
0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
|
||||
0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x05, 0x00, 0x00,
|
||||
0x8C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x9A, 0xB0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
|
||||
0x00, 0x00, 0x9A, 0xB0, 0x01, 0x00, 0x00, 0x00, 0x8C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x9A, 0xB0,
|
||||
0x00, 0x08, 0x45, 0x53, 0x54, 0x00, 0x7A, 0x7A, 0x7A, 0x00, 0x4D, 0x49, 0x53, 0x54, 0x00, 0x00,
|
||||
0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x2B, 0x30, 0x02,
|
||||
0x05, 0x32, 0x58, 0x00, 0x00, 0x00, 0x10, 0x4D, 0x61, 0x63, 0x71, 0x75, 0x61, 0x72, 0x69, 0x65,
|
||||
0x20, 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64,
|
||||
|
||||
/* Antarctica/Mawson */
|
||||
0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
@@ -8101,7 +8098,7 @@ const unsigned char timelib_timezone_db_data_builtin[261076] = {
|
||||
/* Asia/Gaza */
|
||||
0x50, 0x48, 0x50, 0x31, 0x01, 0x50, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x11, 0xC8, 0x59, 0xB2, 0xE0,
|
||||
0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x11, 0xC8, 0x59, 0xB2, 0xE0,
|
||||
0xCC, 0xE5, 0xC1, 0x50, 0xCD, 0xAC, 0xFE, 0x00, 0xCE, 0xC6, 0xF4, 0xD0, 0xCF, 0x8F, 0x66, 0xE0,
|
||||
0xD0, 0xA9, 0x79, 0xD0, 0xD1, 0x84, 0x60, 0xE0, 0xD2, 0x8A, 0xC9, 0x70, 0xD3, 0x65, 0xB0, 0x80,
|
||||
0xD4, 0x6B, 0xE0, 0xD0, 0xE8, 0x36, 0x63, 0x60, 0xE8, 0xF4, 0x2D, 0x50, 0xEA, 0x0B, 0xB9, 0x60,
|
||||
@@ -8122,21 +8119,37 @@ const unsigned char timelib_timezone_db_data_builtin[261076] = {
|
||||
0x39, 0xEF, 0x60, 0xD0, 0x3A, 0xDF, 0x5F, 0xE0, 0x3B, 0xCF, 0x42, 0xD0, 0x3C, 0xBF, 0x41, 0xE0,
|
||||
0x3D, 0xAF, 0x24, 0xD0, 0x3E, 0x9F, 0x23, 0xE0, 0x3F, 0x8F, 0x06, 0xD0, 0x40, 0x7F, 0x05, 0xE0,
|
||||
0x41, 0x5C, 0x81, 0xE0, 0x42, 0x5E, 0xE7, 0xE0, 0x43, 0x41, 0xB7, 0xF0, 0x44, 0x2D, 0xA6, 0x60,
|
||||
0x45, 0x12, 0xFD, 0x50, 0x46, 0x0E, 0xD9, 0xE0, 0x46, 0xE8, 0x6F, 0x70, 0x47, 0xF1, 0x5E, 0xE0,
|
||||
0x48, 0xB7, 0x11, 0xD0, 0x49, 0xCB, 0xFA, 0xE0, 0x4A, 0xA0, 0x4A, 0x70, 0x4B, 0xAD, 0x2E, 0x9C,
|
||||
0x4C, 0x61, 0xBD, 0xD0, 0x4D, 0x96, 0xF3, 0xDC, 0x4E, 0x35, 0xC2, 0x50, 0x4F, 0x74, 0xDB, 0x60,
|
||||
0x50, 0x5B, 0x91, 0xE0, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x02, 0x01,
|
||||
0x45, 0x12, 0xFD, 0x50, 0x46, 0x0E, 0xD9, 0xE0, 0x46, 0xE8, 0x6F, 0x70, 0x47, 0xEC, 0x18, 0xE0,
|
||||
0x48, 0xB7, 0x11, 0xD0, 0x49, 0xCB, 0xFA, 0xE0, 0x4A, 0xA0, 0x3C, 0x60, 0x4B, 0xAD, 0x2E, 0x9C,
|
||||
0x4C, 0x61, 0xBD, 0xD0, 0x4D, 0x94, 0xF9, 0x9C, 0x4E, 0x35, 0xC2, 0x50, 0x4F, 0x74, 0xDB, 0x60,
|
||||
0x50, 0x5B, 0x91, 0xE0, 0x51, 0x54, 0xBD, 0x60, 0x52, 0x44, 0xAE, 0x60, 0x53, 0x34, 0x9F, 0x60,
|
||||
0x54, 0x24, 0x90, 0x60, 0x55, 0x14, 0x81, 0x60, 0x56, 0x04, 0x72, 0x60, 0x56, 0xFD, 0x9D, 0xE0,
|
||||
0x57, 0xE4, 0x54, 0x60, 0x58, 0xDD, 0x7F, 0xE0, 0x59, 0xC4, 0x36, 0x60, 0x5A, 0xBD, 0x61, 0xE0,
|
||||
0x5B, 0xA4, 0x18, 0x60, 0x5C, 0x9D, 0x43, 0xE0, 0x5D, 0x8D, 0x34, 0xE0, 0x5E, 0x7D, 0x25, 0xE0,
|
||||
0x5F, 0x6D, 0x16, 0xE0, 0x60, 0x5D, 0x07, 0xE0, 0x61, 0x4C, 0xF8, 0xE0, 0x62, 0x46, 0x24, 0x60,
|
||||
0x63, 0x2C, 0xDA, 0xE0, 0x64, 0x26, 0x06, 0x60, 0x65, 0x0C, 0xBC, 0xE0, 0x66, 0x05, 0xE8, 0x60,
|
||||
0x66, 0xF5, 0xD9, 0x60, 0x67, 0xE5, 0xCA, 0x60, 0x68, 0xD5, 0xBB, 0x60, 0x69, 0xC5, 0xAC, 0x60,
|
||||
0x6A, 0xB5, 0x9D, 0x60, 0x6B, 0xA5, 0x8E, 0x60, 0x6C, 0x95, 0x7F, 0x60, 0x6D, 0x8E, 0xAA, 0xE0,
|
||||
0x6E, 0x75, 0x61, 0x60, 0x6F, 0x6E, 0x8C, 0xE0, 0x70, 0x55, 0x43, 0x60, 0x71, 0x4E, 0x6E, 0xE0,
|
||||
0x72, 0x3E, 0x5F, 0xE0, 0x73, 0x2E, 0x50, 0xE0, 0x74, 0x1E, 0x41, 0xE0, 0x75, 0x0E, 0x32, 0xE0,
|
||||
0x75, 0xFE, 0x23, 0xE0, 0x76, 0xF7, 0x4F, 0x60, 0x77, 0xDE, 0x05, 0xE0, 0x78, 0xD7, 0x31, 0x60,
|
||||
0x79, 0xBD, 0xE7, 0xE0, 0x7A, 0xB7, 0x13, 0x60, 0x7B, 0x9D, 0xC9, 0xE0, 0x7C, 0x96, 0xF5, 0x60,
|
||||
0x7D, 0x86, 0xE6, 0x60, 0x7E, 0x76, 0xD7, 0x60, 0x7F, 0x66, 0xC8, 0x60, 0x00, 0x01, 0x00, 0x01,
|
||||
0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
|
||||
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04,
|
||||
0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
|
||||
0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x01, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x01, 0x02, 0x01,
|
||||
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
|
||||
0x02, 0x01, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
|
||||
0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x01, 0x02,
|
||||
0x05, 0x02, 0x05, 0x02, 0x05, 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, 0x2A, 0x30, 0x01, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x00, 0x00, 0x00,
|
||||
0x2A, 0x30, 0x01, 0x04, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x09, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x0D,
|
||||
0x00, 0x00, 0x1C, 0x20, 0x00, 0x00, 0x45, 0x45, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x49,
|
||||
0x44, 0x54, 0x00, 0x49, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0xB9, 0x64, 0xF0, 0x01, 0x47, 0x40, 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x47,
|
||||
0x61, 0x7A, 0x61, 0x20, 0x53, 0x74, 0x72, 0x69, 0x70,
|
||||
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, 0x2A, 0x30,
|
||||
0x01, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x00, 0x00,
|
||||
0x2A, 0x30, 0x01, 0x09, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x0D, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x00,
|
||||
0x45, 0x45, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x49, 0x44, 0x54, 0x00, 0x49, 0x53, 0x54,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB9, 0x64,
|
||||
0xF0, 0x01, 0x47, 0x40, 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x47, 0x61, 0x7A, 0x61, 0x20, 0x53, 0x74,
|
||||
0x72, 0x69, 0x70,
|
||||
|
||||
/* Asia/Harbin */
|
||||
0x50, 0x48, 0x50, 0x31, 0x01, 0x43, 0x4E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
@@ -8158,7 +8171,7 @@ const unsigned char timelib_timezone_db_data_builtin[261076] = {
|
||||
/* Asia/Hebron */
|
||||
0x50, 0x48, 0x50, 0x31, 0x01, 0x50, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x11, 0xC8, 0x59, 0xB2, 0xE0,
|
||||
0x00, 0x00, 0x00, 0x92, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x11, 0xC8, 0x59, 0xB2, 0xE0,
|
||||
0xCC, 0xE5, 0xC1, 0x50, 0xCD, 0xAC, 0xFE, 0x00, 0xCE, 0xC6, 0xF4, 0xD0, 0xCF, 0x8F, 0x66, 0xE0,
|
||||
0xD0, 0xA9, 0x79, 0xD0, 0xD1, 0x84, 0x60, 0xE0, 0xD2, 0x8A, 0xC9, 0x70, 0xD3, 0x65, 0xB0, 0x80,
|
||||
0xD4, 0x6B, 0xE0, 0xD0, 0xE8, 0x36, 0x63, 0x60, 0xE8, 0xF4, 0x2D, 0x50, 0xEA, 0x0B, 0xB9, 0x60,
|
||||
@@ -8179,22 +8192,37 @@ const unsigned char timelib_timezone_db_data_builtin[261076] = {
|
||||
0x39, 0xEF, 0x60, 0xD0, 0x3A, 0xDF, 0x5F, 0xE0, 0x3B, 0xCF, 0x42, 0xD0, 0x3C, 0xBF, 0x41, 0xE0,
|
||||
0x3D, 0xAF, 0x24, 0xD0, 0x3E, 0x9F, 0x23, 0xE0, 0x3F, 0x8F, 0x06, 0xD0, 0x40, 0x7F, 0x05, 0xE0,
|
||||
0x41, 0x5C, 0x81, 0xE0, 0x42, 0x5E, 0xE7, 0xE0, 0x43, 0x41, 0xB7, 0xF0, 0x44, 0x2D, 0xA6, 0x60,
|
||||
0x45, 0x12, 0xFD, 0x50, 0x46, 0x0E, 0xD9, 0xE0, 0x46, 0xE8, 0x6F, 0x70, 0x47, 0xF1, 0x5E, 0xE0,
|
||||
0x48, 0xBB, 0x06, 0x50, 0x49, 0xCB, 0xFA, 0xE0, 0x4A, 0xA0, 0x4A, 0x70, 0x4B, 0xAD, 0x2E, 0x9C,
|
||||
0x4C, 0x61, 0xBD, 0xD0, 0x4D, 0x95, 0xA2, 0x5C, 0x4E, 0x35, 0xC2, 0x50, 0x4E, 0x5C, 0x0B, 0xE0,
|
||||
0x4E, 0x85, 0x06, 0x80, 0x4F, 0x74, 0xDB, 0x60, 0x50, 0x5B, 0x91, 0xE0, 0x00, 0x01, 0x00, 0x01,
|
||||
0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
|
||||
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04,
|
||||
0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
|
||||
0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x01, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x01, 0x02, 0x01,
|
||||
0x45, 0x12, 0xFD, 0x50, 0x46, 0x0E, 0xD9, 0xE0, 0x46, 0xE8, 0x6F, 0x70, 0x47, 0xEC, 0x18, 0xE0,
|
||||
0x48, 0xBB, 0x06, 0x50, 0x49, 0xCB, 0xFA, 0xE0, 0x4A, 0xA0, 0x3C, 0x60, 0x4B, 0xAB, 0xDC, 0xE0,
|
||||
0x4C, 0x61, 0xBD, 0xD0, 0x4D, 0x94, 0xF9, 0x9C, 0x4E, 0x35, 0xC2, 0x50, 0x4E, 0x5C, 0x0B, 0xE0,
|
||||
0x4E, 0x84, 0xDC, 0x50, 0x4F, 0x74, 0xDB, 0x60, 0x50, 0x5B, 0x91, 0xE0, 0x51, 0x54, 0xBD, 0x60,
|
||||
0x52, 0x44, 0xAE, 0x60, 0x53, 0x34, 0x9F, 0x60, 0x54, 0x24, 0x90, 0x60, 0x55, 0x14, 0x81, 0x60,
|
||||
0x56, 0x04, 0x72, 0x60, 0x56, 0xFD, 0x9D, 0xE0, 0x57, 0xE4, 0x54, 0x60, 0x58, 0xDD, 0x7F, 0xE0,
|
||||
0x59, 0xC4, 0x36, 0x60, 0x5A, 0xBD, 0x61, 0xE0, 0x5B, 0xA4, 0x18, 0x60, 0x5C, 0x9D, 0x43, 0xE0,
|
||||
0x5D, 0x8D, 0x34, 0xE0, 0x5E, 0x7D, 0x25, 0xE0, 0x5F, 0x6D, 0x16, 0xE0, 0x60, 0x5D, 0x07, 0xE0,
|
||||
0x61, 0x4C, 0xF8, 0xE0, 0x62, 0x46, 0x24, 0x60, 0x63, 0x2C, 0xDA, 0xE0, 0x64, 0x26, 0x06, 0x60,
|
||||
0x65, 0x0C, 0xBC, 0xE0, 0x66, 0x05, 0xE8, 0x60, 0x66, 0xF5, 0xD9, 0x60, 0x67, 0xE5, 0xCA, 0x60,
|
||||
0x68, 0xD5, 0xBB, 0x60, 0x69, 0xC5, 0xAC, 0x60, 0x6A, 0xB5, 0x9D, 0x60, 0x6B, 0xA5, 0x8E, 0x60,
|
||||
0x6C, 0x95, 0x7F, 0x60, 0x6D, 0x8E, 0xAA, 0xE0, 0x6E, 0x75, 0x61, 0x60, 0x6F, 0x6E, 0x8C, 0xE0,
|
||||
0x70, 0x55, 0x43, 0x60, 0x71, 0x4E, 0x6E, 0xE0, 0x72, 0x3E, 0x5F, 0xE0, 0x73, 0x2E, 0x50, 0xE0,
|
||||
0x74, 0x1E, 0x41, 0xE0, 0x75, 0x0E, 0x32, 0xE0, 0x75, 0xFE, 0x23, 0xE0, 0x76, 0xF7, 0x4F, 0x60,
|
||||
0x77, 0xDE, 0x05, 0xE0, 0x78, 0xD7, 0x31, 0x60, 0x79, 0xBD, 0xE7, 0xE0, 0x7A, 0xB7, 0x13, 0x60,
|
||||
0x7B, 0x9D, 0xC9, 0xE0, 0x7C, 0x96, 0xF5, 0x60, 0x7D, 0x86, 0xE6, 0x60, 0x7E, 0x76, 0xD7, 0x60,
|
||||
0x7F, 0x66, 0xC8, 0x60, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 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, 0x2A, 0x30,
|
||||
0x01, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x00, 0x00,
|
||||
0x2A, 0x30, 0x01, 0x09, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x0D, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x00,
|
||||
0x45, 0x45, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x49, 0x44, 0x54, 0x00, 0x49, 0x53, 0x54,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB9, 0x71,
|
||||
0xF5, 0x01, 0x48, 0x35, 0x7C, 0x00, 0x00, 0x00, 0x09, 0x57, 0x65, 0x73, 0x74, 0x20, 0x42, 0x61,
|
||||
0x6E, 0x6B,
|
||||
0x02, 0x01, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
|
||||
0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x01, 0x02,
|
||||
0x05, 0x02, 0x05, 0x02, 0x05, 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, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
|
||||
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x00, 0x00, 0x00, 0x1C, 0x20,
|
||||
0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x09, 0x00, 0x00,
|
||||
0x1C, 0x20, 0x00, 0x0D, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x00, 0x45, 0x45, 0x54, 0x00, 0x45, 0x45,
|
||||
0x53, 0x54, 0x00, 0x49, 0x44, 0x54, 0x00, 0x49, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB9, 0x71, 0xF5, 0x01, 0x48, 0x35, 0x7C, 0x00,
|
||||
0x00, 0x00, 0x09, 0x57, 0x65, 0x73, 0x74, 0x20, 0x42, 0x61, 0x6E, 0x6B,
|
||||
|
||||
/* Asia/Ho_Chi_Minh */
|
||||
0x50, 0x48, 0x50, 0x31, 0x01, 0x56, 0x4E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
@@ -18382,4 +18410,4 @@ const unsigned char timelib_timezone_db_data_builtin[261076] = {
|
||||
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 = { "2013.2", 579, timezonedb_idx_builtin, timelib_timezone_db_data_builtin };
|
||||
const timelib_tzdb timezonedb_builtin = { "2013.3", 579, timezonedb_idx_builtin, timelib_timezone_db_data_builtin };
|
||||
@@ -7,5 +7,4 @@ date_default_timezone_set('Europe/Prague');
|
||||
var_dump(unserialize('O:8:"DateTime":0:{}') == new DateTime);
|
||||
?>
|
||||
--EXPECTF--
|
||||
Warning: %s: Trying to compare an incomplete DateTime object in %s on line %d
|
||||
bool(false)
|
||||
Fatal error: Invalid serialization data for DateTime object in %sbug55397.php on line %d
|
||||
@@ -252,6 +252,8 @@ AC_DEFUN([PHP_GD_CHECK_VERSION],[
|
||||
PHP_CHECK_LIBRARY(gd, gdFreeFontCache, [AC_DEFINE(HAVE_GD_FREEFONTCACHE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
|
||||
PHP_CHECK_LIBRARY(gd, gdFontCacheMutexSetup, [AC_DEFINE(HAVE_GD_FONTMUTEX, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
|
||||
PHP_CHECK_LIBRARY(gd, gdNewDynamicCtxEx, [AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
|
||||
PHP_CHECK_LIBRARY(gd, gdImageConvolution, [AC_DEFINE(HAVE_GD_IMAGE_CONVOLUTION, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
|
||||
PHP_CHECK_LIBRARY(gd, gdImagePixelate, [AC_DEFINE(HAVE_GD_IMAGE_PIXELATE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
|
||||
])
|
||||
|
||||
dnl
|
||||
|
||||
+6
-2
@@ -1241,9 +1241,13 @@ PHP_RSHUTDOWN_FUNCTION(gd)
|
||||
/* }}} */
|
||||
|
||||
#if HAVE_GD_BUNDLED
|
||||
#define PHP_GD_VERSION_STRING "bundled (2.0.34 compatible)"
|
||||
#define PHP_GD_VERSION_STRING "bundled (2.1.0 compatible)"
|
||||
#else
|
||||
#define PHP_GD_VERSION_STRING "2.0"
|
||||
# ifdef GD_VERSION_STRING
|
||||
# define PHP_GD_VERSION_STRING GD_VERSION_STRING
|
||||
# else
|
||||
# define PHP_GD_VERSION_STRING "2.0"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* {{{ PHP_MINFO_FUNCTION
|
||||
|
||||
@@ -32,6 +32,7 @@ int gdImageContrast(gdImagePtr src, double contrast);
|
||||
/* Simply adds or substracts respectively red, green or blue to a pixel */
|
||||
int gdImageColor(gdImagePtr src, const int red, const int green, const int blue, const int alpha);
|
||||
|
||||
#if !defined(HAVE_GD_IMAGE_CONVOLUTION)
|
||||
/* Image convolution by a 3x3 custom matrix */
|
||||
int gdImageConvolution(gdImagePtr src, float ft[3][3], float filter_div, float offset);
|
||||
int gdImageEdgeDetectQuick(gdImagePtr src);
|
||||
@@ -40,11 +41,17 @@ int gdImageSelectiveBlur( gdImagePtr src);
|
||||
int gdImageEmboss(gdImagePtr im);
|
||||
int gdImageMeanRemoval(gdImagePtr im);
|
||||
int gdImageSmooth(gdImagePtr im, float weight);
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_GD_IMAGE_PIXELATE)
|
||||
enum gdPixelateMode {
|
||||
GD_PIXELATE_UPPERLEFT,
|
||||
GD_PIXELATE_AVERAGE
|
||||
};
|
||||
|
||||
int gdImagePixelate(gdImagePtr im, int block_size, const unsigned int mode);
|
||||
#endif
|
||||
|
||||
int gdImagePixelate(gdImagePtr im, int block_size, const unsigned int mode);
|
||||
|
||||
#if !HAVE_GD_IMAGEELLIPSE
|
||||
|
||||
@@ -216,12 +216,13 @@ gdImagePtr gdImageRotate90 (gdImagePtr src, int ignoretransparent)
|
||||
f = gdImageGetPixel;
|
||||
}
|
||||
dst = gdImageCreateTrueColor(src->sy, src->sx);
|
||||
dst->transparent = src->transparent;
|
||||
|
||||
if (dst != NULL) {
|
||||
int old_blendmode = dst->alphaBlendingFlag;
|
||||
dst->alphaBlendingFlag = 0;
|
||||
|
||||
dst->transparent = src->transparent;
|
||||
|
||||
gdImagePaletteCopy (dst, src);
|
||||
|
||||
for (uY = 0; uY<src->sy; uY++) {
|
||||
@@ -262,12 +263,13 @@ gdImagePtr gdImageRotate180 (gdImagePtr src, int ignoretransparent)
|
||||
f = gdImageGetPixel;
|
||||
}
|
||||
dst = gdImageCreateTrueColor(src->sx, src->sy);
|
||||
dst->transparent = src->transparent;
|
||||
|
||||
if (dst != NULL) {
|
||||
int old_blendmode = dst->alphaBlendingFlag;
|
||||
dst->alphaBlendingFlag = 0;
|
||||
|
||||
dst->transparent = src->transparent;
|
||||
|
||||
gdImagePaletteCopy (dst, src);
|
||||
|
||||
for (uY = 0; uY<src->sy; uY++) {
|
||||
@@ -309,12 +311,13 @@ gdImagePtr gdImageRotate270 (gdImagePtr src, int ignoretransparent)
|
||||
f = gdImageGetPixel;
|
||||
}
|
||||
dst = gdImageCreateTrueColor (src->sy, src->sx);
|
||||
dst->transparent = src->transparent;
|
||||
|
||||
if (dst != NULL) {
|
||||
int old_blendmode = dst->alphaBlendingFlag;
|
||||
dst->alphaBlendingFlag = 0;
|
||||
|
||||
dst->transparent = src->transparent;
|
||||
|
||||
gdImagePaletteCopy (dst, src);
|
||||
|
||||
for (uY = 0; uY<src->sy; uY++) {
|
||||
|
||||
@@ -690,7 +690,7 @@ PHP_MINFO_FUNCTION(mysql)
|
||||
static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
|
||||
{
|
||||
char *user=NULL, *passwd=NULL, *host_and_port=NULL, *socket=NULL, *tmp=NULL, *host=NULL;
|
||||
int user_len, passwd_len, host_len;
|
||||
int user_len = 0, passwd_len = 0, host_len = 0;
|
||||
char *hashed_details=NULL;
|
||||
int hashed_details_length, port = MYSQL_PORT;
|
||||
long client_flags = 0;
|
||||
|
||||
+1
-1
@@ -1259,7 +1259,7 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags
|
||||
|
||||
#endif
|
||||
|
||||
if (into_object && Z_TYPE_P(return_value) != IS_NULL) {
|
||||
if (into_object && Z_TYPE_P(return_value) == IS_ARRAY) {
|
||||
zval dataset = *return_value;
|
||||
zend_fcall_info fci;
|
||||
zend_fcall_info_cache fcc;
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
--TEST--
|
||||
Bug #63398 (Memleak when calling fetch_object on a use_result and DB pointer has closed)
|
||||
--SKIPIF--
|
||||
<?php
|
||||
require_once('skipif.inc');
|
||||
require_once("connect.inc");
|
||||
if (!$IS_MYSQLND) {
|
||||
die("skip mysqlnd only test");
|
||||
}
|
||||
require_once('skipifconnectfailure.inc');
|
||||
?>
|
||||
--FILE--
|
||||
<?php
|
||||
require 'connect.inc';
|
||||
$db = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
|
||||
|
||||
$result = $db->query('SELECT 1', MYSQLI_USE_RESULT);
|
||||
$db->close();
|
||||
var_dump($result->fetch_object());
|
||||
?>
|
||||
--EXPECTF--
|
||||
Warning: mysqli_result::fetch_object(): Error while reading a row in %sbug64726.php on line %d
|
||||
bool(false)
|
||||
@@ -39,7 +39,7 @@
|
||||
#define MYSQLND_SQLSTATE_LENGTH 5
|
||||
#define MYSQLND_SQLSTATE_NULL "00000"
|
||||
|
||||
#define MYSQLND_MAX_ALLOWED_USER_LEN 256 /* 64 char * 4byte . MySQL supports now only 16 char, but let it be forward compatible */
|
||||
#define MYSQLND_MAX_ALLOWED_USER_LEN 252 /* 63 char * 4byte . MySQL supports now only 16 char, but let it be forward compatible */
|
||||
#define MYSQLND_MAX_ALLOWED_DB_LEN 1024 /* 256 char * 4byte. MySQL supports now only 64 char in the tables, but on the FS could be different. Forward compatible. */
|
||||
|
||||
#define MYSQLND_NET_CMD_BUFFER_MIN_SIZE 4096
|
||||
|
||||
@@ -1547,6 +1547,7 @@ MYSQLND_METHOD(mysqlnd_res, fetch_into)(MYSQLND_RES * result, unsigned int flags
|
||||
mysqlnd_array_init(return_value, mysqlnd_num_fields(result) * 2);
|
||||
if (FAIL == result->m.fetch_row(result, (void *)return_value, flags, &fetched_anything TSRMLS_CC)) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error while reading a row");
|
||||
zval_dtor(return_value);
|
||||
RETVAL_FALSE;
|
||||
} else if (fetched_anything == FALSE) {
|
||||
zval_dtor(return_value);
|
||||
|
||||
@@ -1897,6 +1897,10 @@ PHP_METHOD(Phar, buildFromDirectory)
|
||||
pass.count = 0;
|
||||
pass.ret = return_value;
|
||||
pass.fp = php_stream_fopen_tmpfile();
|
||||
if (pass.fp == NULL) {
|
||||
zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC, "phar \"%s\" unable to create temporary file", phar_obj->arc.archive->fname);
|
||||
return;
|
||||
}
|
||||
|
||||
if (phar_obj->arc.archive->is_persistent && FAILURE == phar_copy_on_write(&(phar_obj->arc.archive) TSRMLS_CC)) {
|
||||
zval_ptr_dtor(&iteriter);
|
||||
@@ -1977,6 +1981,10 @@ PHP_METHOD(Phar, buildFromIterator)
|
||||
pass.ret = return_value;
|
||||
pass.count = 0;
|
||||
pass.fp = php_stream_fopen_tmpfile();
|
||||
if (pass.fp == NULL) {
|
||||
zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC, "phar \"%s\": unable to create temporary file", phar_obj->arc.archive->fname);
|
||||
return;
|
||||
}
|
||||
|
||||
if (SUCCESS == spl_iterator_apply(obj, (spl_iterator_apply_func_t) phar_build, (void *) &pass TSRMLS_CC)) {
|
||||
phar_obj->arc.archive->ufp = pass.fp;
|
||||
@@ -2308,6 +2316,10 @@ static zval *phar_convert_to_other(phar_archive_data *source, int convert, char
|
||||
zend_get_hash_value, NULL, 0);
|
||||
|
||||
phar->fp = php_stream_fopen_tmpfile();
|
||||
if (phar->fp == NULL) {
|
||||
zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC, "unable to create temporary file");
|
||||
return NULL;
|
||||
}
|
||||
phar->fname = source->fname;
|
||||
phar->fname_len = source->fname_len;
|
||||
phar->is_temporary_alias = source->is_temporary_alias;
|
||||
|
||||
+20
-5
@@ -847,7 +847,10 @@ int phar_tar_setmetadata(zval *metadata, phar_entry_info *entry, char **error TS
|
||||
entry->is_modified = 1;
|
||||
entry->fp = php_stream_fopen_tmpfile();
|
||||
entry->offset = entry->offset_abs = 0;
|
||||
|
||||
if (entry->fp == NULL) {
|
||||
spprintf(error, 0, "phar error: unable to create temporary file");
|
||||
return -1;
|
||||
}
|
||||
if (entry->metadata_str.len != php_stream_write(entry->fp, entry->metadata_str.c, entry->metadata_str.len)) {
|
||||
spprintf(error, 0, "phar tar error: unable to write metadata to magic metadata file \"%s\"", entry->filename);
|
||||
zend_hash_del(&(entry->phar->manifest), entry->filename, entry->filename_len);
|
||||
@@ -949,7 +952,10 @@ int phar_tar_flush(phar_archive_data *phar, char *user_stub, long len, int defau
|
||||
entry.filename = estrndup(".phar/alias.txt", sizeof(".phar/alias.txt")-1);
|
||||
entry.filename_len = sizeof(".phar/alias.txt")-1;
|
||||
entry.fp = php_stream_fopen_tmpfile();
|
||||
|
||||
if (entry.fp == NULL) {
|
||||
spprintf(error, 0, "phar error: unable to create temporary file");
|
||||
return -1;
|
||||
}
|
||||
if (phar->alias_len != (int)php_stream_write(entry.fp, phar->alias, phar->alias_len)) {
|
||||
if (error) {
|
||||
spprintf(error, 0, "unable to set alias in tar-based phar \"%s\"", phar->fname);
|
||||
@@ -1014,6 +1020,10 @@ int phar_tar_flush(phar_archive_data *phar, char *user_stub, long len, int defau
|
||||
|
||||
len = pos - user_stub + 18;
|
||||
entry.fp = php_stream_fopen_tmpfile();
|
||||
if (entry.fp == NULL) {
|
||||
spprintf(error, 0, "phar error: unable to create temporary file");
|
||||
return EOF;
|
||||
}
|
||||
entry.uncompressed_filesize = len + 5;
|
||||
|
||||
if ((size_t)len != php_stream_write(entry.fp, user_stub, len)
|
||||
@@ -1038,7 +1048,10 @@ int phar_tar_flush(phar_archive_data *phar, char *user_stub, long len, int defau
|
||||
} else {
|
||||
/* Either this is a brand new phar (add the stub), or the default stub is required (overwrite the stub) */
|
||||
entry.fp = php_stream_fopen_tmpfile();
|
||||
|
||||
if (entry.fp == NULL) {
|
||||
spprintf(error, 0, "phar error: unable to create temporary file");
|
||||
return EOF;
|
||||
}
|
||||
if (sizeof(newstub)-1 != php_stream_write(entry.fp, newstub, sizeof(newstub)-1)) {
|
||||
php_stream_close(entry.fp);
|
||||
if (error) {
|
||||
@@ -1087,7 +1100,6 @@ nostub:
|
||||
}
|
||||
|
||||
newfile = php_stream_fopen_tmpfile();
|
||||
|
||||
if (!newfile) {
|
||||
if (error) {
|
||||
spprintf(error, 0, "unable to create temporary file");
|
||||
@@ -1174,7 +1186,10 @@ nostub:
|
||||
entry.filename = ".phar/signature.bin";
|
||||
entry.filename_len = sizeof(".phar/signature.bin")-1;
|
||||
entry.fp = php_stream_fopen_tmpfile();
|
||||
|
||||
if (entry.fp == NULL) {
|
||||
spprintf(error, 0, "phar error: unable to create temporary file");
|
||||
return EOF;
|
||||
}
|
||||
#ifdef WORDS_BIGENDIAN
|
||||
# define PHAR_SET_32(var, buffer) \
|
||||
*(php_uint32 *)(var) = (((((unsigned char*)&(buffer))[3]) << 24) \
|
||||
|
||||
@@ -890,6 +890,10 @@ int phar_copy_entry_fp(phar_entry_info *source, phar_entry_info *dest, char **er
|
||||
dest->offset = 0;
|
||||
dest->is_modified = 1;
|
||||
dest->fp = php_stream_fopen_tmpfile();
|
||||
if (dest->fp == NULL) {
|
||||
spprintf(error, 0, "phar error: unable to create temporary file");
|
||||
return EOF;
|
||||
}
|
||||
phar_seek_efp(source, 0, SEEK_SET, 0, 1 TSRMLS_CC);
|
||||
link = phar_get_link_source(source TSRMLS_CC);
|
||||
|
||||
@@ -1130,6 +1134,10 @@ int phar_separate_entry_fp(phar_entry_info *entry, char **error TSRMLS_DC) /* {{
|
||||
}
|
||||
|
||||
fp = php_stream_fopen_tmpfile();
|
||||
if (fp == NULL) {
|
||||
spprintf(error, 0, "phar error: unable to create temporary file");
|
||||
return FAILURE;
|
||||
}
|
||||
phar_seek_efp(entry, 0, SEEK_SET, 0, 1 TSRMLS_CC);
|
||||
link = phar_get_link_source(entry TSRMLS_CC);
|
||||
|
||||
|
||||
+25
-6
@@ -937,10 +937,11 @@ is_compressed:
|
||||
PHAR_SET_32(local.uncompsize, entry->uncompressed_filesize);
|
||||
PHAR_SET_32(central.compsize, entry->compressed_filesize);
|
||||
PHAR_SET_32(local.compsize, entry->compressed_filesize);
|
||||
|
||||
if (-1 == php_stream_seek(p->old, entry->offset_abs, SEEK_SET)) {
|
||||
spprintf(p->error, 0, "unable to seek to start of file \"%s\" while creating zip-based phar \"%s\"", entry->filename, entry->phar->fname);
|
||||
return ZEND_HASH_APPLY_STOP;
|
||||
if (p->old) {
|
||||
if (-1 == php_stream_seek(p->old, entry->offset_abs, SEEK_SET)) {
|
||||
spprintf(p->error, 0, "unable to seek to start of file \"%s\" while creating zip-based phar \"%s\"", entry->filename, entry->phar->fname);
|
||||
return ZEND_HASH_APPLY_STOP;
|
||||
}
|
||||
}
|
||||
}
|
||||
not_compressed:
|
||||
@@ -1095,6 +1096,10 @@ static int phar_zip_applysignature(phar_archive_data *phar, struct _phar_zip_pas
|
||||
off_t tell, st;
|
||||
|
||||
newfile = php_stream_fopen_tmpfile();
|
||||
if (newfile == NULL) {
|
||||
spprintf(pass->error, 0, "phar error: unable to create temporary file for the signature file");
|
||||
return FAILURE;
|
||||
}
|
||||
st = tell = php_stream_tell(pass->filefp);
|
||||
/* copy the local files, central directory, and the zip comment to generate the hash */
|
||||
php_stream_seek(pass->filefp, 0, SEEK_SET);
|
||||
@@ -1122,6 +1127,10 @@ static int phar_zip_applysignature(phar_archive_data *phar, struct _phar_zip_pas
|
||||
entry.fp = php_stream_fopen_tmpfile();
|
||||
entry.fp_type = PHAR_MOD;
|
||||
entry.is_modified = 1;
|
||||
if (entry.fp == NULL) {
|
||||
spprintf(pass->error, 0, "phar error: unable to create temporary file for signature");
|
||||
return FAILURE;
|
||||
}
|
||||
|
||||
PHAR_SET_32(sigbuf, phar->sig_flags);
|
||||
PHAR_SET_32(sigbuf + 4, signature_length);
|
||||
@@ -1192,7 +1201,10 @@ int phar_zip_flush(phar_archive_data *phar, char *user_stub, long len, int defau
|
||||
/* set alias */
|
||||
if (!phar->is_temporary_alias && phar->alias_len) {
|
||||
entry.fp = php_stream_fopen_tmpfile();
|
||||
|
||||
if (entry.fp == NULL) {
|
||||
spprintf(error, 0, "phar error: unable to create temporary file");
|
||||
return EOF;
|
||||
}
|
||||
if (phar->alias_len != (int)php_stream_write(entry.fp, phar->alias, phar->alias_len)) {
|
||||
if (error) {
|
||||
spprintf(error, 0, "unable to set alias in zip-based phar \"%s\"", phar->fname);
|
||||
@@ -1267,6 +1279,10 @@ int phar_zip_flush(phar_archive_data *phar, char *user_stub, long len, int defau
|
||||
|
||||
len = pos - user_stub + 18;
|
||||
entry.fp = php_stream_fopen_tmpfile();
|
||||
if (entry.fp == NULL) {
|
||||
spprintf(error, 0, "phar error: unable to create temporary file");
|
||||
return EOF;
|
||||
}
|
||||
entry.uncompressed_filesize = len + 5;
|
||||
|
||||
if ((size_t)len != php_stream_write(entry.fp, user_stub, len)
|
||||
@@ -1300,7 +1316,10 @@ int phar_zip_flush(phar_archive_data *phar, char *user_stub, long len, int defau
|
||||
} else {
|
||||
/* Either this is a brand new phar (add the stub), or the default stub is required (overwrite the stub) */
|
||||
entry.fp = php_stream_fopen_tmpfile();
|
||||
|
||||
if (entry.fp == NULL) {
|
||||
spprintf(error, 0, "phar error: unable to create temporary file");
|
||||
return EOF;
|
||||
}
|
||||
if (sizeof(newstub)-1 != php_stream_write(entry.fp, newstub, sizeof(newstub)-1)) {
|
||||
php_stream_close(entry.fp);
|
||||
if (error) {
|
||||
|
||||
+4
-4
@@ -4142,7 +4142,7 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function
|
||||
|
||||
if (version == SOAP_1_1) {
|
||||
if (zend_hash_find(prop, "faultcode", sizeof("faultcode"), (void**)&tmp) == SUCCESS) {
|
||||
int new_len;
|
||||
size_t new_len;
|
||||
xmlNodePtr node = xmlNewNode(NULL, BAD_CAST("faultcode"));
|
||||
char *str = php_escape_html_entities((unsigned char*)Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp), &new_len, 0, 0, NULL TSRMLS_CC);
|
||||
xmlAddChild(param, node);
|
||||
@@ -4152,7 +4152,7 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function
|
||||
xmlNodeSetContent(node, code);
|
||||
xmlFree(code);
|
||||
} else {
|
||||
xmlNodeSetContentLen(node, BAD_CAST(str), new_len);
|
||||
xmlNodeSetContentLen(node, BAD_CAST(str), (int)new_len);
|
||||
}
|
||||
efree(str);
|
||||
}
|
||||
@@ -4167,7 +4167,7 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function
|
||||
detail_name = "detail";
|
||||
} else {
|
||||
if (zend_hash_find(prop, "faultcode", sizeof("faultcode"), (void**)&tmp) == SUCCESS) {
|
||||
int new_len;
|
||||
size_t new_len;
|
||||
xmlNodePtr node = xmlNewChild(param, ns, BAD_CAST("Code"), NULL);
|
||||
char *str = php_escape_html_entities((unsigned char*)Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp), &new_len, 0, 0, NULL TSRMLS_CC);
|
||||
node = xmlNewChild(node, ns, BAD_CAST("Value"), NULL);
|
||||
@@ -4177,7 +4177,7 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function
|
||||
xmlNodeSetContent(node, code);
|
||||
xmlFree(code);
|
||||
} else {
|
||||
xmlNodeSetContentLen(node, BAD_CAST(str), new_len);
|
||||
xmlNodeSetContentLen(node, BAD_CAST(str), (int)new_len);
|
||||
}
|
||||
efree(str);
|
||||
}
|
||||
|
||||
+1
-1
@@ -514,7 +514,7 @@ static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int
|
||||
tp[dlen] = '\0';
|
||||
cp += dlen;
|
||||
|
||||
add_assoc_stringl(*subarray, "txt", tp, dlen - 1, 0);
|
||||
add_assoc_stringl(*subarray, "txt", tp, (dlen>0)?dlen - 1:0, 0);
|
||||
add_assoc_zval(*subarray, "entries", entries);
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -151,7 +151,7 @@ PHPAPI unsigned char *php_quot_print_encode(const unsigned char *str, size_t len
|
||||
unsigned char c, *ret, *d;
|
||||
char *hex = "0123456789ABCDEF";
|
||||
|
||||
ret = safe_emalloc(1, 3 * length + 3 * (((3 * length)/PHP_QPRINT_MAXL) + 1), 0);
|
||||
ret = safe_emalloc(3, length + (((3 * length)/(PHP_QPRINT_MAXL-9)) + 1), 1);
|
||||
d = ret;
|
||||
|
||||
while (length--) {
|
||||
|
||||
@@ -51,7 +51,7 @@ PHP_FUNCTION(stream_socket_pair)
|
||||
{
|
||||
long domain, type, protocol;
|
||||
php_stream *s1, *s2;
|
||||
int pair[2];
|
||||
php_socket_t pair[2];
|
||||
|
||||
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lll",
|
||||
&domain, &type, &protocol)) {
|
||||
@@ -611,7 +611,6 @@ static int stream_array_to_fd_set(zval *stream_array, fd_set *fds, php_socket_t
|
||||
{
|
||||
zval **elem;
|
||||
php_stream *stream;
|
||||
php_socket_t this_fd;
|
||||
int cnt = 0;
|
||||
|
||||
if (Z_TYPE_P(stream_array) != IS_ARRAY) {
|
||||
@@ -621,6 +620,11 @@ static int stream_array_to_fd_set(zval *stream_array, fd_set *fds, php_socket_t
|
||||
zend_hash_get_current_data(Z_ARRVAL_P(stream_array), (void **) &elem) == SUCCESS;
|
||||
zend_hash_move_forward(Z_ARRVAL_P(stream_array))) {
|
||||
|
||||
/* Temporary int fd is needed for the STREAM data type on windows, passing this_fd directly to php_stream_cast()
|
||||
would eventually bring a wrong result on x64. php_stream_cast() casts to int internally, and this will leave
|
||||
the higher bits of a SOCKET variable uninitialized on systems with little endian. */
|
||||
int tmp_fd;
|
||||
|
||||
php_stream_from_zval_no_verify(stream, elem);
|
||||
if (stream == NULL) {
|
||||
continue;
|
||||
@@ -630,7 +634,9 @@ static int stream_array_to_fd_set(zval *stream_array, fd_set *fds, php_socket_t
|
||||
* when casting. It is only used here so that the buffered data warning
|
||||
* is not displayed.
|
||||
* */
|
||||
if (SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL, (void*)&this_fd, 1) && this_fd != -1) {
|
||||
if (SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL, (void*)&tmp_fd, 1) && tmp_fd != -1) {
|
||||
|
||||
php_socket_t this_fd = (php_socket_t)tmp_fd;
|
||||
|
||||
PHP_SAFE_FD_SET(this_fd, fds);
|
||||
|
||||
@@ -648,7 +654,6 @@ static int stream_array_from_fd_set(zval *stream_array, fd_set *fds TSRMLS_DC)
|
||||
zval **elem, **dest_elem;
|
||||
php_stream *stream;
|
||||
HashTable *new_hash;
|
||||
php_socket_t this_fd;
|
||||
int ret = 0;
|
||||
|
||||
if (Z_TYPE_P(stream_array) != IS_ARRAY) {
|
||||
@@ -661,6 +666,11 @@ static int stream_array_from_fd_set(zval *stream_array, fd_set *fds TSRMLS_DC)
|
||||
zend_hash_get_current_data(Z_ARRVAL_P(stream_array), (void **) &elem) == SUCCESS;
|
||||
zend_hash_move_forward(Z_ARRVAL_P(stream_array))) {
|
||||
|
||||
/* Temporary int fd is needed for the STREAM data type on windows, passing this_fd directly to php_stream_cast()
|
||||
would eventually bring a wrong result on x64. php_stream_cast() casts to int internally, and this will leave
|
||||
the higher bits of a SOCKET variable uninitialized on systems with little endian. */
|
||||
int tmp_fd;
|
||||
|
||||
php_stream_from_zval_no_verify(stream, elem);
|
||||
if (stream == NULL) {
|
||||
continue;
|
||||
@@ -670,7 +680,10 @@ static int stream_array_from_fd_set(zval *stream_array, fd_set *fds TSRMLS_DC)
|
||||
* when casting. It is only used here so that the buffered data warning
|
||||
* is not displayed.
|
||||
*/
|
||||
if (SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL, (void*)&this_fd, 1) && this_fd != -1) {
|
||||
if (SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL, (void*)&tmp_fd, 1) && tmp_fd != -1) {
|
||||
|
||||
php_socket_t this_fd = (php_socket_t)tmp_fd;
|
||||
|
||||
if (PHP_SAFE_FD_ISSET(this_fd, fds)) {
|
||||
zend_hash_next_index_insert(new_hash, (void *)elem, sizeof(zval *), (void **)&dest_elem);
|
||||
if (dest_elem) {
|
||||
|
||||
@@ -8,6 +8,11 @@ if (!function_exists("glob")) {
|
||||
?>
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
// run this test in ext/standard/tests (see bug #64714)
|
||||
chdir(__DIR__); // ensure in ext/standard/tests/file
|
||||
chdir('..'); // move up to ext/standard/tests
|
||||
|
||||
$globdirs = glob("*", GLOB_ONLYDIR);
|
||||
|
||||
$dirs = array();
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
--TEST--
|
||||
Bug #64770 stream_select() fails with pipes from proc_open()
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
$descs = array(
|
||||
0 => array('pipe', 'r'), // stdin
|
||||
1 => array('pipe', 'w'), // stdout
|
||||
2 => array('pipe', 'w'), // strerr
|
||||
);
|
||||
|
||||
$other_opts = array('suppress_errors' => false, 'binary_pipes' => true);
|
||||
|
||||
$cmd = (substr(PHP_OS, 0, 3) == 'WIN') ? 'dir' : 'ls';
|
||||
$p = proc_open($cmd, $descs, $pipes, '.', NULL, $other_opts);
|
||||
|
||||
if (is_resource($p)) {
|
||||
$data = '';
|
||||
|
||||
while (1) {
|
||||
$w = $e = NULL;
|
||||
$n = stream_select($pipes, $w, $e, 300);
|
||||
|
||||
if ($n === false) {
|
||||
echo "no streams \n";
|
||||
break;
|
||||
} else if ($n === 0) {
|
||||
echo "process timed out\n";
|
||||
proc_terminate($p, 9);
|
||||
break;
|
||||
} else if ($n > 0) {
|
||||
$line = fread($pipes[1], 8192);
|
||||
if (strlen($line) == 0) {
|
||||
/* EOF */
|
||||
break;
|
||||
}
|
||||
$data .= $line;
|
||||
}
|
||||
}
|
||||
var_dump(strlen($data));
|
||||
|
||||
$ret = proc_close($p);
|
||||
var_dump($ret);
|
||||
} else {
|
||||
echo "no process\n";
|
||||
}
|
||||
?>
|
||||
==DONE==
|
||||
--EXPECTF--
|
||||
int(%d)
|
||||
int(0)
|
||||
==DONE==
|
||||
@@ -0,0 +1,12 @@
|
||||
--TEST--
|
||||
Bug #64879: quoted_printable_encode() wrong size calculation (CVE-2013-2110)
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
quoted_printable_encode(str_repeat("\xf4", 1000));
|
||||
quoted_printable_encode(str_repeat("\xf4", 100000));
|
||||
|
||||
echo "Done\n";
|
||||
?>
|
||||
--EXPECTF--
|
||||
Done
|
||||
@@ -28,6 +28,7 @@
|
||||
#include "ext/standard/file.h"
|
||||
#include "ext/standard/php_string.h"
|
||||
#include "ext/pcre/php_pcre.h"
|
||||
#include "ext/standard/php_filestat.h"
|
||||
#include "php_zip.h"
|
||||
#include "lib/zip.h"
|
||||
#include "lib/zipint.h"
|
||||
@@ -309,6 +310,7 @@ static int php_zip_add_file(struct zip *za, const char *filename, size_t filenam
|
||||
struct zip_source *zs;
|
||||
int cur_idx;
|
||||
char resolved_path[MAXPATHLEN];
|
||||
zval exists_flag;
|
||||
|
||||
|
||||
if (ZIP_OPENBASEDIR_CHECKPATH(filename)) {
|
||||
@@ -319,6 +321,11 @@ static int php_zip_add_file(struct zip *za, const char *filename, size_t filenam
|
||||
return -1;
|
||||
}
|
||||
|
||||
php_stat(resolved_path, strlen(resolved_path), FS_EXISTS, &exists_flag TSRMLS_CC);
|
||||
if (!Z_BVAL(exists_flag)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
zs = zip_source_file(za, resolved_path, offset_start, offset_len);
|
||||
if (!zs) {
|
||||
return -1;
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
--TEST--
|
||||
Bug #64342 ZipArchive::addFile() has to check file existance (variation 1)
|
||||
--SKIPIF--
|
||||
<?php
|
||||
if(!extension_loaded('zip')) die('skip');
|
||||
?>
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
$zip = new ZipArchive;
|
||||
$res = $zip->open(dirname(__FILE__) . '/bug64342.zip', ZipArchive::CREATE);
|
||||
if ($res === TRUE) {
|
||||
$f = md5(uniqid()) . '.txt';
|
||||
echo "$f\n";
|
||||
$res = $zip->addFile($f);
|
||||
if (true == $res) {
|
||||
echo "add ok\n";
|
||||
} else {
|
||||
echo "add failed\n";
|
||||
}
|
||||
$res = $zip->close();
|
||||
if (true == $res) {
|
||||
echo "close ok\n";
|
||||
} else {
|
||||
echo "close failed\n";
|
||||
}
|
||||
} else {
|
||||
echo "open failed\n";
|
||||
}
|
||||
|
||||
|
||||
?>
|
||||
DONE
|
||||
--CLEAN--
|
||||
<?php
|
||||
|
||||
@unlink(dirname(__FILE__) . '/bug64342.zip');
|
||||
--EXPECTF--
|
||||
%s.txt
|
||||
add failed
|
||||
close ok
|
||||
DONE
|
||||
@@ -0,0 +1,37 @@
|
||||
--TEST--
|
||||
Bug #64342 ZipArchive::addFile() has to check file existance (variation 2)
|
||||
--SKIPIF--
|
||||
<?php
|
||||
/* $Id$ */
|
||||
if(!extension_loaded('zip')) die('skip');
|
||||
?>
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
$dirname = dirname(__FILE__) . '/';
|
||||
include $dirname . 'utils.inc';
|
||||
$file = $dirname . '__tmp_oo_addfile.zip';
|
||||
|
||||
copy($dirname . 'test.zip', $file);
|
||||
|
||||
$zip = new ZipArchive;
|
||||
if (!$zip->open($file)) {
|
||||
exit('failed');
|
||||
}
|
||||
if (!$zip->addFile($dirname . 'cant_find_me.txt', 'test.php')) {
|
||||
echo "failed\n";
|
||||
}
|
||||
if ($zip->status == ZIPARCHIVE::ER_OK) {
|
||||
dump_entries_name($zip);
|
||||
$zip->close();
|
||||
} else {
|
||||
echo "failed\n";
|
||||
}
|
||||
@unlink($file);
|
||||
?>
|
||||
--EXPECTF--
|
||||
failed
|
||||
0 bar
|
||||
1 foobar/
|
||||
2 foobar/baz
|
||||
3 entry1.txt
|
||||
+1
-1
@@ -2231,7 +2231,7 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC)
|
||||
zend_file_handle *prepend_file_p, *append_file_p;
|
||||
zend_file_handle prepend_file = {0}, append_file = {0};
|
||||
#if HAVE_BROKEN_GETCWD
|
||||
int old_cwd_fd = -1;
|
||||
volatile int old_cwd_fd = -1;
|
||||
#else
|
||||
char *old_cwd;
|
||||
ALLOCA_FLAG(use_heap)
|
||||
|
||||
+4
-4
@@ -2,7 +2,7 @@
|
||||
/* edit configure.in to change version number */
|
||||
#define PHP_MAJOR_VERSION 5
|
||||
#define PHP_MINOR_VERSION 3
|
||||
#define PHP_RELEASE_VERSION 24
|
||||
#define PHP_EXTRA_VERSION "-dev"
|
||||
#define PHP_VERSION "5.3.24-dev"
|
||||
#define PHP_VERSION_ID 50324
|
||||
#define PHP_RELEASE_VERSION 26
|
||||
#define PHP_EXTRA_VERSION ""
|
||||
#define PHP_VERSION "5.3.26"
|
||||
#define PHP_VERSION_ID 50326
|
||||
+13
-4
@@ -540,12 +540,17 @@ static char *fpm_conf_set_array(zval *key, zval *value, void **config, int conve
|
||||
kv->key = strdup(Z_STRVAL_P(key));
|
||||
|
||||
if (!kv->key) {
|
||||
free(kv);
|
||||
return "fpm_conf_set_array: strdup(key) failed";
|
||||
}
|
||||
|
||||
if (convert_to_bool) {
|
||||
char *err = fpm_conf_set_boolean(value, &subconf, 0);
|
||||
if (err) return err;
|
||||
if (err) {
|
||||
free(kv->key);
|
||||
free(kv);
|
||||
return err;
|
||||
}
|
||||
kv->value = strdup(b ? "1" : "0");
|
||||
} else {
|
||||
kv->value = strdup(Z_STRVAL_P(value));
|
||||
@@ -556,6 +561,7 @@ static char *fpm_conf_set_array(zval *key, zval *value, void **config, int conve
|
||||
|
||||
if (!kv->value) {
|
||||
free(kv->key);
|
||||
free(kv);
|
||||
return "fpm_conf_set_array: strdup(value) failed";
|
||||
}
|
||||
|
||||
@@ -578,6 +584,7 @@ static void *fpm_worker_pool_config_alloc() /* {{{ */
|
||||
wp->config = malloc(sizeof(struct fpm_worker_pool_config_s));
|
||||
|
||||
if (!wp->config) {
|
||||
fpm_worker_pool_free(wp);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1002,7 +1009,7 @@ static int fpm_conf_process_all_pools() /* {{{ */
|
||||
nb_ext = 0;
|
||||
|
||||
/* find the number of extensions */
|
||||
while ((ext = strtok(limit_extensions, " \t"))) {
|
||||
while (strtok(limit_extensions, " \t")) {
|
||||
limit_extensions = NULL;
|
||||
nb_ext++;
|
||||
}
|
||||
@@ -1024,8 +1031,8 @@ static int fpm_conf_process_all_pools() /* {{{ */
|
||||
nb_ext = 0;
|
||||
|
||||
/* parse the string and save the extension in the array */
|
||||
while ((ext = strtok(security_limit_extensions, " \t"))) {
|
||||
security_limit_extensions = NULL;
|
||||
while ((ext = strtok(limit_extensions, " \t"))) {
|
||||
limit_extensions = NULL;
|
||||
wp->limit_extensions[nb_ext++] = strdup(ext);
|
||||
}
|
||||
|
||||
@@ -1107,6 +1114,7 @@ int fpm_conf_write_pid() /* {{{ */
|
||||
|
||||
if (len != write(fd, buf, len)) {
|
||||
zlog(ZLOG_SYSERROR, "Unable to write to the PID file.");
|
||||
close(fd);
|
||||
return -1;
|
||||
}
|
||||
close(fd);
|
||||
@@ -1460,6 +1468,7 @@ int fpm_conf_load_ini_file(char *filename TSRMLS_DC) /* {{{ */
|
||||
|
||||
if (ini_recursion++ > 4) {
|
||||
zlog(ZLOG_ERROR, "failed to include more than 5 files recusively");
|
||||
close(fd);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
@@ -57,7 +57,9 @@ int fpm_log_open(int reopen) /* {{{ */
|
||||
wp->log_fd = fd;
|
||||
}
|
||||
|
||||
fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
|
||||
if (0 > fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC)) {
|
||||
zlog(ZLOG_WARNING, "failed to change attribute of access_log");
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
@@ -237,7 +239,7 @@ int fpm_log_write(char *log_format TSRMLS_DC) /* {{{ */
|
||||
|
||||
case 'f': /* script */
|
||||
if (!test) {
|
||||
len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", proc.script_filename && *proc.script_filename ? proc.script_filename : "-");
|
||||
len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", *proc.script_filename ? proc.script_filename : "-");
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -249,7 +251,7 @@ int fpm_log_write(char *log_format TSRMLS_DC) /* {{{ */
|
||||
|
||||
case 'm': /* method */
|
||||
if (!test) {
|
||||
len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", proc.request_method && *proc.request_method ? proc.request_method : "-");
|
||||
len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", *proc.request_method ? proc.request_method : "-");
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -347,19 +349,19 @@ int fpm_log_write(char *log_format TSRMLS_DC) /* {{{ */
|
||||
|
||||
case 'q': /* query_string */
|
||||
if (!test) {
|
||||
len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", proc.query_string ? proc.query_string : "");
|
||||
len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", proc.query_string);
|
||||
}
|
||||
break;
|
||||
|
||||
case 'Q': /* '?' */
|
||||
if (!test) {
|
||||
len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", proc.query_string && *proc.query_string ? "?" : "");
|
||||
len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", *proc.query_string ? "?" : "");
|
||||
}
|
||||
break;
|
||||
|
||||
case 'r': /* request URI */
|
||||
if (!test) {
|
||||
len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", proc.request_uri ? proc.request_uri : "-");
|
||||
len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", proc.request_uri);
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -397,7 +399,7 @@ int fpm_log_write(char *log_format TSRMLS_DC) /* {{{ */
|
||||
|
||||
case 'u': /* remote user */
|
||||
if (!test) {
|
||||
len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", proc.auth_user ? proc.auth_user : "-");
|
||||
len2 = snprintf(b, FPM_LOG_BUFFER - len, "%s", proc.auth_user);
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
+109
-105
@@ -1179,119 +1179,123 @@ static void init_request_info(TSRMLS_D)
|
||||
int len = script_path_translated_len;
|
||||
char *ptr;
|
||||
|
||||
while ((ptr = strrchr(pt, '/')) || (ptr = strrchr(pt, '\\'))) {
|
||||
*ptr = 0;
|
||||
if (stat(pt, &st) == 0 && S_ISREG(st.st_mode)) {
|
||||
/*
|
||||
* okay, we found the base script!
|
||||
* work out how many chars we had to strip off;
|
||||
* then we can modify PATH_INFO
|
||||
* accordingly
|
||||
*
|
||||
* we now have the makings of
|
||||
* PATH_INFO=/test
|
||||
* SCRIPT_FILENAME=/docroot/info.php
|
||||
*
|
||||
* we now need to figure out what docroot is.
|
||||
* if DOCUMENT_ROOT is set, this is easy, otherwise,
|
||||
* we have to play the game of hide and seek to figure
|
||||
* out what SCRIPT_NAME should be
|
||||
*/
|
||||
int ptlen = strlen(pt);
|
||||
int slen = len - ptlen;
|
||||
int pilen = env_path_info ? strlen(env_path_info) : 0;
|
||||
int tflag = 0;
|
||||
char *path_info;
|
||||
if (apache_was_here) {
|
||||
/* recall that PATH_INFO won't exist */
|
||||
path_info = script_path_translated + ptlen;
|
||||
tflag = (slen != 0 && (!orig_path_info || strcmp(orig_path_info, path_info) != 0));
|
||||
} else {
|
||||
path_info = env_path_info ? env_path_info + pilen - slen : NULL;
|
||||
tflag = (orig_path_info != path_info);
|
||||
}
|
||||
|
||||
if (tflag) {
|
||||
if (orig_path_info) {
|
||||
char old;
|
||||
|
||||
_sapi_cgibin_putenv("ORIG_PATH_INFO", orig_path_info TSRMLS_CC);
|
||||
old = path_info[0];
|
||||
path_info[0] = 0;
|
||||
if (!orig_script_name ||
|
||||
strcmp(orig_script_name, env_path_info) != 0) {
|
||||
if (orig_script_name) {
|
||||
_sapi_cgibin_putenv("ORIG_SCRIPT_NAME", orig_script_name TSRMLS_CC);
|
||||
}
|
||||
SG(request_info).request_uri = _sapi_cgibin_putenv("SCRIPT_NAME", env_path_info TSRMLS_CC);
|
||||
} else {
|
||||
SG(request_info).request_uri = orig_script_name;
|
||||
}
|
||||
path_info[0] = old;
|
||||
}
|
||||
env_path_info = _sapi_cgibin_putenv("PATH_INFO", path_info TSRMLS_CC);
|
||||
}
|
||||
if (!orig_script_filename ||
|
||||
strcmp(orig_script_filename, pt) != 0) {
|
||||
if (orig_script_filename) {
|
||||
_sapi_cgibin_putenv("ORIG_SCRIPT_FILENAME", orig_script_filename TSRMLS_CC);
|
||||
}
|
||||
script_path_translated = _sapi_cgibin_putenv("SCRIPT_FILENAME", pt TSRMLS_CC);
|
||||
}
|
||||
TRANSLATE_SLASHES(pt);
|
||||
|
||||
/* figure out docroot
|
||||
* SCRIPT_FILENAME minus SCRIPT_NAME
|
||||
*/
|
||||
if (env_document_root) {
|
||||
int l = strlen(env_document_root);
|
||||
int path_translated_len = 0;
|
||||
char *path_translated = NULL;
|
||||
|
||||
if (l && env_document_root[l - 1] == '/') {
|
||||
--l;
|
||||
}
|
||||
|
||||
/* we have docroot, so we should have:
|
||||
* DOCUMENT_ROOT=/docroot
|
||||
if (pt) {
|
||||
while ((ptr = strrchr(pt, '/')) || (ptr = strrchr(pt, '\\'))) {
|
||||
*ptr = 0;
|
||||
if (stat(pt, &st) == 0 && S_ISREG(st.st_mode)) {
|
||||
/*
|
||||
* okay, we found the base script!
|
||||
* work out how many chars we had to strip off;
|
||||
* then we can modify PATH_INFO
|
||||
* accordingly
|
||||
*
|
||||
* we now have the makings of
|
||||
* PATH_INFO=/test
|
||||
* SCRIPT_FILENAME=/docroot/info.php
|
||||
*
|
||||
* we now need to figure out what docroot is.
|
||||
* if DOCUMENT_ROOT is set, this is easy, otherwise,
|
||||
* we have to play the game of hide and seek to figure
|
||||
* out what SCRIPT_NAME should be
|
||||
*/
|
||||
int ptlen = strlen(pt);
|
||||
int slen = len - ptlen;
|
||||
int pilen = env_path_info ? strlen(env_path_info) : 0;
|
||||
int tflag = 0;
|
||||
char *path_info;
|
||||
if (apache_was_here) {
|
||||
/* recall that PATH_INFO won't exist */
|
||||
path_info = script_path_translated + ptlen;
|
||||
tflag = (slen != 0 && (!orig_path_info || strcmp(orig_path_info, path_info) != 0));
|
||||
} else {
|
||||
path_info = env_path_info ? env_path_info + pilen - slen : NULL;
|
||||
tflag = (orig_path_info != path_info);
|
||||
}
|
||||
|
||||
/* PATH_TRANSLATED = DOCUMENT_ROOT + PATH_INFO */
|
||||
path_translated_len = l + (env_path_info ? strlen(env_path_info) : 0);
|
||||
path_translated = (char *) emalloc(path_translated_len + 1);
|
||||
memcpy(path_translated, env_document_root, l);
|
||||
if (env_path_info) {
|
||||
memcpy(path_translated + l, env_path_info, (path_translated_len - l));
|
||||
}
|
||||
path_translated[path_translated_len] = '\0';
|
||||
if (orig_path_translated) {
|
||||
_sapi_cgibin_putenv("ORIG_PATH_TRANSLATED", orig_path_translated TSRMLS_CC);
|
||||
}
|
||||
env_path_translated = _sapi_cgibin_putenv("PATH_TRANSLATED", path_translated TSRMLS_CC);
|
||||
efree(path_translated);
|
||||
} else if ( env_script_name &&
|
||||
strstr(pt, env_script_name)
|
||||
) {
|
||||
/* PATH_TRANSLATED = PATH_TRANSLATED - SCRIPT_NAME + PATH_INFO */
|
||||
int ptlen = strlen(pt) - strlen(env_script_name);
|
||||
int path_translated_len = ptlen + (env_path_info ? strlen(env_path_info) : 0);
|
||||
char *path_translated = NULL;
|
||||
if (tflag) {
|
||||
if (orig_path_info) {
|
||||
char old;
|
||||
|
||||
path_translated = (char *) emalloc(path_translated_len + 1);
|
||||
memcpy(path_translated, pt, ptlen);
|
||||
if (env_path_info) {
|
||||
memcpy(path_translated + ptlen, env_path_info, path_translated_len - ptlen);
|
||||
_sapi_cgibin_putenv("ORIG_PATH_INFO", orig_path_info TSRMLS_CC);
|
||||
old = path_info[0];
|
||||
path_info[0] = 0;
|
||||
if (!orig_script_name ||
|
||||
strcmp(orig_script_name, env_path_info) != 0) {
|
||||
if (orig_script_name) {
|
||||
_sapi_cgibin_putenv("ORIG_SCRIPT_NAME", orig_script_name TSRMLS_CC);
|
||||
}
|
||||
SG(request_info).request_uri = _sapi_cgibin_putenv("SCRIPT_NAME", env_path_info TSRMLS_CC);
|
||||
} else {
|
||||
SG(request_info).request_uri = orig_script_name;
|
||||
}
|
||||
path_info[0] = old;
|
||||
}
|
||||
env_path_info = _sapi_cgibin_putenv("PATH_INFO", path_info TSRMLS_CC);
|
||||
}
|
||||
path_translated[path_translated_len] = '\0';
|
||||
if (orig_path_translated) {
|
||||
_sapi_cgibin_putenv("ORIG_PATH_TRANSLATED", orig_path_translated TSRMLS_CC);
|
||||
if (!orig_script_filename ||
|
||||
strcmp(orig_script_filename, pt) != 0) {
|
||||
if (orig_script_filename) {
|
||||
_sapi_cgibin_putenv("ORIG_SCRIPT_FILENAME", orig_script_filename TSRMLS_CC);
|
||||
}
|
||||
script_path_translated = _sapi_cgibin_putenv("SCRIPT_FILENAME", pt TSRMLS_CC);
|
||||
}
|
||||
env_path_translated = _sapi_cgibin_putenv("PATH_TRANSLATED", path_translated TSRMLS_CC);
|
||||
efree(path_translated);
|
||||
TRANSLATE_SLASHES(pt);
|
||||
|
||||
/* figure out docroot
|
||||
* SCRIPT_FILENAME minus SCRIPT_NAME
|
||||
*/
|
||||
if (env_document_root) {
|
||||
int l = strlen(env_document_root);
|
||||
int path_translated_len = 0;
|
||||
char *path_translated = NULL;
|
||||
|
||||
if (l && env_document_root[l - 1] == '/') {
|
||||
--l;
|
||||
}
|
||||
|
||||
/* we have docroot, so we should have:
|
||||
* DOCUMENT_ROOT=/docroot
|
||||
* SCRIPT_FILENAME=/docroot/info.php
|
||||
*/
|
||||
|
||||
/* PATH_TRANSLATED = DOCUMENT_ROOT + PATH_INFO */
|
||||
path_translated_len = l + (env_path_info ? strlen(env_path_info) : 0);
|
||||
path_translated = (char *) emalloc(path_translated_len + 1);
|
||||
memcpy(path_translated, env_document_root, l);
|
||||
if (env_path_info) {
|
||||
memcpy(path_translated + l, env_path_info, (path_translated_len - l));
|
||||
}
|
||||
path_translated[path_translated_len] = '\0';
|
||||
if (orig_path_translated) {
|
||||
_sapi_cgibin_putenv("ORIG_PATH_TRANSLATED", orig_path_translated TSRMLS_CC);
|
||||
}
|
||||
env_path_translated = _sapi_cgibin_putenv("PATH_TRANSLATED", path_translated TSRMLS_CC);
|
||||
efree(path_translated);
|
||||
} else if ( env_script_name &&
|
||||
strstr(pt, env_script_name)
|
||||
) {
|
||||
/* PATH_TRANSLATED = PATH_TRANSLATED - SCRIPT_NAME + PATH_INFO */
|
||||
int ptlen = strlen(pt) - strlen(env_script_name);
|
||||
int path_translated_len = ptlen + (env_path_info ? strlen(env_path_info) : 0);
|
||||
char *path_translated = NULL;
|
||||
|
||||
path_translated = (char *) emalloc(path_translated_len + 1);
|
||||
memcpy(path_translated, pt, ptlen);
|
||||
if (env_path_info) {
|
||||
memcpy(path_translated + ptlen, env_path_info, path_translated_len - ptlen);
|
||||
}
|
||||
path_translated[path_translated_len] = '\0';
|
||||
if (orig_path_translated) {
|
||||
_sapi_cgibin_putenv("ORIG_PATH_TRANSLATED", orig_path_translated TSRMLS_CC);
|
||||
}
|
||||
env_path_translated = _sapi_cgibin_putenv("PATH_TRANSLATED", path_translated TSRMLS_CC);
|
||||
efree(path_translated);
|
||||
}
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
ptr = NULL;
|
||||
}
|
||||
if (!ptr) {
|
||||
/*
|
||||
|
||||
@@ -145,7 +145,9 @@ static void sig_soft_quit(int signo) /* {{{ */
|
||||
|
||||
/* closing fastcgi listening socket will force fcgi_accept() exit immediately */
|
||||
close(0);
|
||||
socket(AF_UNIX, SOCK_STREAM, 0);
|
||||
if (0 > socket(AF_UNIX, SOCK_STREAM, 0)) {
|
||||
zlog(ZLOG_WARNING, "failed to create a new socket");
|
||||
}
|
||||
fpm_php_soft_quit();
|
||||
errno = saved_errno;
|
||||
}
|
||||
|
||||
@@ -167,7 +167,7 @@ static int fpm_sockets_new_listening_socket(struct fpm_worker_pool_s *wp, struct
|
||||
{
|
||||
int flags = 1;
|
||||
int sock;
|
||||
mode_t saved_umask;
|
||||
mode_t saved_umask = 0;
|
||||
|
||||
sock = socket(sa->sa_family, SOCK_STREAM, 0);
|
||||
|
||||
@@ -176,11 +176,14 @@ static int fpm_sockets_new_listening_socket(struct fpm_worker_pool_s *wp, struct
|
||||
return -1;
|
||||
}
|
||||
|
||||
setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags));
|
||||
if (0 > setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &flags, sizeof(flags))) {
|
||||
zlog(ZLOG_WARNING, "failed to change socket attribute");
|
||||
}
|
||||
|
||||
if (wp->listen_address_domain == FPM_AF_UNIX) {
|
||||
if (fpm_socket_unix_test_connect((struct sockaddr_un *)sa, socklen) == 0) {
|
||||
zlog(ZLOG_ERROR, "An another FPM instance seems to already listen on %s", ((struct sockaddr_un *) sa)->sun_path);
|
||||
close(sock);
|
||||
return -1;
|
||||
}
|
||||
unlink( ((struct sockaddr_un *) sa)->sun_path);
|
||||
@@ -192,6 +195,7 @@ static int fpm_sockets_new_listening_socket(struct fpm_worker_pool_s *wp, struct
|
||||
if (wp->listen_address_domain == FPM_AF_UNIX) {
|
||||
umask(saved_umask);
|
||||
}
|
||||
close(sock);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -203,6 +207,7 @@ static int fpm_sockets_new_listening_socket(struct fpm_worker_pool_s *wp, struct
|
||||
if (wp->socket_uid != -1 || wp->socket_gid != -1) {
|
||||
if (0 > chown(path, wp->socket_uid, wp->socket_gid)) {
|
||||
zlog(ZLOG_SYSERROR, "failed to chown() the socket '%s'", wp->config->listen_address);
|
||||
close(sock);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
@@ -210,6 +215,7 @@ static int fpm_sockets_new_listening_socket(struct fpm_worker_pool_s *wp, struct
|
||||
|
||||
if (0 > listen(sock, wp->config->listen_backlog)) {
|
||||
zlog(ZLOG_SYSERROR, "failed to listen to address '%s'", wp->config->listen_address);
|
||||
close(sock);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
@@ -34,6 +34,7 @@ int fpm_stdio_init_main() /* {{{ */
|
||||
|
||||
if (0 > dup2(fd, STDIN_FILENO) || 0 > dup2(fd, STDOUT_FILENO)) {
|
||||
zlog(ZLOG_SYSERROR, "failed to init stdio: dup2()");
|
||||
close(fd);
|
||||
return -1;
|
||||
}
|
||||
close(fd);
|
||||
@@ -294,7 +295,9 @@ int fpm_stdio_open_error_log(int reopen) /* {{{ */
|
||||
zlog_set_fd(fpm_globals.error_log_fd);
|
||||
}
|
||||
}
|
||||
fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
|
||||
if (0 > fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC)) {
|
||||
zlog(ZLOG_WARNING, "failed to change attribute of error_log");
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
@@ -18,6 +18,21 @@
|
||||
|
||||
struct fpm_worker_pool_s *fpm_worker_all_pools;
|
||||
|
||||
void fpm_worker_pool_free(struct fpm_worker_pool_s *wp) /* {{{ */
|
||||
{
|
||||
if (wp->config) {
|
||||
free(wp->config);
|
||||
}
|
||||
if (wp->user) {
|
||||
free(wp->user);
|
||||
}
|
||||
if (wp->home) {
|
||||
free(wp->home);
|
||||
}
|
||||
free(wp);
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
static void fpm_worker_pool_cleanup(int which, void *arg) /* {{{ */
|
||||
{
|
||||
struct fpm_worker_pool_s *wp, *wp_next;
|
||||
@@ -29,10 +44,7 @@ static void fpm_worker_pool_cleanup(int which, void *arg) /* {{{ */
|
||||
if ((which & FPM_CLEANUP_CHILD) == 0 && fpm_globals.parent_pid == getpid()) {
|
||||
fpm_scoreboard_free(wp->scoreboard);
|
||||
}
|
||||
free(wp->config);
|
||||
free(wp->user);
|
||||
free(wp->home);
|
||||
free(wp);
|
||||
fpm_worker_pool_free(wp);
|
||||
}
|
||||
fpm_worker_all_pools = NULL;
|
||||
}
|
||||
|
||||
@@ -45,6 +45,7 @@ struct fpm_worker_pool_s {
|
||||
};
|
||||
|
||||
struct fpm_worker_pool_s *fpm_worker_pool_alloc();
|
||||
void fpm_worker_pool_free(struct fpm_worker_pool_s *wp);
|
||||
int fpm_worker_pool_init_main();
|
||||
|
||||
extern struct fpm_worker_pool_s *fpm_worker_all_pools;
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
bz2-1.0.6
|
||||
cclient-2007e
|
||||
freetype-2.4.10
|
||||
icu-49.1.2
|
||||
jpeglib-8
|
||||
libcurl-7.29.0
|
||||
libiconv-1.14
|
||||
libmcrypt-2.5.8
|
||||
libmpir-1.3.1
|
||||
libpng-1.2.50
|
||||
libpq-8.3.6
|
||||
libssh2-1.4.2
|
||||
libtidy-20090325
|
||||
libxslt-1.1.27
|
||||
libxml-2.7.8
|
||||
openssl-0.9.8y
|
||||
|
||||
bz2-1.0.6
|
||||
cclient-2007e
|
||||
freetype-2.4.10
|
||||
icu-49.1.2
|
||||
jpeglib-8
|
||||
libcurl-7.30.0
|
||||
libiconv-1.14
|
||||
libmcrypt-2.5.8
|
||||
libmpir-1.3.1
|
||||
libpng-1.2.50
|
||||
libpq-8.3.6
|
||||
libssh2-1.4.2
|
||||
libtidy-20090325
|
||||
libxslt-1.1.27
|
||||
libxml-2.7.8
|
||||
openssl-0.9.8y
|
||||
|
||||
+38
-17
@@ -39,33 +39,54 @@ PHPAPI int socketpair(int domain, int type, int protocol, SOCKET sock[2])
|
||||
return -1;
|
||||
}
|
||||
|
||||
sock[0] = sock[1] = redirect = INVALID_SOCKET;
|
||||
|
||||
sock[0] = socket(domain, type, protocol);
|
||||
address.sin_addr.s_addr = INADDR_ANY;
|
||||
address.sin_family = AF_INET;
|
||||
address.sin_port = 0;
|
||||
|
||||
bind(sock[0], (struct sockaddr*)&address, sizeof(address));
|
||||
|
||||
if(getsockname(sock[0], (struct sockaddr *)&address, &size) != 0) {
|
||||
sock[0] = socket(domain, type, protocol);
|
||||
if (INVALID_SOCKET == sock[0]) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
listen(sock[0], 2);
|
||||
sock[1] = socket(domain, type, protocol);
|
||||
address.sin_addr.s_addr = INADDR_ANY;
|
||||
address.sin_family = AF_INET;
|
||||
address.sin_port = 0;
|
||||
|
||||
if (bind(sock[0], (struct sockaddr*)&address, sizeof(address)) != 0) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
if(getsockname(sock[0], (struct sockaddr *)&address, &size) != 0) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (listen(sock[0], 2) != 0) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
sock[1] = socket(domain, type, protocol);
|
||||
if (INVALID_SOCKET == sock[1]) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
address.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
|
||||
if(connect(sock[1], (struct sockaddr*)&address, sizeof(address)) != 0) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
connect(sock[1], (struct sockaddr*)&address, sizeof(address));
|
||||
redirect = accept(sock[0],(struct sockaddr*)&address, &size);
|
||||
if (INVALID_SOCKET == redirect) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
closesocket(sock[0]);
|
||||
sock[0] = redirect;
|
||||
|
||||
if(sock[0] == INVALID_SOCKET ) {
|
||||
closesocket(sock[0]);
|
||||
closesocket(sock[1]);
|
||||
WSASetLastError(WSAECONNABORTED);
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
error:
|
||||
closesocket(redirect);
|
||||
closesocket(sock[0]);
|
||||
closesocket(sock[1]);
|
||||
WSASetLastError(WSAECONNABORTED);
|
||||
return -1;
|
||||
}
|
||||
Reference in new issue
Block a user