mirror of
https://github.com/bdnugget/php-src.git
synced 2026-11-18 22:46:38 +00:00
Compare commits
50
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8eb2a1067c | ||
|
|
ae106ba62f | ||
|
|
8736632499 | ||
|
|
64af3c21e6 | ||
|
|
13a218d328 | ||
|
|
deadeeae1d | ||
|
|
88527e4569 | ||
|
|
3c925b18fa | ||
|
|
22b9f16e9a | ||
|
|
270df3ffd6 | ||
|
|
ec3d25fcbd | ||
|
|
5b295bf191 | ||
|
|
37d5a2b18f | ||
|
|
8c9e254319 | ||
|
|
2b5bffe6c7 | ||
|
|
a1abdba1eb | ||
|
|
503f8193e8 | ||
|
|
2728e6f017 | ||
|
|
6d9c9f8f04 | ||
|
|
bb3d43fa05 | ||
|
|
ddb207e7fa | ||
|
|
d1e030db02 | ||
|
|
9aa9014523 | ||
|
|
44035de79f | ||
|
|
71ba533640 | ||
|
|
b73ef0ee4a | ||
|
|
c2cce33cba | ||
|
|
82b07b62c0 | ||
|
|
061cb9b807 | ||
|
|
d0e51f5ce9 | ||
|
|
09f9403a6e | ||
|
|
d319a0c1d8 | ||
|
|
df9078ea55 | ||
|
|
d21602c072 | ||
|
|
648673bffe | ||
|
|
b386991471 | ||
|
|
136dd53ac2 | ||
|
|
0874ef624c | ||
|
|
046c345de5 | ||
|
|
ef0eed7f5f | ||
|
|
0cc2600ec6 | ||
|
|
26ff3a4c1e | ||
|
|
d67c05bb89 | ||
|
|
93288d0095 | ||
|
|
25e65a7599 | ||
|
|
15ba757a2b | ||
|
|
2cf94189a2 | ||
|
|
4e7b31a0db | ||
|
|
d7b01aff89 | ||
|
|
cfe8a8b968 |
No files matched your search
@@ -19,6 +19,7 @@
|
||||
*.tgz
|
||||
*.tar.gz
|
||||
*.tar.bz2
|
||||
*.tar.xz
|
||||
.FBCIndex
|
||||
.FBCLockFolder
|
||||
.deps
|
||||
|
||||
+12
@@ -385,6 +385,12 @@ MAINTENANCE: Maintained
|
||||
STATUS: Working
|
||||
SINCE: 4.0.4
|
||||
-------------------------------------------------------------------------------
|
||||
EXTENSION: hash
|
||||
PRIMARY MAINTAINER: Sara Golemon <pollita@php.net>, Mike Wallner <mike@php.net>, Anatol Belski <ab@php.net>
|
||||
MAINTENANCE: Maintained
|
||||
STATUS: Working
|
||||
SINCE: 5.1.2
|
||||
-------------------------------------------------------------------------------
|
||||
EXTENSION: iconv
|
||||
PRIMARY MAINTAINER: Moriyoshi Koizumi <moriyoshi@php.net>
|
||||
MAINTENANCE: Maintained
|
||||
@@ -438,6 +444,12 @@ PRIMARY MAINTAINER: Frank M. Kromann
|
||||
MAINTENANCE: Unknown
|
||||
STATUS: Experimental
|
||||
-------------------------------------------------------------------------------
|
||||
EXTENSION: opcache
|
||||
PRIMARY MAINTAINER: Dmitry Stogov <dmitry@zend.com>, Xinchen Hui <laruence@php.net>
|
||||
MAINTENANCE: Maintained
|
||||
STATUS: Working
|
||||
SINCE: 5.5.0
|
||||
-------------------------------------------------------------------------------
|
||||
EXTENSION: openssl
|
||||
PRIMARY MAINTAINER: Wez Furlong <wez@php.net>, Pierre-Alain Joye <pajoye@php.net>
|
||||
MAINTENANCE: Maintained
|
||||
|
||||
@@ -1,5 +1,47 @@
|
||||
PHP NEWS
|
||||
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||
13 Nov 2014, PHP 5.5.19
|
||||
|
||||
- Core:
|
||||
. Fixed bug #68095 (AddressSanitizer reports a heap buffer overflow in
|
||||
php_getopt()). (Stas)
|
||||
. Fixed bug #68118 ($a->foo .= 'test'; can leave $a->foo undefined). (Nikita)
|
||||
. Fixed bug #68129 (parse_url() - incomplete support for empty usernames
|
||||
and passwords) (Tjerk)
|
||||
Fixed bug #68365 (zend_mm_heap corrupted after memory overflow in
|
||||
zend_hash_copy). (Dmitry)
|
||||
|
||||
- Fileinfo:
|
||||
. Fixed bug #66242 (libmagic: don't assume char is signed). (ArdB)
|
||||
. Fixed bug #68283 (fileinfo: out-of-bounds read in elf note headers).
|
||||
(CVE-2014-3710) (Remi)
|
||||
|
||||
- FPM:
|
||||
. Implemented FR #55508 (listen and listen.allowed_clients should take IPv6
|
||||
addresses). (Robin Gloster)
|
||||
|
||||
- GD:
|
||||
. Fixed bug #65171 (imagescale() fails without height param). (Remi)
|
||||
|
||||
- GMP:
|
||||
. Fixed bug #63595 (GMP memory management conflicts with other libraries
|
||||
using GMP). (Remi)
|
||||
|
||||
- Mysqli:
|
||||
. Fixed bug #68114 (linker error on some OS X machines with fixed width
|
||||
decimal support) (Keyur Govande)
|
||||
|
||||
- ODBC:
|
||||
. Fixed bug #68087 (ODBC not correctly reading DATE column when preceded by
|
||||
a VARCHAR column) (Keyur Govande)
|
||||
|
||||
- SPL:
|
||||
. Fixed bug #68128 (Regression in RecursiveRegexIterator) (Tjerk)
|
||||
|
||||
- CURL:
|
||||
. Add CURL_SSLVERSION_TLSv1_0, CURL_SSLVERSION_TLSv1_1, and
|
||||
CURL_SSLVERSION_TLSv1_2 constants if supported by libcurl (Rasmus)
|
||||
|
||||
16 Oct 2014, PHP 5.5.18
|
||||
|
||||
- Core:
|
||||
@@ -10,33 +52,17 @@ PHP NEWS
|
||||
. Fixed bug #67633 (A foreach on an array returned from a function not doing
|
||||
copy-on-write). (Nikita)
|
||||
. Fixed bug #51800 (proc_open on Windows hangs forever). (Anatol)
|
||||
. Fixed bug #68044 (Integer overflow in unserialize() (32-bits only)).
|
||||
(CVE-2014-3669) (Stas)
|
||||
|
||||
- cURL:
|
||||
. Fixed bug #68089 (NULL byte injection - cURL lib). (Stas)
|
||||
|
||||
- EXIF:
|
||||
. Fixed bug #68113 (Heap corruption in exif_thumbnail()). (CVE-2014-3670)
|
||||
(Stas)
|
||||
|
||||
- FPM:
|
||||
. Fixed bug #65641 (PHP-FPM incorrectly defines the SCRIPT_NAME variable
|
||||
when using Apache, mod_proxy-fcgi and ProxyPass). (Remi)
|
||||
|
||||
- OpenSSL:
|
||||
. Revert regression introduced by fix of bug #41631
|
||||
|
||||
- Reflection:
|
||||
. Fixed bug #68103 (Duplicate entry in Reflection for class alias). (Remi)
|
||||
|
||||
- Session:
|
||||
. Fixed bug #67972 (SessionHandler Invalid memory read create_sid()). (Adam)
|
||||
|
||||
- XMLRPC:
|
||||
. Fixed bug #68027 (Global buffer overflow in mkgmtime() function).
|
||||
(CVE-2014-3668) (Stas)
|
||||
|
||||
18 Sep 2014, PHP 5.5.17
|
||||
|
||||
- Core:
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
--TEST--
|
||||
Bug #68118: $a->foo .= 'test'; can leave $a->foo undefined
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
set_error_handler(function() {
|
||||
$obj = new stdClass;
|
||||
$obj->test = 'meow';
|
||||
return true;
|
||||
});
|
||||
|
||||
$a = new stdClass;
|
||||
$a->undefined .= 'test';
|
||||
var_dump($a);
|
||||
|
||||
?>
|
||||
--EXPECT--
|
||||
object(stdClass)#2 (1) {
|
||||
["undefined"]=>
|
||||
string(4) "test"
|
||||
}
|
||||
@@ -754,9 +754,6 @@ static zval **zend_std_get_property_ptr_ptr(zval *object, zval *member, int type
|
||||
/* we don't have access controls - will just add it */
|
||||
new_zval = &EG(uninitialized_zval);
|
||||
|
||||
if(UNEXPECTED(type == BP_VAR_RW || type == BP_VAR_R)) {
|
||||
zend_error(E_NOTICE, "Undefined property: %s::$%s", zobj->ce->name, Z_STRVAL_P(member));
|
||||
}
|
||||
Z_ADDREF_P(new_zval);
|
||||
if (EXPECTED((property_info->flags & ZEND_ACC_STATIC) == 0) &&
|
||||
property_info->offset >= 0) {
|
||||
@@ -776,6 +773,12 @@ static zval **zend_std_get_property_ptr_ptr(zval *object, zval *member, int type
|
||||
}
|
||||
zend_hash_quick_update(zobj->properties, property_info->name, property_info->name_length+1, property_info->h, &new_zval, sizeof(zval *), (void **) &retval);
|
||||
}
|
||||
|
||||
/* Notice is thrown after creation of the property, to avoid EG(std_property_info)
|
||||
* being overwritten in an error handler. */
|
||||
if (UNEXPECTED(type == BP_VAR_RW || type == BP_VAR_R)) {
|
||||
zend_error(E_NOTICE, "Undefined property: %s::$%s", zobj->ce->name, Z_STRVAL_P(member));
|
||||
}
|
||||
} else {
|
||||
/* we do have getter - fail and let it try again with usual get/set */
|
||||
retval = NULL;
|
||||
|
||||
@@ -135,9 +135,9 @@ ZEND_API void _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC)
|
||||
}
|
||||
ALLOC_HASHTABLE_REL(tmp_ht);
|
||||
zend_hash_init(tmp_ht, zend_hash_num_elements(original_ht), NULL, ZVAL_PTR_DTOR, 0);
|
||||
zvalue->value.ht = tmp_ht;
|
||||
zend_hash_copy(tmp_ht, original_ht, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
|
||||
tmp_ht->nNextFreeElement = original_ht->nNextFreeElement;
|
||||
zvalue->value.ht = tmp_ht;
|
||||
}
|
||||
break;
|
||||
case IS_OBJECT:
|
||||
|
||||
+1
-1
@@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
|
||||
|
||||
PHP_MAJOR_VERSION=5
|
||||
PHP_MINOR_VERSION=5
|
||||
PHP_RELEASE_VERSION=18
|
||||
PHP_RELEASE_VERSION=19
|
||||
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`
|
||||
|
||||
@@ -1202,6 +1202,12 @@ PHP_MINIT_FUNCTION(curl)
|
||||
REGISTER_CURL_CONSTANT(CURLSSLOPT_ALLOW_BEAST);
|
||||
#endif
|
||||
|
||||
#if LIBCURL_VERSION_NUM >= 0x072200 /* Available since 7.34.0 */
|
||||
REGISTER_CURL_CONSTANT(CURL_SSLVERSION_TLSv1_0);
|
||||
REGISTER_CURL_CONSTANT(CURL_SSLVERSION_TLSv1_1);
|
||||
REGISTER_CURL_CONSTANT(CURL_SSLVERSION_TLSv1_2);
|
||||
#endif
|
||||
|
||||
#if CURLOPT_FTPASCII != 0
|
||||
REGISTER_CURL_CONSTANT(CURLOPT_FTPASCII);
|
||||
#endif
|
||||
|
||||
+394
-379
@@ -1,4 +1,4 @@
|
||||
const timelib_tzdb_index_entry timezonedb_idx_builtin[582] = {
|
||||
const timelib_tzdb_index_entry timezonedb_idx_builtin[583] = {
|
||||
{ "Africa/Abidjan" , 0x000000 },
|
||||
{ "Africa/Accra" , 0x000055 },
|
||||
{ "Africa/Addis_Ababa" , 0x00019D },
|
||||
@@ -261,329 +261,330 @@ const timelib_tzdb_index_entry timezonedb_idx_builtin[582] = {
|
||||
{ "Asia/Harbin" , 0x01B474 },
|
||||
{ "Asia/Hebron" , 0x01B514 },
|
||||
{ "Asia/Ho_Chi_Minh" , 0x01B870 },
|
||||
{ "Asia/Hong_Kong" , 0x01B8E8 },
|
||||
{ "Asia/Hovd" , 0x01BAAA },
|
||||
{ "Asia/Irkutsk" , 0x01BC22 },
|
||||
{ "Asia/Istanbul" , 0x01BE0D },
|
||||
{ "Asia/Jakarta" , 0x01C1FA },
|
||||
{ "Asia/Jayapura" , 0x01C2A4 },
|
||||
{ "Asia/Jerusalem" , 0x01C341 },
|
||||
{ "Asia/Kabul" , 0x01C670 },
|
||||
{ "Asia/Kamchatka" , 0x01C6C1 },
|
||||
{ "Asia/Karachi" , 0x01C8BA },
|
||||
{ "Asia/Kashgar" , 0x01C96F },
|
||||
{ "Asia/Kathmandu" , 0x01C9C4 },
|
||||
{ "Asia/Katmandu" , 0x01CA2A },
|
||||
{ "Asia/Khandyga" , 0x01CA90 },
|
||||
{ "Asia/Kolkata" , 0x01CCBA },
|
||||
{ "Asia/Krasnoyarsk" , 0x01CD33 },
|
||||
{ "Asia/Kuala_Lumpur" , 0x01CF20 },
|
||||
{ "Asia/Kuching" , 0x01CFDD },
|
||||
{ "Asia/Kuwait" , 0x01D0CB },
|
||||
{ "Asia/Macao" , 0x01D120 },
|
||||
{ "Asia/Macau" , 0x01D25B },
|
||||
{ "Asia/Magadan" , 0x01D396 },
|
||||
{ "Asia/Makassar" , 0x01D59A },
|
||||
{ "Asia/Manila" , 0x01D65F },
|
||||
{ "Asia/Muscat" , 0x01D6E4 },
|
||||
{ "Asia/Nicosia" , 0x01D739 },
|
||||
{ "Asia/Novokuznetsk" , 0x01DA21 },
|
||||
{ "Asia/Novosibirsk" , 0x01DC41 },
|
||||
{ "Asia/Omsk" , 0x01DE31 },
|
||||
{ "Asia/Oral" , 0x01E01D },
|
||||
{ "Asia/Phnom_Penh" , 0x01E1ED },
|
||||
{ "Asia/Pontianak" , 0x01E265 },
|
||||
{ "Asia/Pyongyang" , 0x01E327 },
|
||||
{ "Asia/Qatar" , 0x01E3B7 },
|
||||
{ "Asia/Qyzylorda" , 0x01E41D },
|
||||
{ "Asia/Rangoon" , 0x01E5F3 },
|
||||
{ "Asia/Riyadh" , 0x01E66B },
|
||||
{ "Asia/Saigon" , 0x01E6C0 },
|
||||
{ "Asia/Sakhalin" , 0x01E738 },
|
||||
{ "Asia/Samarkand" , 0x01E935 },
|
||||
{ "Asia/Seoul" , 0x01EA6B },
|
||||
{ "Asia/Shanghai" , 0x01EB32 },
|
||||
{ "Asia/Singapore" , 0x01EBDE },
|
||||
{ "Asia/Srednekolymsk" , 0x01EC95 },
|
||||
{ "Asia/Taipei" , 0x01EE95 },
|
||||
{ "Asia/Tashkent" , 0x01EFC6 },
|
||||
{ "Asia/Tbilisi" , 0x01F0F7 },
|
||||
{ "Asia/Tehran" , 0x01F2B1 },
|
||||
{ "Asia/Tel_Aviv" , 0x01F51F },
|
||||
{ "Asia/Thimbu" , 0x01F84E },
|
||||
{ "Asia/Thimphu" , 0x01F8B4 },
|
||||
{ "Asia/Tokyo" , 0x01F91A },
|
||||
{ "Asia/Ujung_Pandang" , 0x01F9A4 },
|
||||
{ "Asia/Ulaanbaatar" , 0x01FA21 },
|
||||
{ "Asia/Ulan_Bator" , 0x01FB7C },
|
||||
{ "Asia/Urumqi" , 0x01FCC9 },
|
||||
{ "Asia/Ust-Nera" , 0x01FD2B },
|
||||
{ "Asia/Vientiane" , 0x01FF3D },
|
||||
{ "Asia/Vladivostok" , 0x01FFB5 },
|
||||
{ "Asia/Yakutsk" , 0x02019F },
|
||||
{ "Asia/Yekaterinburg" , 0x020389 },
|
||||
{ "Asia/Yerevan" , 0x0205AA },
|
||||
{ "Atlantic/Azores" , 0x0207AA },
|
||||
{ "Atlantic/Bermuda" , 0x020CAD },
|
||||
{ "Atlantic/Canary" , 0x020F8E },
|
||||
{ "Atlantic/Cape_Verde" , 0x021264 },
|
||||
{ "Atlantic/Faeroe" , 0x0212DD },
|
||||
{ "Atlantic/Faroe" , 0x021581 },
|
||||
{ "Atlantic/Jan_Mayen" , 0x021825 },
|
||||
{ "Atlantic/Madeira" , 0x021B57 },
|
||||
{ "Atlantic/Reykjavik" , 0x022060 },
|
||||
{ "Atlantic/South_Georgia" , 0x022219 },
|
||||
{ "Atlantic/St_Helena" , 0x02242B },
|
||||
{ "Atlantic/Stanley" , 0x02225D },
|
||||
{ "Australia/ACT" , 0x022480 },
|
||||
{ "Australia/Adelaide" , 0x0227A3 },
|
||||
{ "Australia/Brisbane" , 0x022AD5 },
|
||||
{ "Australia/Broken_Hill" , 0x022BA2 },
|
||||
{ "Australia/Canberra" , 0x022EE6 },
|
||||
{ "Australia/Currie" , 0x023209 },
|
||||
{ "Australia/Darwin" , 0x023542 },
|
||||
{ "Australia/Eucla" , 0x0235CE },
|
||||
{ "Australia/Hobart" , 0x0236AA },
|
||||
{ "Australia/LHI" , 0x023A0E },
|
||||
{ "Australia/Lindeman" , 0x023CAF },
|
||||
{ "Australia/Lord_Howe" , 0x023D96 },
|
||||
{ "Australia/Melbourne" , 0x024047 },
|
||||
{ "Australia/North" , 0x024372 },
|
||||
{ "Australia/NSW" , 0x0243EC },
|
||||
{ "Australia/Perth" , 0x02470F },
|
||||
{ "Australia/Queensland" , 0x0247ED },
|
||||
{ "Australia/South" , 0x02489F },
|
||||
{ "Australia/Sydney" , 0x024BC2 },
|
||||
{ "Australia/Tasmania" , 0x024F05 },
|
||||
{ "Australia/Victoria" , 0x025250 },
|
||||
{ "Australia/West" , 0x025573 },
|
||||
{ "Australia/Yancowinna" , 0x02562F },
|
||||
{ "Brazil/Acre" , 0x025957 },
|
||||
{ "Brazil/DeNoronha" , 0x025A5B },
|
||||
{ "Brazil/East" , 0x025B7B },
|
||||
{ "Brazil/West" , 0x025E58 },
|
||||
{ "Canada/Atlantic" , 0x025F50 },
|
||||
{ "Canada/Central" , 0x026438 },
|
||||
{ "Canada/East-Saskatchewan" , 0x026D42 },
|
||||
{ "Canada/Eastern" , 0x026852 },
|
||||
{ "Canada/Mountain" , 0x026ECB },
|
||||
{ "Canada/Newfoundland" , 0x027241 },
|
||||
{ "Canada/Pacific" , 0x02776C },
|
||||
{ "Canada/Saskatchewan" , 0x027B85 },
|
||||
{ "Canada/Yukon" , 0x027D0E },
|
||||
{ "CET" , 0x028011 },
|
||||
{ "Chile/Continental" , 0x02831A },
|
||||
{ "Chile/EasterIsland" , 0x0286B5 },
|
||||
{ "CST6CDT" , 0x0289F7 },
|
||||
{ "Cuba" , 0x028D48 },
|
||||
{ "EET" , 0x0290BB },
|
||||
{ "Egypt" , 0x02936E },
|
||||
{ "Eire" , 0x029755 },
|
||||
{ "EST" , 0x029C66 },
|
||||
{ "EST5EDT" , 0x029CAA },
|
||||
{ "Etc/GMT" , 0x029FFB },
|
||||
{ "Etc/GMT+0" , 0x02A0C7 },
|
||||
{ "Etc/GMT+1" , 0x02A151 },
|
||||
{ "Etc/GMT+10" , 0x02A1DE },
|
||||
{ "Etc/GMT+11" , 0x02A26C },
|
||||
{ "Etc/GMT+12" , 0x02A2FA },
|
||||
{ "Etc/GMT+2" , 0x02A415 },
|
||||
{ "Etc/GMT+3" , 0x02A4A1 },
|
||||
{ "Etc/GMT+4" , 0x02A52D },
|
||||
{ "Etc/GMT+5" , 0x02A5B9 },
|
||||
{ "Etc/GMT+6" , 0x02A645 },
|
||||
{ "Etc/GMT+7" , 0x02A6D1 },
|
||||
{ "Etc/GMT+8" , 0x02A75D },
|
||||
{ "Etc/GMT+9" , 0x02A7E9 },
|
||||
{ "Etc/GMT-0" , 0x02A083 },
|
||||
{ "Etc/GMT-1" , 0x02A10B },
|
||||
{ "Etc/GMT-10" , 0x02A197 },
|
||||
{ "Etc/GMT-11" , 0x02A225 },
|
||||
{ "Etc/GMT-12" , 0x02A2B3 },
|
||||
{ "Etc/GMT-13" , 0x02A341 },
|
||||
{ "Etc/GMT-14" , 0x02A388 },
|
||||
{ "Etc/GMT-2" , 0x02A3CF },
|
||||
{ "Etc/GMT-3" , 0x02A45B },
|
||||
{ "Etc/GMT-4" , 0x02A4E7 },
|
||||
{ "Etc/GMT-5" , 0x02A573 },
|
||||
{ "Etc/GMT-6" , 0x02A5FF },
|
||||
{ "Etc/GMT-7" , 0x02A68B },
|
||||
{ "Etc/GMT-8" , 0x02A717 },
|
||||
{ "Etc/GMT-9" , 0x02A7A3 },
|
||||
{ "Etc/GMT0" , 0x02A03F },
|
||||
{ "Etc/Greenwich" , 0x02A82F },
|
||||
{ "Etc/UCT" , 0x02A873 },
|
||||
{ "Etc/Universal" , 0x02A8B7 },
|
||||
{ "Etc/UTC" , 0x02A8FB },
|
||||
{ "Etc/Zulu" , 0x02A93F },
|
||||
{ "Europe/Amsterdam" , 0x02A983 },
|
||||
{ "Europe/Andorra" , 0x02ADC1 },
|
||||
{ "Europe/Athens" , 0x02B03D },
|
||||
{ "Europe/Belfast" , 0x02B380 },
|
||||
{ "Europe/Belgrade" , 0x02B8B7 },
|
||||
{ "Europe/Berlin" , 0x02BB80 },
|
||||
{ "Europe/Bratislava" , 0x02BEE4 },
|
||||
{ "Europe/Brussels" , 0x02C216 },
|
||||
{ "Europe/Bucharest" , 0x02C64D },
|
||||
{ "Europe/Budapest" , 0x02C977 },
|
||||
{ "Europe/Busingen" , 0x02CCE0 },
|
||||
{ "Europe/Chisinau" , 0x02CF97 },
|
||||
{ "Europe/Copenhagen" , 0x02D325 },
|
||||
{ "Europe/Dublin" , 0x02D62F },
|
||||
{ "Europe/Gibraltar" , 0x02DB40 },
|
||||
{ "Europe/Guernsey" , 0x02DF97 },
|
||||
{ "Europe/Helsinki" , 0x02E4CE },
|
||||
{ "Europe/Isle_of_Man" , 0x02E784 },
|
||||
{ "Europe/Istanbul" , 0x02ECBB },
|
||||
{ "Europe/Jersey" , 0x02F0A8 },
|
||||
{ "Europe/Kaliningrad" , 0x02F5DF },
|
||||
{ "Europe/Kiev" , 0x02F84A },
|
||||
{ "Europe/Lisbon" , 0x02FB66 },
|
||||
{ "Europe/Ljubljana" , 0x03006A },
|
||||
{ "Europe/London" , 0x030333 },
|
||||
{ "Europe/Luxembourg" , 0x03086A },
|
||||
{ "Europe/Madrid" , 0x030CC0 },
|
||||
{ "Europe/Malta" , 0x031086 },
|
||||
{ "Europe/Mariehamn" , 0x03143F },
|
||||
{ "Europe/Minsk" , 0x0316F5 },
|
||||
{ "Europe/Monaco" , 0x031903 },
|
||||
{ "Europe/Moscow" , 0x031D3E },
|
||||
{ "Europe/Nicosia" , 0x031F98 },
|
||||
{ "Europe/Oslo" , 0x032280 },
|
||||
{ "Europe/Paris" , 0x0325B2 },
|
||||
{ "Europe/Podgorica" , 0x0329F8 },
|
||||
{ "Europe/Prague" , 0x032CC1 },
|
||||
{ "Europe/Riga" , 0x032FF3 },
|
||||
{ "Europe/Rome" , 0x033338 },
|
||||
{ "Europe/Samara" , 0x0336FB },
|
||||
{ "Europe/San_Marino" , 0x033964 },
|
||||
{ "Europe/Sarajevo" , 0x033D27 },
|
||||
{ "Europe/Simferopol" , 0x033FF0 },
|
||||
{ "Europe/Skopje" , 0x034241 },
|
||||
{ "Europe/Sofia" , 0x03450A },
|
||||
{ "Europe/Stockholm" , 0x034812 },
|
||||
{ "Europe/Tallinn" , 0x034AC1 },
|
||||
{ "Europe/Tirane" , 0x034DFB },
|
||||
{ "Europe/Tiraspol" , 0x035101 },
|
||||
{ "Europe/Uzhgorod" , 0x03548F },
|
||||
{ "Europe/Vaduz" , 0x0357A6 },
|
||||
{ "Europe/Vatican" , 0x035A55 },
|
||||
{ "Europe/Vienna" , 0x035E18 },
|
||||
{ "Europe/Vilnius" , 0x036145 },
|
||||
{ "Europe/Volgograd" , 0x036484 },
|
||||
{ "Europe/Warsaw" , 0x0366A5 },
|
||||
{ "Europe/Zagreb" , 0x036A86 },
|
||||
{ "Europe/Zaporozhye" , 0x036D4F },
|
||||
{ "Europe/Zurich" , 0x037090 },
|
||||
{ "Factory" , 0x03733F },
|
||||
{ "GB" , 0x0373B0 },
|
||||
{ "GB-Eire" , 0x0378E7 },
|
||||
{ "GMT" , 0x037E1E },
|
||||
{ "GMT+0" , 0x037EEA },
|
||||
{ "GMT-0" , 0x037EA6 },
|
||||
{ "GMT0" , 0x037E62 },
|
||||
{ "Greenwich" , 0x037F2E },
|
||||
{ "Hongkong" , 0x037F72 },
|
||||
{ "HST" , 0x038134 },
|
||||
{ "Iceland" , 0x038178 },
|
||||
{ "Indian/Antananarivo" , 0x038331 },
|
||||
{ "Indian/Chagos" , 0x0383A5 },
|
||||
{ "Indian/Christmas" , 0x038407 },
|
||||
{ "Indian/Cocos" , 0x03844B },
|
||||
{ "Indian/Comoro" , 0x03848F },
|
||||
{ "Indian/Kerguelen" , 0x0384E4 },
|
||||
{ "Indian/Mahe" , 0x038539 },
|
||||
{ "Indian/Maldives" , 0x03858E },
|
||||
{ "Indian/Mauritius" , 0x0385E3 },
|
||||
{ "Indian/Mayotte" , 0x038659 },
|
||||
{ "Indian/Reunion" , 0x0386AE },
|
||||
{ "Iran" , 0x038703 },
|
||||
{ "Israel" , 0x038971 },
|
||||
{ "Jamaica" , 0x038CA0 },
|
||||
{ "Japan" , 0x038D65 },
|
||||
{ "Kwajalein" , 0x038DEF },
|
||||
{ "Libya" , 0x038E52 },
|
||||
{ "MET" , 0x038F5B },
|
||||
{ "Mexico/BajaNorte" , 0x039264 },
|
||||
{ "Mexico/BajaSur" , 0x0395CD },
|
||||
{ "Mexico/General" , 0x039812 },
|
||||
{ "MST" , 0x039A70 },
|
||||
{ "MST7MDT" , 0x039AB4 },
|
||||
{ "Navajo" , 0x039E05 },
|
||||
{ "NZ" , 0x03A17E },
|
||||
{ "NZ-CHAT" , 0x03A4FC },
|
||||
{ "Pacific/Apia" , 0x03A7E0 },
|
||||
{ "Pacific/Auckland" , 0x03A97C },
|
||||
{ "Pacific/Chatham" , 0x03AD08 },
|
||||
{ "Pacific/Chuuk" , 0x03AFFB },
|
||||
{ "Pacific/Easter" , 0x03B054 },
|
||||
{ "Pacific/Efate" , 0x03B3A3 },
|
||||
{ "Pacific/Enderbury" , 0x03B469 },
|
||||
{ "Pacific/Fakaofo" , 0x03B4D7 },
|
||||
{ "Pacific/Fiji" , 0x03B528 },
|
||||
{ "Pacific/Funafuti" , 0x03B6BB },
|
||||
{ "Pacific/Galapagos" , 0x03B6FF },
|
||||
{ "Pacific/Gambier" , 0x03B777 },
|
||||
{ "Pacific/Guadalcanal" , 0x03B7DC },
|
||||
{ "Pacific/Guam" , 0x03B831 },
|
||||
{ "Pacific/Honolulu" , 0x03B887 },
|
||||
{ "Pacific/Johnston" , 0x03B8FE },
|
||||
{ "Pacific/Kiritimati" , 0x03B97D },
|
||||
{ "Pacific/Kosrae" , 0x03B9E8 },
|
||||
{ "Pacific/Kwajalein" , 0x03BA45 },
|
||||
{ "Pacific/Majuro" , 0x03BAB1 },
|
||||
{ "Pacific/Marquesas" , 0x03BB10 },
|
||||
{ "Pacific/Midway" , 0x03BB77 },
|
||||
{ "Pacific/Nauru" , 0x03BC01 },
|
||||
{ "Pacific/Niue" , 0x03BC79 },
|
||||
{ "Pacific/Norfolk" , 0x03BCD7 },
|
||||
{ "Pacific/Noumea" , 0x03BD2C },
|
||||
{ "Pacific/Pago_Pago" , 0x03BDBC },
|
||||
{ "Pacific/Palau" , 0x03BE33 },
|
||||
{ "Pacific/Pitcairn" , 0x03BE77 },
|
||||
{ "Pacific/Pohnpei" , 0x03BECC },
|
||||
{ "Pacific/Ponape" , 0x03BF21 },
|
||||
{ "Pacific/Port_Moresby" , 0x03BF66 },
|
||||
{ "Pacific/Rarotonga" , 0x03BFAA },
|
||||
{ "Pacific/Saipan" , 0x03C086 },
|
||||
{ "Pacific/Samoa" , 0x03C0E9 },
|
||||
{ "Pacific/Tahiti" , 0x03C160 },
|
||||
{ "Pacific/Tarawa" , 0x03C1C5 },
|
||||
{ "Pacific/Tongatapu" , 0x03C219 },
|
||||
{ "Pacific/Truk" , 0x03C2A5 },
|
||||
{ "Pacific/Wake" , 0x03C2EA },
|
||||
{ "Pacific/Wallis" , 0x03C33A },
|
||||
{ "Pacific/Yap" , 0x03C37E },
|
||||
{ "Poland" , 0x03C3C3 },
|
||||
{ "Portugal" , 0x03C7A4 },
|
||||
{ "PRC" , 0x03CCA0 },
|
||||
{ "PST8PDT" , 0x03CD40 },
|
||||
{ "ROC" , 0x03D091 },
|
||||
{ "ROK" , 0x03D1C2 },
|
||||
{ "Singapore" , 0x03D289 },
|
||||
{ "Turkey" , 0x03D340 },
|
||||
{ "UCT" , 0x03D72D },
|
||||
{ "Universal" , 0x03D771 },
|
||||
{ "US/Alaska" , 0x03D7B5 },
|
||||
{ "US/Aleutian" , 0x03DB1E },
|
||||
{ "US/Arizona" , 0x03DE84 },
|
||||
{ "US/Central" , 0x03DF12 },
|
||||
{ "US/East-Indiana" , 0x03E91C },
|
||||
{ "US/Eastern" , 0x03E41D },
|
||||
{ "US/Hawaii" , 0x03EB86 },
|
||||
{ "US/Indiana-Starke" , 0x03EBF7 },
|
||||
{ "US/Michigan" , 0x03EF68 },
|
||||
{ "US/Mountain" , 0x03F29F },
|
||||
{ "US/Pacific" , 0x03F618 },
|
||||
{ "US/Pacific-New" , 0x03FA1D },
|
||||
{ "US/Samoa" , 0x03FE22 },
|
||||
{ "UTC" , 0x03FE99 },
|
||||
{ "W-SU" , 0x040190 },
|
||||
{ "WET" , 0x03FEDD },
|
||||
{ "Zulu" , 0x0403D3 },
|
||||
{ "Asia/Hong_Kong" , 0x01B912 },
|
||||
{ "Asia/Hovd" , 0x01BAD4 },
|
||||
{ "Asia/Irkutsk" , 0x01BC4C },
|
||||
{ "Asia/Istanbul" , 0x01BE37 },
|
||||
{ "Asia/Jakarta" , 0x01C224 },
|
||||
{ "Asia/Jayapura" , 0x01C2CE },
|
||||
{ "Asia/Jerusalem" , 0x01C36B },
|
||||
{ "Asia/Kabul" , 0x01C69A },
|
||||
{ "Asia/Kamchatka" , 0x01C6EB },
|
||||
{ "Asia/Karachi" , 0x01C8E4 },
|
||||
{ "Asia/Kashgar" , 0x01C999 },
|
||||
{ "Asia/Kathmandu" , 0x01C9EE },
|
||||
{ "Asia/Katmandu" , 0x01CA54 },
|
||||
{ "Asia/Khandyga" , 0x01CABA },
|
||||
{ "Asia/Kolkata" , 0x01CCE4 },
|
||||
{ "Asia/Krasnoyarsk" , 0x01CD5D },
|
||||
{ "Asia/Kuala_Lumpur" , 0x01CF4A },
|
||||
{ "Asia/Kuching" , 0x01D007 },
|
||||
{ "Asia/Kuwait" , 0x01D0F5 },
|
||||
{ "Asia/Macao" , 0x01D14A },
|
||||
{ "Asia/Macau" , 0x01D285 },
|
||||
{ "Asia/Magadan" , 0x01D3C0 },
|
||||
{ "Asia/Makassar" , 0x01D5C4 },
|
||||
{ "Asia/Manila" , 0x01D689 },
|
||||
{ "Asia/Muscat" , 0x01D70E },
|
||||
{ "Asia/Nicosia" , 0x01D763 },
|
||||
{ "Asia/Novokuznetsk" , 0x01DA4B },
|
||||
{ "Asia/Novosibirsk" , 0x01DC6B },
|
||||
{ "Asia/Omsk" , 0x01DE5B },
|
||||
{ "Asia/Oral" , 0x01E047 },
|
||||
{ "Asia/Phnom_Penh" , 0x01E217 },
|
||||
{ "Asia/Pontianak" , 0x01E26C },
|
||||
{ "Asia/Pyongyang" , 0x01E32E },
|
||||
{ "Asia/Qatar" , 0x01E3BE },
|
||||
{ "Asia/Qyzylorda" , 0x01E424 },
|
||||
{ "Asia/Rangoon" , 0x01E5FA },
|
||||
{ "Asia/Riyadh" , 0x01E672 },
|
||||
{ "Asia/Saigon" , 0x01E6C7 },
|
||||
{ "Asia/Sakhalin" , 0x01E769 },
|
||||
{ "Asia/Samarkand" , 0x01E966 },
|
||||
{ "Asia/Seoul" , 0x01EA9C },
|
||||
{ "Asia/Shanghai" , 0x01EB63 },
|
||||
{ "Asia/Singapore" , 0x01EC0F },
|
||||
{ "Asia/Srednekolymsk" , 0x01ECC6 },
|
||||
{ "Asia/Taipei" , 0x01EEC6 },
|
||||
{ "Asia/Tashkent" , 0x01EFF7 },
|
||||
{ "Asia/Tbilisi" , 0x01F128 },
|
||||
{ "Asia/Tehran" , 0x01F2E2 },
|
||||
{ "Asia/Tel_Aviv" , 0x01F550 },
|
||||
{ "Asia/Thimbu" , 0x01F87F },
|
||||
{ "Asia/Thimphu" , 0x01F8E5 },
|
||||
{ "Asia/Tokyo" , 0x01F94B },
|
||||
{ "Asia/Ujung_Pandang" , 0x01F9D5 },
|
||||
{ "Asia/Ulaanbaatar" , 0x01FA52 },
|
||||
{ "Asia/Ulan_Bator" , 0x01FBAD },
|
||||
{ "Asia/Urumqi" , 0x01FCFA },
|
||||
{ "Asia/Ust-Nera" , 0x01FD5C },
|
||||
{ "Asia/Vientiane" , 0x01FF6E },
|
||||
{ "Asia/Vladivostok" , 0x01FFC3 },
|
||||
{ "Asia/Yakutsk" , 0x0201AD },
|
||||
{ "Asia/Yekaterinburg" , 0x020397 },
|
||||
{ "Asia/Yerevan" , 0x0205B8 },
|
||||
{ "Atlantic/Azores" , 0x0207B8 },
|
||||
{ "Atlantic/Bermuda" , 0x020CBB },
|
||||
{ "Atlantic/Canary" , 0x020F9C },
|
||||
{ "Atlantic/Cape_Verde" , 0x021272 },
|
||||
{ "Atlantic/Faeroe" , 0x0212EB },
|
||||
{ "Atlantic/Faroe" , 0x02158F },
|
||||
{ "Atlantic/Jan_Mayen" , 0x021833 },
|
||||
{ "Atlantic/Madeira" , 0x021B65 },
|
||||
{ "Atlantic/Reykjavik" , 0x02206E },
|
||||
{ "Atlantic/South_Georgia" , 0x022227 },
|
||||
{ "Atlantic/St_Helena" , 0x022439 },
|
||||
{ "Atlantic/Stanley" , 0x02226B },
|
||||
{ "Australia/ACT" , 0x02248E },
|
||||
{ "Australia/Adelaide" , 0x0227B1 },
|
||||
{ "Australia/Brisbane" , 0x022AE3 },
|
||||
{ "Australia/Broken_Hill" , 0x022BB0 },
|
||||
{ "Australia/Canberra" , 0x022EF4 },
|
||||
{ "Australia/Currie" , 0x023217 },
|
||||
{ "Australia/Darwin" , 0x023550 },
|
||||
{ "Australia/Eucla" , 0x0235DC },
|
||||
{ "Australia/Hobart" , 0x0236B8 },
|
||||
{ "Australia/LHI" , 0x023A1C },
|
||||
{ "Australia/Lindeman" , 0x023CBD },
|
||||
{ "Australia/Lord_Howe" , 0x023DA4 },
|
||||
{ "Australia/Melbourne" , 0x024055 },
|
||||
{ "Australia/North" , 0x024380 },
|
||||
{ "Australia/NSW" , 0x0243FA },
|
||||
{ "Australia/Perth" , 0x02471D },
|
||||
{ "Australia/Queensland" , 0x0247FB },
|
||||
{ "Australia/South" , 0x0248AD },
|
||||
{ "Australia/Sydney" , 0x024BD0 },
|
||||
{ "Australia/Tasmania" , 0x024F13 },
|
||||
{ "Australia/Victoria" , 0x02525E },
|
||||
{ "Australia/West" , 0x025581 },
|
||||
{ "Australia/Yancowinna" , 0x02563D },
|
||||
{ "Brazil/Acre" , 0x025965 },
|
||||
{ "Brazil/DeNoronha" , 0x025A69 },
|
||||
{ "Brazil/East" , 0x025B89 },
|
||||
{ "Brazil/West" , 0x025E66 },
|
||||
{ "Canada/Atlantic" , 0x025F5E },
|
||||
{ "Canada/Central" , 0x026446 },
|
||||
{ "Canada/East-Saskatchewan" , 0x026D50 },
|
||||
{ "Canada/Eastern" , 0x026860 },
|
||||
{ "Canada/Mountain" , 0x026ED9 },
|
||||
{ "Canada/Newfoundland" , 0x02724F },
|
||||
{ "Canada/Pacific" , 0x02777A },
|
||||
{ "Canada/Saskatchewan" , 0x027B93 },
|
||||
{ "Canada/Yukon" , 0x027D1C },
|
||||
{ "CET" , 0x02801F },
|
||||
{ "Chile/Continental" , 0x028328 },
|
||||
{ "Chile/EasterIsland" , 0x0286C3 },
|
||||
{ "CST6CDT" , 0x028A05 },
|
||||
{ "Cuba" , 0x028D56 },
|
||||
{ "EET" , 0x0290C9 },
|
||||
{ "Egypt" , 0x02937C },
|
||||
{ "Eire" , 0x029763 },
|
||||
{ "EST" , 0x029C74 },
|
||||
{ "EST5EDT" , 0x029CB8 },
|
||||
{ "Etc/GMT" , 0x02A009 },
|
||||
{ "Etc/GMT+0" , 0x02A0D5 },
|
||||
{ "Etc/GMT+1" , 0x02A15F },
|
||||
{ "Etc/GMT+10" , 0x02A1EC },
|
||||
{ "Etc/GMT+11" , 0x02A27A },
|
||||
{ "Etc/GMT+12" , 0x02A308 },
|
||||
{ "Etc/GMT+2" , 0x02A423 },
|
||||
{ "Etc/GMT+3" , 0x02A4AF },
|
||||
{ "Etc/GMT+4" , 0x02A53B },
|
||||
{ "Etc/GMT+5" , 0x02A5C7 },
|
||||
{ "Etc/GMT+6" , 0x02A653 },
|
||||
{ "Etc/GMT+7" , 0x02A6DF },
|
||||
{ "Etc/GMT+8" , 0x02A76B },
|
||||
{ "Etc/GMT+9" , 0x02A7F7 },
|
||||
{ "Etc/GMT-0" , 0x02A091 },
|
||||
{ "Etc/GMT-1" , 0x02A119 },
|
||||
{ "Etc/GMT-10" , 0x02A1A5 },
|
||||
{ "Etc/GMT-11" , 0x02A233 },
|
||||
{ "Etc/GMT-12" , 0x02A2C1 },
|
||||
{ "Etc/GMT-13" , 0x02A34F },
|
||||
{ "Etc/GMT-14" , 0x02A396 },
|
||||
{ "Etc/GMT-2" , 0x02A3DD },
|
||||
{ "Etc/GMT-3" , 0x02A469 },
|
||||
{ "Etc/GMT-4" , 0x02A4F5 },
|
||||
{ "Etc/GMT-5" , 0x02A581 },
|
||||
{ "Etc/GMT-6" , 0x02A60D },
|
||||
{ "Etc/GMT-7" , 0x02A699 },
|
||||
{ "Etc/GMT-8" , 0x02A725 },
|
||||
{ "Etc/GMT-9" , 0x02A7B1 },
|
||||
{ "Etc/GMT0" , 0x02A04D },
|
||||
{ "Etc/Greenwich" , 0x02A83D },
|
||||
{ "Etc/UCT" , 0x02A881 },
|
||||
{ "Etc/Universal" , 0x02A8C5 },
|
||||
{ "Etc/UTC" , 0x02A909 },
|
||||
{ "Etc/Zulu" , 0x02A94D },
|
||||
{ "Europe/Amsterdam" , 0x02A991 },
|
||||
{ "Europe/Andorra" , 0x02ADCF },
|
||||
{ "Europe/Athens" , 0x02B04B },
|
||||
{ "Europe/Belfast" , 0x02B38E },
|
||||
{ "Europe/Belgrade" , 0x02B8C5 },
|
||||
{ "Europe/Berlin" , 0x02BB8E },
|
||||
{ "Europe/Bratislava" , 0x02BEF2 },
|
||||
{ "Europe/Brussels" , 0x02C224 },
|
||||
{ "Europe/Bucharest" , 0x02C65B },
|
||||
{ "Europe/Budapest" , 0x02C985 },
|
||||
{ "Europe/Busingen" , 0x02CCEE },
|
||||
{ "Europe/Chisinau" , 0x02CFA5 },
|
||||
{ "Europe/Copenhagen" , 0x02D333 },
|
||||
{ "Europe/Dublin" , 0x02D63D },
|
||||
{ "Europe/Gibraltar" , 0x02DB4E },
|
||||
{ "Europe/Guernsey" , 0x02DFA5 },
|
||||
{ "Europe/Helsinki" , 0x02E4DC },
|
||||
{ "Europe/Isle_of_Man" , 0x02E792 },
|
||||
{ "Europe/Istanbul" , 0x02ECC9 },
|
||||
{ "Europe/Jersey" , 0x02F0B6 },
|
||||
{ "Europe/Kaliningrad" , 0x02F5ED },
|
||||
{ "Europe/Kiev" , 0x02F858 },
|
||||
{ "Europe/Lisbon" , 0x02FB74 },
|
||||
{ "Europe/Ljubljana" , 0x030078 },
|
||||
{ "Europe/London" , 0x030341 },
|
||||
{ "Europe/Luxembourg" , 0x030878 },
|
||||
{ "Europe/Madrid" , 0x030CCE },
|
||||
{ "Europe/Malta" , 0x031094 },
|
||||
{ "Europe/Mariehamn" , 0x03144D },
|
||||
{ "Europe/Minsk" , 0x031703 },
|
||||
{ "Europe/Monaco" , 0x031916 },
|
||||
{ "Europe/Moscow" , 0x031D51 },
|
||||
{ "Europe/Nicosia" , 0x031FAB },
|
||||
{ "Europe/Oslo" , 0x032293 },
|
||||
{ "Europe/Paris" , 0x0325C5 },
|
||||
{ "Europe/Podgorica" , 0x032A0B },
|
||||
{ "Europe/Prague" , 0x032CD4 },
|
||||
{ "Europe/Riga" , 0x033006 },
|
||||
{ "Europe/Rome" , 0x03334B },
|
||||
{ "Europe/Samara" , 0x03370E },
|
||||
{ "Europe/San_Marino" , 0x033977 },
|
||||
{ "Europe/Sarajevo" , 0x033D3A },
|
||||
{ "Europe/Simferopol" , 0x034003 },
|
||||
{ "Europe/Skopje" , 0x034254 },
|
||||
{ "Europe/Sofia" , 0x03451D },
|
||||
{ "Europe/Stockholm" , 0x034825 },
|
||||
{ "Europe/Tallinn" , 0x034AD4 },
|
||||
{ "Europe/Tirane" , 0x034E0E },
|
||||
{ "Europe/Tiraspol" , 0x035114 },
|
||||
{ "Europe/Uzhgorod" , 0x0354A2 },
|
||||
{ "Europe/Vaduz" , 0x0357B9 },
|
||||
{ "Europe/Vatican" , 0x035A68 },
|
||||
{ "Europe/Vienna" , 0x035E2B },
|
||||
{ "Europe/Vilnius" , 0x036158 },
|
||||
{ "Europe/Volgograd" , 0x036497 },
|
||||
{ "Europe/Warsaw" , 0x0366B8 },
|
||||
{ "Europe/Zagreb" , 0x036A99 },
|
||||
{ "Europe/Zaporozhye" , 0x036D62 },
|
||||
{ "Europe/Zurich" , 0x0370A3 },
|
||||
{ "Factory" , 0x037352 },
|
||||
{ "GB" , 0x0373C3 },
|
||||
{ "GB-Eire" , 0x0378FA },
|
||||
{ "GMT" , 0x037E31 },
|
||||
{ "GMT+0" , 0x037EFD },
|
||||
{ "GMT-0" , 0x037EB9 },
|
||||
{ "GMT0" , 0x037E75 },
|
||||
{ "Greenwich" , 0x037F41 },
|
||||
{ "Hongkong" , 0x037F85 },
|
||||
{ "HST" , 0x038147 },
|
||||
{ "Iceland" , 0x03818B },
|
||||
{ "Indian/Antananarivo" , 0x038344 },
|
||||
{ "Indian/Chagos" , 0x0383B8 },
|
||||
{ "Indian/Christmas" , 0x03841A },
|
||||
{ "Indian/Cocos" , 0x03845E },
|
||||
{ "Indian/Comoro" , 0x0384A2 },
|
||||
{ "Indian/Kerguelen" , 0x0384F7 },
|
||||
{ "Indian/Mahe" , 0x03854C },
|
||||
{ "Indian/Maldives" , 0x0385A1 },
|
||||
{ "Indian/Mauritius" , 0x0385F6 },
|
||||
{ "Indian/Mayotte" , 0x03866C },
|
||||
{ "Indian/Reunion" , 0x0386C1 },
|
||||
{ "Iran" , 0x038716 },
|
||||
{ "Israel" , 0x038984 },
|
||||
{ "Jamaica" , 0x038CB3 },
|
||||
{ "Japan" , 0x038D78 },
|
||||
{ "Kwajalein" , 0x038E02 },
|
||||
{ "Libya" , 0x038E65 },
|
||||
{ "MET" , 0x038F6E },
|
||||
{ "Mexico/BajaNorte" , 0x039277 },
|
||||
{ "Mexico/BajaSur" , 0x0395E0 },
|
||||
{ "Mexico/General" , 0x039825 },
|
||||
{ "MST" , 0x039A83 },
|
||||
{ "MST7MDT" , 0x039AC7 },
|
||||
{ "Navajo" , 0x039E18 },
|
||||
{ "NZ" , 0x03A191 },
|
||||
{ "NZ-CHAT" , 0x03A50F },
|
||||
{ "Pacific/Apia" , 0x03A7F3 },
|
||||
{ "Pacific/Auckland" , 0x03A98F },
|
||||
{ "Pacific/Bougainville" , 0x03AD1B },
|
||||
{ "Pacific/Chatham" , 0x03AD92 },
|
||||
{ "Pacific/Chuuk" , 0x03B085 },
|
||||
{ "Pacific/Easter" , 0x03B0DE },
|
||||
{ "Pacific/Efate" , 0x03B42D },
|
||||
{ "Pacific/Enderbury" , 0x03B4F3 },
|
||||
{ "Pacific/Fakaofo" , 0x03B561 },
|
||||
{ "Pacific/Fiji" , 0x03B5B2 },
|
||||
{ "Pacific/Funafuti" , 0x03B745 },
|
||||
{ "Pacific/Galapagos" , 0x03B789 },
|
||||
{ "Pacific/Gambier" , 0x03B801 },
|
||||
{ "Pacific/Guadalcanal" , 0x03B866 },
|
||||
{ "Pacific/Guam" , 0x03B8BB },
|
||||
{ "Pacific/Honolulu" , 0x03B911 },
|
||||
{ "Pacific/Johnston" , 0x03B988 },
|
||||
{ "Pacific/Kiritimati" , 0x03BA07 },
|
||||
{ "Pacific/Kosrae" , 0x03BA72 },
|
||||
{ "Pacific/Kwajalein" , 0x03BACF },
|
||||
{ "Pacific/Majuro" , 0x03BB3B },
|
||||
{ "Pacific/Marquesas" , 0x03BB9A },
|
||||
{ "Pacific/Midway" , 0x03BC01 },
|
||||
{ "Pacific/Nauru" , 0x03BC8B },
|
||||
{ "Pacific/Niue" , 0x03BD03 },
|
||||
{ "Pacific/Norfolk" , 0x03BD61 },
|
||||
{ "Pacific/Noumea" , 0x03BDB6 },
|
||||
{ "Pacific/Pago_Pago" , 0x03BE46 },
|
||||
{ "Pacific/Palau" , 0x03BEBD },
|
||||
{ "Pacific/Pitcairn" , 0x03BF01 },
|
||||
{ "Pacific/Pohnpei" , 0x03BF56 },
|
||||
{ "Pacific/Ponape" , 0x03BFAB },
|
||||
{ "Pacific/Port_Moresby" , 0x03BFF0 },
|
||||
{ "Pacific/Rarotonga" , 0x03C042 },
|
||||
{ "Pacific/Saipan" , 0x03C11E },
|
||||
{ "Pacific/Samoa" , 0x03C181 },
|
||||
{ "Pacific/Tahiti" , 0x03C1F8 },
|
||||
{ "Pacific/Tarawa" , 0x03C25D },
|
||||
{ "Pacific/Tongatapu" , 0x03C2B1 },
|
||||
{ "Pacific/Truk" , 0x03C33D },
|
||||
{ "Pacific/Wake" , 0x03C382 },
|
||||
{ "Pacific/Wallis" , 0x03C3D2 },
|
||||
{ "Pacific/Yap" , 0x03C416 },
|
||||
{ "Poland" , 0x03C45B },
|
||||
{ "Portugal" , 0x03C83C },
|
||||
{ "PRC" , 0x03CD38 },
|
||||
{ "PST8PDT" , 0x03CDD8 },
|
||||
{ "ROC" , 0x03D129 },
|
||||
{ "ROK" , 0x03D25A },
|
||||
{ "Singapore" , 0x03D321 },
|
||||
{ "Turkey" , 0x03D3D8 },
|
||||
{ "UCT" , 0x03D7C5 },
|
||||
{ "Universal" , 0x03D809 },
|
||||
{ "US/Alaska" , 0x03D84D },
|
||||
{ "US/Aleutian" , 0x03DBB6 },
|
||||
{ "US/Arizona" , 0x03DF1C },
|
||||
{ "US/Central" , 0x03DFAA },
|
||||
{ "US/East-Indiana" , 0x03E9B4 },
|
||||
{ "US/Eastern" , 0x03E4B5 },
|
||||
{ "US/Hawaii" , 0x03EC1E },
|
||||
{ "US/Indiana-Starke" , 0x03EC8F },
|
||||
{ "US/Michigan" , 0x03F000 },
|
||||
{ "US/Mountain" , 0x03F337 },
|
||||
{ "US/Pacific" , 0x03F6B0 },
|
||||
{ "US/Pacific-New" , 0x03FAB5 },
|
||||
{ "US/Samoa" , 0x03FEBA },
|
||||
{ "UTC" , 0x03FF31 },
|
||||
{ "W-SU" , 0x040228 },
|
||||
{ "WET" , 0x03FF75 },
|
||||
{ "Zulu" , 0x04046B },
|
||||
};
|
||||
/* This is a generated file, do not modify */
|
||||
const unsigned char timelib_timezone_db_data_builtin[263191] = {
|
||||
const unsigned char timelib_timezone_db_data_builtin[263343] = {
|
||||
|
||||
|
||||
/* Africa/Abidjan */
|
||||
@@ -8304,13 +8305,16 @@ const unsigned char timelib_timezone_db_data_builtin[263191] = {
|
||||
|
||||
/* Asia/Ho_Chi_Minh */
|
||||
0x50, 0x48, 0x50, 0x31, 0x01, 0x56, 0x4E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0C, 0x88, 0x6F, 0x42, 0x80,
|
||||
0x91, 0x5F, 0xEE, 0xD0, 0x93, 0x85, 0xB1, 0x90, 0xB7, 0x41, 0xBC, 0x00, 0x01, 0x02, 0x03, 0x02,
|
||||
0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0xEC, 0x00, 0x04, 0x00, 0x00, 0x62, 0x70,
|
||||
0x00, 0x08, 0x00, 0x00, 0x70, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x53, 0x4D, 0x54, 0x00,
|
||||
0x49, 0x43, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x99, 0xBB, 0x78,
|
||||
0x01, 0xB5, 0x6B, 0x2A, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x15, 0x88, 0x8C, 0x43, 0x80,
|
||||
0x91, 0xA3, 0x2B, 0x0A, 0xCD, 0x35, 0xE6, 0x80, 0xD1, 0x59, 0xCE, 0x70, 0xD2, 0x3B, 0x3E, 0xF0,
|
||||
0xD5, 0x32, 0xBB, 0x10, 0xE4, 0xB6, 0xE4, 0x80, 0xED, 0x2F, 0x98, 0x00, 0x0A, 0x3D, 0xC7, 0x00,
|
||||
0x01, 0x02, 0x03, 0x04, 0x02, 0x03, 0x02, 0x03, 0x02, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x63, 0xF6, 0x00, 0x04, 0x00, 0x00, 0x62, 0x70, 0x00, 0x09, 0x00, 0x00, 0x70, 0x80, 0x00,
|
||||
0x0D, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x11, 0x4C, 0x4D, 0x54, 0x00, 0x50, 0x4C, 0x4D, 0x54, 0x00,
|
||||
0x49, 0x43, 0x54, 0x00, 0x49, 0x44, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x99, 0xBB, 0x78, 0x01, 0xB5, 0x6B, 0x2A, 0x00, 0x00,
|
||||
0x00, 0x00,
|
||||
|
||||
/* Asia/Hong_Kong */
|
||||
0x50, 0x48, 0x50, 0x31, 0x01, 0x48, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
@@ -9046,13 +9050,11 @@ const unsigned char timelib_timezone_db_data_builtin[263191] = {
|
||||
|
||||
/* Asia/Phnom_Penh */
|
||||
0x50, 0x48, 0x50, 0x31, 0x01, 0x4B, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0C, 0x88, 0x6F, 0x44, 0x24,
|
||||
0x91, 0x5F, 0xEE, 0xD0, 0x93, 0x85, 0xB1, 0x90, 0xB7, 0x41, 0xBC, 0x00, 0x01, 0x02, 0x03, 0x02,
|
||||
0x00, 0x00, 0x62, 0x5C, 0x00, 0x00, 0x00, 0x00, 0x63, 0xEC, 0x00, 0x04, 0x00, 0x00, 0x62, 0x70,
|
||||
0x00, 0x08, 0x00, 0x00, 0x70, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x53, 0x4D, 0x54, 0x00,
|
||||
0x49, 0x43, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9A, 0xF3, 0xF8,
|
||||
0x01, 0xB2, 0xBF, 0x92, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0xA2, 0x6A, 0x67, 0xC4,
|
||||
0x01, 0x00, 0x00, 0x5E, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x62, 0x70, 0x00, 0x04, 0x42, 0x4D, 0x54,
|
||||
0x00, 0x49, 0x43, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9A, 0xF3, 0xF8, 0x01, 0xB2, 0xBF,
|
||||
0x92, 0x00, 0x00, 0x00, 0x00,
|
||||
|
||||
/* Asia/Pontianak */
|
||||
0x50, 0x48, 0x50, 0x31, 0x01, 0x49, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
@@ -9142,13 +9144,16 @@ const unsigned char timelib_timezone_db_data_builtin[263191] = {
|
||||
|
||||
/* Asia/Saigon */
|
||||
0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0C, 0x88, 0x6F, 0x42, 0x80,
|
||||
0x91, 0x5F, 0xEE, 0xD0, 0x93, 0x85, 0xB1, 0x90, 0xB7, 0x41, 0xBC, 0x00, 0x01, 0x02, 0x03, 0x02,
|
||||
0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0xEC, 0x00, 0x04, 0x00, 0x00, 0x62, 0x70,
|
||||
0x00, 0x08, 0x00, 0x00, 0x70, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x53, 0x4D, 0x54, 0x00,
|
||||
0x49, 0x43, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40,
|
||||
0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x15, 0x88, 0x8C, 0x43, 0x80,
|
||||
0x91, 0xA3, 0x2B, 0x0A, 0xCD, 0x35, 0xE6, 0x80, 0xD1, 0x59, 0xCE, 0x70, 0xD2, 0x3B, 0x3E, 0xF0,
|
||||
0xD5, 0x32, 0xBB, 0x10, 0xE4, 0xB6, 0xE4, 0x80, 0xED, 0x2F, 0x98, 0x00, 0x0A, 0x3D, 0xC7, 0x00,
|
||||
0x01, 0x02, 0x03, 0x04, 0x02, 0x03, 0x02, 0x03, 0x02, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x63, 0xF6, 0x00, 0x04, 0x00, 0x00, 0x62, 0x70, 0x00, 0x09, 0x00, 0x00, 0x70, 0x80, 0x00,
|
||||
0x0D, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x11, 0x4C, 0x4D, 0x54, 0x00, 0x50, 0x4C, 0x4D, 0x54, 0x00,
|
||||
0x49, 0x43, 0x54, 0x00, 0x49, 0x44, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00,
|
||||
0x00, 0x00,
|
||||
|
||||
/* Asia/Sakhalin */
|
||||
0x50, 0x48, 0x50, 0x31, 0x01, 0x52, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
@@ -9584,13 +9589,11 @@ const unsigned char timelib_timezone_db_data_builtin[263191] = {
|
||||
|
||||
/* Asia/Vientiane */
|
||||
0x50, 0x48, 0x50, 0x31, 0x01, 0x4C, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0C, 0x88, 0x6F, 0x46, 0x50,
|
||||
0x91, 0x5F, 0xEE, 0xD0, 0x93, 0x85, 0xB1, 0x90, 0xB7, 0x41, 0xBC, 0x00, 0x01, 0x02, 0x03, 0x02,
|
||||
0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 0x00, 0x00, 0x63, 0xEC, 0x00, 0x04, 0x00, 0x00, 0x62, 0x70,
|
||||
0x00, 0x08, 0x00, 0x00, 0x70, 0x80, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x53, 0x4D, 0x54, 0x00,
|
||||
0x49, 0x43, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0xBE, 0x7A,
|
||||
0x01, 0xAF, 0x36, 0xA0, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0xA2, 0x6A, 0x67, 0xC4,
|
||||
0x01, 0x00, 0x00, 0x5E, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x62, 0x70, 0x00, 0x04, 0x42, 0x4D, 0x54,
|
||||
0x00, 0x49, 0x43, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0xBE, 0x7A, 0x01, 0xAF, 0x36,
|
||||
0xA0, 0x00, 0x00, 0x00, 0x00,
|
||||
|
||||
/* Asia/Vladivostok */
|
||||
0x50, 0x48, 0x50, 0x31, 0x01, 0x52, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
@@ -14391,7 +14394,7 @@ const unsigned char timelib_timezone_db_data_builtin[263191] = {
|
||||
/* Europe/Minsk */
|
||||
0x50, 0x48, 0x50, 0x31, 0x01, 0x42, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x22, 0xAA, 0x19, 0xAA, 0x38,
|
||||
0x00, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x22, 0xAA, 0x19, 0xAA, 0x38,
|
||||
0xB5, 0xA4, 0x19, 0x60, 0xCA, 0x5E, 0x70, 0xD0, 0xCC, 0xE7, 0x4B, 0x10, 0xCD, 0xA9, 0x17, 0x90,
|
||||
0xCE, 0xA2, 0x43, 0x10, 0xCF, 0x92, 0x34, 0x10, 0xD0, 0x0A, 0x02, 0x60, 0x15, 0x27, 0xA7, 0xD0,
|
||||
0x16, 0x18, 0xDC, 0x40, 0x17, 0x08, 0xDB, 0x50, 0x17, 0xFA, 0x0F, 0xC0, 0x18, 0xEA, 0x0E, 0xD0,
|
||||
@@ -14408,20 +14411,21 @@ const unsigned char timelib_timezone_db_data_builtin[263191] = {
|
||||
0x40, 0x66, 0x15, 0x80, 0x41, 0x84, 0x2B, 0x00, 0x42, 0x45, 0xF7, 0x80, 0x43, 0x64, 0x0D, 0x00,
|
||||
0x44, 0x25, 0xD9, 0x80, 0x45, 0x43, 0xEF, 0x00, 0x46, 0x05, 0xBB, 0x80, 0x47, 0x23, 0xD1, 0x00,
|
||||
0x47, 0xEE, 0xD8, 0x00, 0x49, 0x03, 0xB3, 0x00, 0x49, 0xCE, 0xBA, 0x00, 0x4A, 0xE3, 0x95, 0x00,
|
||||
0x4B, 0xAE, 0x9C, 0x00, 0x4C, 0xCC, 0xB1, 0x80, 0x4D, 0x8E, 0x7E, 0x00, 0x01, 0x02, 0x05, 0x03,
|
||||
0x04, 0x03, 0x04, 0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x07, 0x08, 0x07, 0x08, 0x07,
|
||||
0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x02, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09,
|
||||
0x4B, 0xAE, 0x9C, 0x00, 0x4C, 0xCC, 0xB1, 0x80, 0x4D, 0x8E, 0x7E, 0x00, 0x54, 0x4C, 0x1D, 0x60,
|
||||
0x01, 0x02, 0x05, 0x03, 0x04, 0x03, 0x04, 0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x02, 0x06, 0x07,
|
||||
0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x08, 0x07, 0x02, 0x09, 0x0A, 0x09, 0x0A, 0x09,
|
||||
0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09,
|
||||
0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x0B,
|
||||
0x00, 0x00, 0x19, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x04, 0x00, 0x00, 0x2A, 0x30,
|
||||
0x00, 0x08, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x0C, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x10, 0x00, 0x00,
|
||||
0x1C, 0x20, 0x01, 0x10, 0x00, 0x00, 0x38, 0x40, 0x01, 0x15, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x08,
|
||||
0x00, 0x00, 0x38, 0x40, 0x01, 0x15, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x19, 0x00, 0x00, 0x1C, 0x20,
|
||||
0x00, 0x04, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x1E, 0x4D, 0x4D, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00,
|
||||
0x4D, 0x53, 0x4B, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x4D, 0x53, 0x44,
|
||||
0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x46, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00,
|
||||
0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0xDB, 0x92, 0xF0, 0x01, 0x3C, 0xB8, 0xBA, 0x00, 0x00, 0x00, 0x00,
|
||||
0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09, 0x0A, 0x09,
|
||||
0x0A, 0x09, 0x0A, 0x0B, 0x07, 0x00, 0x00, 0x19, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x20, 0x00,
|
||||
0x04, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x08, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x0C, 0x00, 0x00, 0x1C,
|
||||
0x20, 0x01, 0x10, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x10, 0x00, 0x00, 0x38, 0x40, 0x01, 0x15, 0x00,
|
||||
0x00, 0x2A, 0x30, 0x00, 0x08, 0x00, 0x00, 0x38, 0x40, 0x01, 0x15, 0x00, 0x00, 0x2A, 0x30, 0x01,
|
||||
0x19, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x04, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x1E, 0x4D, 0x4D, 0x54,
|
||||
0x00, 0x45, 0x45, 0x54, 0x00, 0x4D, 0x53, 0x4B, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53,
|
||||
0x54, 0x00, 0x4D, 0x53, 0x44, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x46, 0x45, 0x54, 0x00, 0x00,
|
||||
0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDB, 0x92, 0xF0, 0x01, 0x3C, 0xB8, 0xBA, 0x00,
|
||||
0x00, 0x00, 0x00,
|
||||
|
||||
/* Europe/Monaco */
|
||||
0x50, 0x48, 0x50, 0x31, 0x01, 0x4D, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
@@ -16966,6 +16970,16 @@ const unsigned char timelib_timezone_db_data_builtin[263191] = {
|
||||
0x00, 0x00, 0x00, 0x51, 0x13, 0x35, 0x02, 0x1D, 0x54, 0xBA, 0x00, 0x00, 0x00, 0x0E, 0x6D, 0x6F,
|
||||
0x73, 0x74, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x73,
|
||||
|
||||
/* Pacific/Bougainville */
|
||||
0x50, 0x48, 0x50, 0x31, 0x01, 0x50, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0xCC, 0x43, 0x36, 0x60,
|
||||
0xD2, 0x2B, 0x6C, 0xF0, 0x54, 0x9E, 0xD7, 0x80, 0x01, 0x00, 0x02, 0x00, 0x00, 0x8C, 0xA0, 0x00,
|
||||
0x00, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x04, 0x00, 0x00, 0x9A, 0xB0, 0x00, 0x08, 0x50, 0x47, 0x54,
|
||||
0x00, 0x4A, 0x53, 0x54, 0x00, 0x42, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x7F, 0xD7, 0xDD, 0x02, 0x00, 0x08, 0xBA, 0x00, 0x00, 0x00, 0x0C, 0x42, 0x6F, 0x75, 0x67, 0x61,
|
||||
0x69, 0x6E, 0x76, 0x69, 0x6C, 0x6C, 0x65,
|
||||
|
||||
/* Pacific/Chatham */
|
||||
0x50, 0x48, 0x50, 0x31, 0x01, 0x4E, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
|
||||
@@ -17118,19 +17132,19 @@ const unsigned char timelib_timezone_db_data_builtin[263191] = {
|
||||
0x36, 0x3B, 0x17, 0xE0, 0x36, 0xD7, 0xFA, 0x60, 0x38, 0x24, 0x34, 0x60, 0x38, 0xB7, 0xDC, 0x60,
|
||||
0x4B, 0x11, 0x2C, 0xE0, 0x4B, 0xAE, 0x0F, 0x60, 0x4C, 0xC2, 0xEA, 0x60, 0x4D, 0x72, 0x41, 0xE0,
|
||||
0x4E, 0xA2, 0xCC, 0x60, 0x4F, 0x1A, 0xC4, 0xE0, 0x50, 0x82, 0xAE, 0x60, 0x50, 0xFA, 0xA6, 0xE0,
|
||||
0x52, 0x6B, 0xCA, 0xE0, 0x52, 0xDA, 0x7A, 0xD0, 0x54, 0x4B, 0xAC, 0xE0, 0x54, 0xBA, 0x5C, 0xD0,
|
||||
0x56, 0x2B, 0x8E, 0xE0, 0x56, 0xA3, 0x79, 0x50, 0x58, 0x0B, 0x70, 0xE0, 0x58, 0x83, 0x5B, 0x50,
|
||||
0x59, 0xEB, 0x52, 0xE0, 0x5A, 0x63, 0x3D, 0x50, 0x5B, 0xCB, 0x34, 0xE0, 0x5C, 0x43, 0x1F, 0x50,
|
||||
0x5D, 0xB4, 0x51, 0x60, 0x5E, 0x23, 0x01, 0x50, 0x5F, 0x94, 0x33, 0x60, 0x60, 0x0C, 0x1D, 0xD0,
|
||||
0x61, 0x74, 0x15, 0x60, 0x61, 0xEB, 0xFF, 0xD0, 0x63, 0x53, 0xF7, 0x60, 0x63, 0xCB, 0xE1, 0xD0,
|
||||
0x65, 0x33, 0xD9, 0x60, 0x65, 0xAB, 0xC3, 0xD0, 0x67, 0x1C, 0xF5, 0xE0, 0x67, 0x8B, 0xA5, 0xD0,
|
||||
0x68, 0xFC, 0xD7, 0xE0, 0x69, 0x6B, 0x87, 0xD0, 0x6A, 0xDC, 0xB9, 0xE0, 0x6B, 0x54, 0xA4, 0x50,
|
||||
0x6C, 0xBC, 0x9B, 0xE0, 0x6D, 0x34, 0x86, 0x50, 0x6E, 0x9C, 0x7D, 0xE0, 0x6F, 0x14, 0x68, 0x50,
|
||||
0x70, 0x7C, 0x5F, 0xE0, 0x70, 0xF4, 0x4A, 0x50, 0x72, 0x65, 0x7C, 0x60, 0x72, 0xD4, 0x2C, 0x50,
|
||||
0x74, 0x45, 0x5E, 0x60, 0x74, 0xB4, 0x0E, 0x50, 0x76, 0x25, 0x40, 0x60, 0x76, 0x9D, 0x2A, 0xD0,
|
||||
0x78, 0x05, 0x22, 0x60, 0x78, 0x7D, 0x0C, 0xD0, 0x79, 0xE5, 0x04, 0x60, 0x7A, 0x5C, 0xEE, 0xD0,
|
||||
0x7B, 0xC4, 0xE6, 0x60, 0x7C, 0x3C, 0xD0, 0xD0, 0x7D, 0xAE, 0x02, 0xE0, 0x7E, 0x1C, 0xB2, 0xD0,
|
||||
0x7F, 0x8D, 0xE4, 0xE0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
|
||||
0x52, 0x6B, 0xCA, 0xE0, 0x52, 0xDA, 0x7A, 0xD0, 0x54, 0x54, 0xE7, 0x60, 0x54, 0xBA, 0x6A, 0xE0,
|
||||
0x56, 0x34, 0xC9, 0x60, 0x56, 0xA3, 0x87, 0x60, 0x58, 0x1D, 0xE5, 0xE0, 0x58, 0x83, 0x69, 0x60,
|
||||
0x59, 0xFD, 0xC7, 0xE0, 0x5A, 0x63, 0x4B, 0x60, 0x5B, 0xDD, 0xA9, 0xE0, 0x5C, 0x43, 0x2D, 0x60,
|
||||
0x5D, 0xBD, 0x8B, 0xE0, 0x5E, 0x23, 0x0F, 0x60, 0x5F, 0x9D, 0x6D, 0xE0, 0x60, 0x0C, 0x2B, 0xE0,
|
||||
0x61, 0x86, 0x8A, 0x60, 0x61, 0xEC, 0x0D, 0xE0, 0x63, 0x66, 0x6C, 0x60, 0x63, 0xCB, 0xEF, 0xE0,
|
||||
0x65, 0x46, 0x4E, 0x60, 0x65, 0xAB, 0xD1, 0xE0, 0x67, 0x26, 0x30, 0x60, 0x67, 0x8B, 0xB3, 0xE0,
|
||||
0x69, 0x06, 0x12, 0x60, 0x69, 0x6B, 0x95, 0xE0, 0x6A, 0xE5, 0xF4, 0x60, 0x6B, 0x54, 0xB2, 0x60,
|
||||
0x6C, 0xCF, 0x10, 0xE0, 0x6D, 0x34, 0x94, 0x60, 0x6E, 0xAE, 0xF2, 0xE0, 0x6F, 0x14, 0x76, 0x60,
|
||||
0x70, 0x8E, 0xD4, 0xE0, 0x70, 0xF4, 0x58, 0x60, 0x72, 0x6E, 0xB6, 0xE0, 0x72, 0xD4, 0x3A, 0x60,
|
||||
0x74, 0x4E, 0x98, 0xE0, 0x74, 0xB4, 0x1C, 0x60, 0x76, 0x37, 0xB5, 0x60, 0x76, 0x9D, 0x38, 0xE0,
|
||||
0x78, 0x17, 0x97, 0x60, 0x78, 0x7D, 0x1A, 0xE0, 0x79, 0xF7, 0x79, 0x60, 0x7A, 0x5C, 0xFC, 0xE0,
|
||||
0x7B, 0xD7, 0x5B, 0x60, 0x7C, 0x3C, 0xDE, 0xE0, 0x7D, 0xB7, 0x3D, 0x60, 0x7E, 0x1C, 0xC0, 0xE0,
|
||||
0x7F, 0x97, 0x1F, 0x60, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
|
||||
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
|
||||
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
|
||||
0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
|
||||
@@ -17338,7 +17352,8 @@ const unsigned char timelib_timezone_db_data_builtin[263191] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x8C, 0xA0,
|
||||
0x00, 0x00, 0x50, 0x47, 0x54, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xD5, 0x50, 0x01, 0xF3, 0x37, 0x7A,
|
||||
0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x0E, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F,
|
||||
0x6E, 0x73,
|
||||
|
||||
/* Pacific/Rarotonga */
|
||||
0x50, 0x48, 0x50, 0x31, 0x01, 0x43, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
@@ -18532,4 +18547,4 @@ const unsigned char timelib_timezone_db_data_builtin[263191] = {
|
||||
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 = { "2014.8", 582, timezonedb_idx_builtin, timelib_timezone_db_data_builtin };
|
||||
const timelib_tzdb timezonedb_builtin = { "2014.9", 583, timezonedb_idx_builtin, timelib_timezone_db_data_builtin };
|
||||
+4
-4
@@ -326,7 +326,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_timezone_offset_get, 0, 0, 2)
|
||||
ZEND_END_ARG_INFO()
|
||||
|
||||
ZEND_BEGIN_ARG_INFO_EX(arginfo_timezone_method_offset_get, 0, 0, 1)
|
||||
ZEND_ARG_INFO(0, datetime)
|
||||
ZEND_ARG_INFO(0, object)
|
||||
ZEND_END_ARG_INFO()
|
||||
|
||||
ZEND_BEGIN_ARG_INFO_EX(arginfo_timezone_transitions_get, 0, 0, 1)
|
||||
@@ -3823,7 +3823,7 @@ PHP_FUNCTION(timezone_name_from_abbr)
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
/* {{{ proto long timezone_offset_get(DateTimeZone object, DateTime object)
|
||||
/* {{{ proto long timezone_offset_get(DateTimeZone object, DateTimeInterface object)
|
||||
Returns the timezone offset.
|
||||
*/
|
||||
PHP_FUNCTION(timezone_offset_get)
|
||||
@@ -3833,13 +3833,13 @@ PHP_FUNCTION(timezone_offset_get)
|
||||
php_date_obj *dateobj;
|
||||
timelib_time_offset *offset;
|
||||
|
||||
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO", &object, date_ce_timezone, &dateobject, date_ce_date) == FAILURE) {
|
||||
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OO", &object, date_ce_timezone, &dateobject, date_ce_interface) == FAILURE) {
|
||||
RETURN_FALSE;
|
||||
}
|
||||
tzobj = (php_timezone_obj *) zend_object_store_get_object(object TSRMLS_CC);
|
||||
DATE_CHECK_INITIALIZED(tzobj->initialized, DateTimeZone);
|
||||
dateobj = (php_date_obj *) zend_object_store_get_object(dateobject TSRMLS_CC);
|
||||
DATE_CHECK_INITIALIZED(dateobj->time, DateTime);
|
||||
DATE_CHECK_INITIALIZED(dateobj->time, DateTimeInterface);
|
||||
|
||||
switch (tzobj->type) {
|
||||
case TIMELIB_ZONETYPE_ID:
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
--TEST--
|
||||
DateTimeZone::getOffset() accepts a DateTimeInterface object
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
$tz = new DateTimeZone('Europe/London');
|
||||
$dt = new DateTimeImmutable('2014-09-20', $tz);
|
||||
|
||||
echo $tz->getOffset($dt);
|
||||
echo $tz->getOffset(1);
|
||||
--EXPECTF--
|
||||
3600
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, integer given in %s
|
||||
@@ -112,141 +112,141 @@ fclose( $file_handle );
|
||||
|
||||
-- int 0 --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, integer given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- int 1 --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, integer given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- int 12345 --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, integer given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- int -12345 --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, integer given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, integer given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- float 10.5 --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, double given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, double given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- float -10.5 --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, double given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, double given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- float .5 --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, double given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, double given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- empty array --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, array given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, array given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- int indexed array --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, array given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, array given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- associative array --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, array given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, array given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- nested arrays --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, array given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, array given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- uppercase NULL --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, null given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, null given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- lowercase null --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, null given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, null given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- lowercase true --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, boolean given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, boolean given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- lowercase false --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, boolean given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, boolean given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- uppercase TRUE --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, boolean given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, boolean given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- uppercase FALSE --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, boolean given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, boolean given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- empty string DQ --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, string given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, string given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- empty string SQ --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, string given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, string given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- string DQ --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, string given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, string given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- string SQ --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, string given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, string given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- mixed case string --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, string given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, string given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- heredoc --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, string given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, string given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- instance of classWithToString --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, object given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, object given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- instance of classWithoutToString --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, object given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, object given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- undefined var --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, null given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, null given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- unset var --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, null given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, null given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- resource --
|
||||
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTime, resource given in %s on line %d
|
||||
Warning: DateTimeZone::getOffset() expects parameter 1 to be DateTimeInterface, resource given in %s on line %d
|
||||
bool(false)
|
||||
===DONE===
|
||||
@@ -73,12 +73,12 @@ bool(false)
|
||||
|
||||
-- Testing timezone_offset_get() function with an invalid values for $datetime argument --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, object given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, object given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, integer given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, integer given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, null given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, null given in %s on line %d
|
||||
bool(false)
|
||||
===DONE===
|
||||
@@ -112,141 +112,141 @@ fclose( $file_handle );
|
||||
|
||||
-- int 0 --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, integer given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, integer given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- int 1 --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, integer given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, integer given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- int 12345 --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, integer given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, integer given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- int -12345 --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, integer given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, integer given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- float 10.5 --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, double given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, double given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- float -10.5 --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, double given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, double given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- float .5 --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, double given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, double given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- empty array --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, array given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, array given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- int indexed array --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, array given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, array given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- associative array --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, array given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, array given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- nested arrays --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, array given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, array given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- uppercase NULL --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, null given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, null given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- lowercase null --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, null given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, null given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- lowercase true --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, boolean given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, boolean given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- lowercase false --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, boolean given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, boolean given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- uppercase TRUE --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, boolean given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, boolean given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- uppercase FALSE --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, boolean given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, boolean given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- empty string DQ --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, string given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, string given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- empty string SQ --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, string given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, string given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- string DQ --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, string given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, string given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- string SQ --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, string given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, string given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- mixed case string --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, string given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, string given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- heredoc --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, string given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, string given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- instance of classWithToString --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, object given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, object given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- instance of classWithoutToString --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, object given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, object given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- undefined var --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, null given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, null given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- unset var --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, null given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, null given in %s on line %d
|
||||
bool(false)
|
||||
|
||||
-- resource --
|
||||
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTime, resource given in %s on line %d
|
||||
Warning: timezone_offset_get() expects parameter 2 to be DateTimeInterface, resource given in %s on line %d
|
||||
bool(false)
|
||||
===DONE===
|
||||
+156
-48
@@ -1,6 +1,6 @@
|
||||
diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
|
||||
--- libmagic.orig/apprentice.c Thu Mar 21 18:45:14 2013
|
||||
+++ libmagic/apprentice.c Mon Apr 14 23:42:51 2014
|
||||
+++ libmagic/apprentice.c Mon Sep 29 10:53:07 2014
|
||||
@@ -29,6 +29,8 @@
|
||||
* apprentice - make one pass through /etc/magic, learning its secrets.
|
||||
*/
|
||||
@@ -479,6 +479,15 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
|
||||
return NULL;
|
||||
}
|
||||
return map;
|
||||
@@ -1233,7 +1269,7 @@
|
||||
* the sign extension must have happened.
|
||||
*/
|
||||
case FILE_BYTE:
|
||||
- v = (char) v;
|
||||
+ v = (signed char) v;
|
||||
break;
|
||||
case FILE_SHORT:
|
||||
case FILE_BESHORT:
|
||||
@@ -1500,7 +1536,7 @@
|
||||
if (me->cont_count == me->max_count) {
|
||||
struct magic *nm;
|
||||
@@ -833,7 +842,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
|
||||
}
|
||||
diff -u libmagic.orig/ascmagic.c libmagic/ascmagic.c
|
||||
--- libmagic.orig/ascmagic.c Wed Oct 31 18:03:01 2012
|
||||
+++ libmagic/ascmagic.c Mon Apr 14 23:42:51 2014
|
||||
+++ libmagic/ascmagic.c Mon Mar 10 16:40:55 2014
|
||||
@@ -139,7 +139,7 @@
|
||||
/* malloc size is a conservative overestimate; could be
|
||||
improved, or at least realloced after conversion. */
|
||||
@@ -872,7 +881,7 @@ diff -u libmagic.orig/ascmagic.c libmagic/ascmagic.c
|
||||
}
|
||||
diff -u libmagic.orig/cdf.c libmagic/cdf.c
|
||||
--- libmagic.orig/cdf.c Thu Mar 21 18:45:14 2013
|
||||
+++ libmagic/cdf.c Tue Jul 1 09:00:09 2014
|
||||
+++ libmagic/cdf.c Wed Aug 20 21:20:34 2014
|
||||
@@ -43,7 +43,17 @@
|
||||
#include <err.h>
|
||||
#endif
|
||||
@@ -955,7 +964,7 @@ diff -u libmagic.orig/cdf.c libmagic/cdf.c
|
||||
errno = EFTYPE;
|
||||
return (size_t)-1;
|
||||
}
|
||||
@@ -796,7 +812,11 @@
|
||||
@@ -796,11 +812,15 @@
|
||||
if (cdf_check_stream_offset(sst, h, e, 0, __LINE__) == -1)
|
||||
goto out;
|
||||
for (i = 0; i < sh.sh_properties; i++) {
|
||||
@@ -968,6 +977,11 @@ diff -u libmagic.orig/cdf.c libmagic/cdf.c
|
||||
q = (const uint8_t *)(const void *)
|
||||
((const char *)(const void *)p + ofs
|
||||
- 2 * sizeof(uint32_t));
|
||||
- if (q > e) {
|
||||
+ if (q < p || q > e) {
|
||||
DPRINTF(("Ran of the end %p > %p\n", q, e));
|
||||
goto out;
|
||||
}
|
||||
@@ -810,6 +830,10 @@
|
||||
i, inp[i].pi_id, inp[i].pi_type, q - p, offs));
|
||||
if (inp[i].pi_type & CDF_VECTOR) {
|
||||
@@ -1056,7 +1070,7 @@ diff -u libmagic.orig/cdf.c libmagic/cdf.c
|
||||
} else {
|
||||
diff -u libmagic.orig/cdf.h libmagic/cdf.h
|
||||
--- libmagic.orig/cdf.h Wed Oct 31 18:03:01 2012
|
||||
+++ libmagic/cdf.h Mon Apr 14 23:32:55 2014
|
||||
+++ libmagic/cdf.h Mon Dec 2 15:25:29 2013
|
||||
@@ -35,10 +35,12 @@
|
||||
#ifndef _H_CDF_
|
||||
#define _H_CDF_
|
||||
@@ -1099,7 +1113,7 @@ diff -u libmagic.orig/cdf.h libmagic/cdf.h
|
||||
void cdf_unpack_header(cdf_header_t *, char *);
|
||||
diff -u libmagic.orig/cdf_time.c libmagic/cdf_time.c
|
||||
--- libmagic.orig/cdf_time.c Wed Oct 31 18:03:01 2012
|
||||
+++ libmagic/cdf_time.c Mon Apr 14 23:32:55 2014
|
||||
+++ libmagic/cdf_time.c Mon Dec 2 15:25:29 2013
|
||||
@@ -96,7 +96,7 @@
|
||||
}
|
||||
|
||||
@@ -1159,7 +1173,7 @@ diff -u libmagic.orig/cdf_time.c libmagic/cdf_time.c
|
||||
static const char *ref = "Sat Apr 23 01:30:00 1977";
|
||||
diff -u libmagic.orig/compress.c libmagic/compress.c
|
||||
--- libmagic.orig/compress.c Sun Jan 6 21:35:43 2013
|
||||
+++ libmagic/compress.c Mon Apr 14 23:42:51 2014
|
||||
+++ libmagic/compress.c Mon Dec 2 15:25:29 2013
|
||||
@@ -32,6 +32,7 @@
|
||||
* uncompress(method, old, n, newch) - uncompress old into new,
|
||||
* using method, return sizeof new
|
||||
@@ -1322,7 +1336,7 @@ diff -u libmagic.orig/compress.c libmagic/compress.c
|
||||
+#endif /* if PHP_FILEINFO_UNCOMPRESS */
|
||||
diff -u libmagic.orig/file.h libmagic/file.h
|
||||
--- libmagic.orig/file.h Mon Feb 18 16:40:59 2013
|
||||
+++ libmagic/file.h Mon Apr 14 23:42:51 2014
|
||||
+++ libmagic/file.h Mon Mar 10 16:40:55 2014
|
||||
@@ -33,11 +33,9 @@
|
||||
#ifndef __file_h__
|
||||
#define __file_h__
|
||||
@@ -1532,7 +1546,7 @@ diff -u libmagic.orig/file.h libmagic/file.h
|
||||
#endif /* __file_h__ */
|
||||
diff -u libmagic.orig/fsmagic.c libmagic/fsmagic.c
|
||||
--- libmagic.orig/fsmagic.c Thu Mar 21 18:45:14 2013
|
||||
+++ libmagic/fsmagic.c Mon Apr 14 23:42:51 2014
|
||||
+++ libmagic/fsmagic.c Mon Dec 2 15:25:29 2013
|
||||
@@ -59,27 +59,21 @@
|
||||
# define minor(dev) ((dev) & 0xff)
|
||||
#endif
|
||||
@@ -1899,7 +1913,7 @@ diff -u libmagic.orig/fsmagic.c libmagic/fsmagic.c
|
||||
}
|
||||
diff -u libmagic.orig/funcs.c libmagic/funcs.c
|
||||
--- libmagic.orig/funcs.c Wed Oct 31 18:03:01 2012
|
||||
+++ libmagic/funcs.c Mon Apr 14 23:42:51 2014
|
||||
+++ libmagic/funcs.c Mon Mar 10 16:40:55 2014
|
||||
@@ -41,52 +41,42 @@
|
||||
#if defined(HAVE_WCTYPE_H)
|
||||
#include <wctype.h>
|
||||
@@ -2193,7 +2207,7 @@ diff -u libmagic.orig/funcs.c libmagic/funcs.c
|
||||
+
|
||||
diff -u libmagic.orig/magic.c libmagic/magic.c
|
||||
--- libmagic.orig/magic.c Fri Jan 11 17:43:09 2013
|
||||
+++ libmagic/magic.c Mon Apr 14 23:42:51 2014
|
||||
+++ libmagic/magic.c Mon Dec 2 15:29:02 2013
|
||||
@@ -25,11 +25,6 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
@@ -2537,7 +2551,7 @@ diff -u libmagic.orig/magic.c libmagic/magic.c
|
||||
magic_error(struct magic_set *ms)
|
||||
diff -u libmagic.orig/magic.h libmagic/magic.h
|
||||
--- libmagic.orig/magic.h Thu Mar 21 18:52:42 2013
|
||||
+++ libmagic/magic.h Mon Apr 14 23:42:51 2014
|
||||
+++ libmagic/magic.h Mon Dec 2 15:25:29 2013
|
||||
@@ -87,6 +87,7 @@
|
||||
|
||||
const char *magic_getpath(const char *, int);
|
||||
@@ -2556,14 +2570,14 @@ diff -u libmagic.orig/magic.h libmagic/magic.h
|
||||
|
||||
diff -u libmagic.orig/print.c libmagic/print.c
|
||||
--- libmagic.orig/print.c Thu Mar 21 18:45:14 2013
|
||||
+++ libmagic/print.c Mon Apr 14 23:42:51 2014
|
||||
@@ -29,12 +29,17 @@
|
||||
+++ libmagic/print.c Mon Dec 2 15:29:02 2013
|
||||
@@ -28,13 +28,17 @@
|
||||
/*
|
||||
* print.c - debugging printout routines
|
||||
*/
|
||||
|
||||
+#define _GNU_SOURCE
|
||||
+#include "php.h"
|
||||
+
|
||||
|
||||
#include "file.h"
|
||||
+#include "cdf.h"
|
||||
|
||||
@@ -2575,7 +2589,7 @@ diff -u libmagic.orig/print.c libmagic/print.c
|
||||
#include <string.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
@@ -43,188 +48,28 @@
|
||||
@@ -43,188 +47,28 @@
|
||||
#endif
|
||||
#include <time.h>
|
||||
|
||||
@@ -2776,7 +2790,7 @@ diff -u libmagic.orig/print.c libmagic/print.c
|
||||
}
|
||||
|
||||
protected const char *
|
||||
@@ -235,7 +80,7 @@
|
||||
@@ -235,7 +79,7 @@
|
||||
struct tm *tm;
|
||||
|
||||
if (flags & FILE_T_WINDOWS) {
|
||||
@@ -2787,7 +2801,7 @@ diff -u libmagic.orig/print.c libmagic/print.c
|
||||
}
|
||||
diff -u libmagic.orig/readcdf.c libmagic/readcdf.c
|
||||
--- libmagic.orig/readcdf.c Wed Oct 31 18:03:01 2012
|
||||
+++ libmagic/readcdf.c Tue May 27 22:17:37 2014
|
||||
+++ libmagic/readcdf.c Thu Apr 24 19:54:40 2014
|
||||
@@ -30,7 +30,11 @@
|
||||
#endif
|
||||
|
||||
@@ -2863,7 +2877,7 @@ diff -u libmagic.orig/readcdf.c libmagic/readcdf.c
|
||||
return -1;
|
||||
diff -u libmagic.orig/readelf.c libmagic/readelf.c
|
||||
--- libmagic.orig/readelf.c Thu Mar 21 18:45:14 2013
|
||||
+++ libmagic/readelf.c Mon Apr 14 23:42:51 2014
|
||||
+++ libmagic/readelf.c Sat Oct 25 11:50:05 2014
|
||||
@@ -48,8 +48,8 @@
|
||||
private int dophn_exec(struct magic_set *, int, int, int, off_t, int, size_t,
|
||||
off_t, int *, int);
|
||||
@@ -2956,7 +2970,21 @@ diff -u libmagic.orig/readelf.c libmagic/readelf.c
|
||||
file_badread(ms);
|
||||
return -1;
|
||||
}
|
||||
@@ -852,24 +867,12 @@
|
||||
@@ -357,6 +372,13 @@
|
||||
uint32_t namesz, descsz;
|
||||
unsigned char *nbuf = CAST(unsigned char *, vbuf);
|
||||
|
||||
+ if (xnh_sizeof + offset > size) {
|
||||
+ /*
|
||||
+ * We're out of note headers.
|
||||
+ */
|
||||
+ return xnh_sizeof + offset;
|
||||
+ }
|
||||
+
|
||||
(void)memcpy(xnh_addr, &nbuf[offset], xnh_sizeof);
|
||||
offset += xnh_sizeof;
|
||||
|
||||
@@ -852,24 +874,12 @@
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -2984,7 +3012,7 @@ diff -u libmagic.orig/readelf.c libmagic/readelf.c
|
||||
file_badread(ms);
|
||||
return -1;
|
||||
}
|
||||
@@ -894,14 +897,17 @@
|
||||
@@ -894,14 +904,17 @@
|
||||
/* Things we can determine when we seek */
|
||||
switch (xsh_type) {
|
||||
case SHT_NOTE:
|
||||
@@ -3007,7 +3035,7 @@ diff -u libmagic.orig/readelf.c libmagic/readelf.c
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -910,25 +916,16 @@
|
||||
@@ -910,25 +923,16 @@
|
||||
if (noff >= (off_t)xsh_size)
|
||||
break;
|
||||
noff = donote(ms, nbuf, (size_t)noff,
|
||||
@@ -3038,7 +3066,7 @@ diff -u libmagic.orig/readelf.c libmagic/readelf.c
|
||||
file_badseek(ms);
|
||||
return -1;
|
||||
}
|
||||
@@ -940,7 +937,7 @@
|
||||
@@ -940,7 +944,7 @@
|
||||
MAX(sizeof cap32, sizeof cap64)];
|
||||
if ((coff += xcap_sizeof) > (off_t)xsh_size)
|
||||
break;
|
||||
@@ -3047,7 +3075,7 @@ diff -u libmagic.orig/readelf.c libmagic/readelf.c
|
||||
(ssize_t)xcap_sizeof) {
|
||||
file_badread(ms);
|
||||
return -1;
|
||||
@@ -966,13 +963,12 @@
|
||||
@@ -966,13 +970,12 @@
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -3063,7 +3091,7 @@ diff -u libmagic.orig/readelf.c libmagic/readelf.c
|
||||
if (file_printf(ms, ", %sstripped", stripped ? "" : "not ") == -1)
|
||||
return -1;
|
||||
if (cap_hw1) {
|
||||
@@ -1051,7 +1047,7 @@
|
||||
@@ -1051,7 +1054,7 @@
|
||||
const char *shared_libraries = "";
|
||||
unsigned char nbuf[BUFSIZ];
|
||||
ssize_t bufsize;
|
||||
@@ -3072,7 +3100,7 @@ diff -u libmagic.orig/readelf.c libmagic/readelf.c
|
||||
|
||||
if (size != xph_sizeof) {
|
||||
if (file_printf(ms, ", corrupted program header size") == -1)
|
||||
@@ -1060,8 +1056,13 @@
|
||||
@@ -1060,8 +1063,13 @@
|
||||
}
|
||||
|
||||
for ( ; num; num--) {
|
||||
@@ -3088,7 +3116,7 @@ diff -u libmagic.orig/readelf.c libmagic/readelf.c
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -1099,9 +1100,12 @@
|
||||
@@ -1099,9 +1107,12 @@
|
||||
* This is a PT_NOTE section; loop through all the notes
|
||||
* in the section.
|
||||
*/
|
||||
@@ -3104,7 +3132,7 @@ diff -u libmagic.orig/readelf.c libmagic/readelf.c
|
||||
if (bufsize == -1) {
|
||||
file_badread(ms);
|
||||
return -1;
|
||||
@@ -1162,7 +1166,7 @@
|
||||
@@ -1162,7 +1173,7 @@
|
||||
/*
|
||||
* If we cannot seek, it must be a pipe, socket or fifo.
|
||||
*/
|
||||
@@ -3115,7 +3143,7 @@ diff -u libmagic.orig/readelf.c libmagic/readelf.c
|
||||
if (fstat(fd, &st) == -1) {
|
||||
diff -u libmagic.orig/readelf.h libmagic/readelf.h
|
||||
--- libmagic.orig/readelf.h Thu Mar 21 18:45:14 2013
|
||||
+++ libmagic/readelf.h Mon Apr 14 23:42:51 2014
|
||||
+++ libmagic/readelf.h Mon Dec 2 15:25:29 2013
|
||||
@@ -44,9 +44,17 @@
|
||||
typedef uint32_t Elf32_Word;
|
||||
typedef uint8_t Elf32_Char;
|
||||
@@ -3136,7 +3164,7 @@ diff -u libmagic.orig/readelf.h libmagic/readelf.h
|
||||
typedef uint8_t Elf64_Char;
|
||||
diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
|
||||
--- libmagic.orig/softmagic.c Thu Mar 21 18:45:14 2013
|
||||
+++ libmagic/softmagic.c Tue Jul 1 09:00:09 2014
|
||||
+++ libmagic/softmagic.c Wed Aug 20 21:20:34 2014
|
||||
@@ -41,6 +41,11 @@
|
||||
#include <stdlib.h>
|
||||
#include <time.h>
|
||||
@@ -3149,6 +3177,15 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
|
||||
|
||||
private int match(struct magic_set *, struct magic *, uint32_t,
|
||||
const unsigned char *, size_t, size_t, int, int, int, int, int *, int *,
|
||||
@@ -53,7 +58,7 @@
|
||||
private int32_t moffset(struct magic_set *, struct magic *);
|
||||
private void mdebug(uint32_t, const char *, size_t);
|
||||
private int mcopy(struct magic_set *, union VALUETYPE *, int, int,
|
||||
- const unsigned char *, uint32_t, size_t, size_t);
|
||||
+ const unsigned char *, uint32_t, size_t, struct magic *);
|
||||
private int mconvert(struct magic_set *, struct magic *, int);
|
||||
private int print_sep(struct magic_set *, int);
|
||||
private int handle_annotation(struct magic_set *, struct magic *);
|
||||
@@ -62,6 +67,8 @@
|
||||
private void cvt_32(union VALUETYPE *, const struct magic *);
|
||||
private void cvt_64(union VALUETYPE *, const struct magic *);
|
||||
@@ -3308,9 +3345,72 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
|
||||
while (len--)
|
||||
*ptr1++ = *ptr2++;
|
||||
*ptr1 = '\0';
|
||||
@@ -1145,9 +1138,6 @@
|
||||
"nbytes=%zu, count=%u)\n", m->type, m->flag, offset, o,
|
||||
nbytes, count);
|
||||
@@ -1010,7 +1003,7 @@
|
||||
|
||||
private int
|
||||
mcopy(struct magic_set *ms, union VALUETYPE *p, int type, int indir,
|
||||
- const unsigned char *s, uint32_t offset, size_t nbytes, size_t linecnt)
|
||||
+ const unsigned char *s, uint32_t offset, size_t nbytes, struct magic *m)
|
||||
{
|
||||
/*
|
||||
* Note: FILE_SEARCH and FILE_REGEX do not actually copy
|
||||
@@ -1030,15 +1023,24 @@
|
||||
const char *last; /* end of search region */
|
||||
const char *buf; /* start of search region */
|
||||
const char *end;
|
||||
- size_t lines;
|
||||
+ size_t lines, linecnt, bytecnt;
|
||||
+
|
||||
+ linecnt = m->str_range;
|
||||
+ bytecnt = linecnt * 80;
|
||||
|
||||
+ if (bytecnt == 0) {
|
||||
+ bytecnt = 8192;
|
||||
+ }
|
||||
+ if (bytecnt > nbytes) {
|
||||
+ bytecnt = nbytes;
|
||||
+ }
|
||||
if (s == NULL) {
|
||||
ms->search.s_len = 0;
|
||||
ms->search.s = NULL;
|
||||
return 0;
|
||||
}
|
||||
buf = RCAST(const char *, s) + offset;
|
||||
- end = last = RCAST(const char *, s) + nbytes;
|
||||
+ end = last = RCAST(const char *, s) + bytecnt;
|
||||
/* mget() guarantees buf <= last */
|
||||
for (lines = linecnt, b = buf; lines && b < end &&
|
||||
((b = CAST(const char *,
|
||||
@@ -1051,7 +1053,7 @@
|
||||
b++;
|
||||
}
|
||||
if (lines)
|
||||
- last = RCAST(const char *, s) + nbytes;
|
||||
+ last = RCAST(const char *, s) + bytecnt;
|
||||
|
||||
ms->search.s = buf;
|
||||
ms->search.s_len = last - buf;
|
||||
@@ -1125,7 +1127,6 @@
|
||||
int *need_separator, int *returnval)
|
||||
{
|
||||
uint32_t soffset, offset = ms->offset;
|
||||
- uint32_t count = m->str_range;
|
||||
int rv, oneed_separator;
|
||||
char *sbuf, *rbuf;
|
||||
union VALUETYPE *p = &ms->ms_value;
|
||||
@@ -1137,17 +1138,13 @@
|
||||
}
|
||||
|
||||
if (mcopy(ms, p, m->type, m->flag & INDIR, s, (uint32_t)(offset + o),
|
||||
- (uint32_t)nbytes, count) == -1)
|
||||
+ (uint32_t)nbytes, m) == -1)
|
||||
return -1;
|
||||
|
||||
if ((ms->flags & MAGIC_DEBUG) != 0) {
|
||||
fprintf(stderr, "mget(type=%d, flag=%x, offset=%u, o=%zu, "
|
||||
- "nbytes=%zu, count=%u)\n", m->type, m->flag, offset, o,
|
||||
- nbytes, count);
|
||||
+ "nbytes=%zu)\n", m->type, m->flag, offset, o, nbytes);
|
||||
mdebug(offset, (char *)(void *)p, sizeof(union VALUETYPE));
|
||||
-#ifndef COMPILE_ONLY
|
||||
- file_mdump(m);
|
||||
@@ -3318,7 +3418,7 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
|
||||
}
|
||||
|
||||
if (m->flag & INDIR) {
|
||||
@@ -1191,7 +1181,7 @@
|
||||
@@ -1191,7 +1188,7 @@
|
||||
}
|
||||
switch (cvt_flip(m->in_type, flip)) {
|
||||
case FILE_BYTE:
|
||||
@@ -3327,7 +3427,7 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
|
||||
return 0;
|
||||
if (off) {
|
||||
switch (m->in_op & FILE_OPS_MASK) {
|
||||
@@ -1226,7 +1216,7 @@
|
||||
@@ -1226,7 +1223,7 @@
|
||||
offset = ~offset;
|
||||
break;
|
||||
case FILE_BESHORT:
|
||||
@@ -3336,7 +3436,7 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
|
||||
return 0;
|
||||
if (off) {
|
||||
switch (m->in_op & FILE_OPS_MASK) {
|
||||
@@ -1278,7 +1268,7 @@
|
||||
@@ -1278,7 +1275,7 @@
|
||||
offset = ~offset;
|
||||
break;
|
||||
case FILE_LESHORT:
|
||||
@@ -3345,7 +3445,7 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
|
||||
return 0;
|
||||
if (off) {
|
||||
switch (m->in_op & FILE_OPS_MASK) {
|
||||
@@ -1330,7 +1320,7 @@
|
||||
@@ -1330,7 +1327,7 @@
|
||||
offset = ~offset;
|
||||
break;
|
||||
case FILE_SHORT:
|
||||
@@ -3354,7 +3454,7 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
|
||||
return 0;
|
||||
if (off) {
|
||||
switch (m->in_op & FILE_OPS_MASK) {
|
||||
@@ -1367,7 +1357,7 @@
|
||||
@@ -1367,7 +1364,7 @@
|
||||
break;
|
||||
case FILE_BELONG:
|
||||
case FILE_BEID3:
|
||||
@@ -3363,7 +3463,7 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
|
||||
return 0;
|
||||
if (off) {
|
||||
switch (m->in_op & FILE_OPS_MASK) {
|
||||
@@ -1438,7 +1428,7 @@
|
||||
@@ -1438,7 +1435,7 @@
|
||||
break;
|
||||
case FILE_LELONG:
|
||||
case FILE_LEID3:
|
||||
@@ -3372,7 +3472,7 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
|
||||
return 0;
|
||||
if (off) {
|
||||
switch (m->in_op & FILE_OPS_MASK) {
|
||||
@@ -1508,7 +1498,7 @@
|
||||
@@ -1508,7 +1505,7 @@
|
||||
offset = ~offset;
|
||||
break;
|
||||
case FILE_MELONG:
|
||||
@@ -3381,7 +3481,7 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
|
||||
return 0;
|
||||
if (off) {
|
||||
switch (m->in_op & FILE_OPS_MASK) {
|
||||
@@ -1578,7 +1568,7 @@
|
||||
@@ -1578,7 +1575,7 @@
|
||||
offset = ~offset;
|
||||
break;
|
||||
case FILE_LONG:
|
||||
@@ -3390,7 +3490,15 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
|
||||
return 0;
|
||||
if (off) {
|
||||
switch (m->in_op & FILE_OPS_MASK) {
|
||||
@@ -1644,23 +1634,20 @@
|
||||
@@ -1637,30 +1634,27 @@
|
||||
if ((ms->flags & MAGIC_DEBUG) != 0)
|
||||
fprintf(stderr, "indirect +offs=%u\n", offset);
|
||||
}
|
||||
- if (mcopy(ms, p, m->type, 0, s, offset, nbytes, count) == -1)
|
||||
+ if (mcopy(ms, p, m->type, 0, s, offset, nbytes, m) == -1)
|
||||
return -1;
|
||||
ms->offset = offset;
|
||||
|
||||
if ((ms->flags & MAGIC_DEBUG) != 0) {
|
||||
mdebug(offset, (char *)(void *)p,
|
||||
sizeof(union VALUETYPE));
|
||||
@@ -3416,7 +3524,7 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
|
||||
return 0;
|
||||
break;
|
||||
|
||||
@@ -1679,38 +1666,40 @@
|
||||
@@ -1679,38 +1673,40 @@
|
||||
case FILE_FLOAT:
|
||||
case FILE_BEFLOAT:
|
||||
case FILE_LEFLOAT:
|
||||
@@ -3463,7 +3571,7 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
|
||||
if ((ms->flags & MAGIC_DEBUG) != 0)
|
||||
fprintf(stderr, "indirect @offs=%u[%d]\n", offset, rv);
|
||||
rbuf = ms->o.buf;
|
||||
@@ -1718,16 +1707,26 @@
|
||||
@@ -1718,16 +1714,26 @@
|
||||
ms->offset = soffset;
|
||||
if (rv == 1) {
|
||||
if ((ms->flags & (MAGIC_MIME|MAGIC_APPLE)) == 0 &&
|
||||
@@ -3494,7 +3602,7 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
|
||||
return 0;
|
||||
sbuf = m->value.s;
|
||||
if (*sbuf == '^') {
|
||||
@@ -1837,6 +1836,42 @@
|
||||
@@ -1837,6 +1843,42 @@
|
||||
return file_strncmp(a, b, len, flags);
|
||||
}
|
||||
|
||||
@@ -3537,7 +3645,7 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
|
||||
private int
|
||||
magiccheck(struct magic_set *ms, struct magic *m)
|
||||
{
|
||||
@@ -1996,69 +2031,157 @@
|
||||
@@ -1996,69 +2038,157 @@
|
||||
break;
|
||||
}
|
||||
case FILE_REGEX: {
|
||||
@@ -3608,7 +3716,7 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
|
||||
+ zval *retval;
|
||||
+ zval *subpats;
|
||||
+ char *haystack;
|
||||
+
|
||||
+
|
||||
+ MAKE_STD_ZVAL(retval);
|
||||
+ ALLOC_INIT_ZVAL(subpats);
|
||||
+
|
||||
|
||||
@@ -372,6 +372,13 @@ donote(struct magic_set *ms, void *vbuf, size_t offset, size_t size,
|
||||
uint32_t namesz, descsz;
|
||||
unsigned char *nbuf = CAST(unsigned char *, vbuf);
|
||||
|
||||
if (xnh_sizeof + offset > size) {
|
||||
/*
|
||||
* We're out of note headers.
|
||||
*/
|
||||
return xnh_sizeof + offset;
|
||||
}
|
||||
|
||||
(void)memcpy(xnh_addr, &nbuf[offset], xnh_sizeof);
|
||||
offset += xnh_sizeof;
|
||||
|
||||
|
||||
+14
-2
@@ -5110,11 +5110,23 @@ PHP_FUNCTION(imagescale)
|
||||
return;
|
||||
}
|
||||
method = tmp_m;
|
||||
new_width = tmp_w;
|
||||
new_height = tmp_h;
|
||||
|
||||
ZEND_FETCH_RESOURCE(im, gdImagePtr, &IM, -1, "Image", le_gd);
|
||||
|
||||
if (tmp_h < 0) {
|
||||
/* preserve ratio */
|
||||
long src_x, src_y;
|
||||
|
||||
src_x = gdImageSX(im);
|
||||
src_y = gdImageSY(im);
|
||||
if (src_x) {
|
||||
tmp_h = tmp_w * src_y / src_x;
|
||||
}
|
||||
}
|
||||
|
||||
new_width = tmp_w;
|
||||
new_height = tmp_h;
|
||||
|
||||
if (gdImageSetInterpolationMethod(im, method)) {
|
||||
im_scaled = gdImageScale(im, new_width, new_height);
|
||||
}
|
||||
|
||||
@@ -324,30 +324,6 @@ static void _php_gmpnum_free(zend_rsrc_list_entry *rsrc TSRMLS_DC);
|
||||
# define MAX_BASE 36
|
||||
#endif
|
||||
|
||||
/* {{{ gmp_emalloc
|
||||
*/
|
||||
static void *gmp_emalloc(size_t size)
|
||||
{
|
||||
return emalloc(size);
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
/* {{{ gmp_erealloc
|
||||
*/
|
||||
static void *gmp_erealloc(void *ptr, size_t old_size, size_t new_size)
|
||||
{
|
||||
return erealloc(ptr, new_size);
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
/* {{{ gmp_efree
|
||||
*/
|
||||
static void gmp_efree(void *ptr, size_t size)
|
||||
{
|
||||
efree(ptr);
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
/* {{{ ZEND_GINIT_FUNCTION
|
||||
*/
|
||||
static ZEND_GINIT_FUNCTION(gmp)
|
||||
@@ -369,8 +345,6 @@ ZEND_MODULE_STARTUP_D(gmp)
|
||||
#endif
|
||||
REGISTER_STRING_CONSTANT("GMP_VERSION", (char *)gmp_version, CONST_CS | CONST_PERSISTENT);
|
||||
|
||||
mp_set_memory_functions(gmp_emalloc, gmp_erealloc, gmp_efree);
|
||||
|
||||
return SUCCESS;
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
@@ -70,12 +70,17 @@ dnl
|
||||
AC_CACHE_CHECK([whether whether compiler supports Decimal32/64/128 types], ac_cv_decimal_fp_supported,[
|
||||
AC_TRY_RUN( [
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
typedef float dec32 __attribute__((mode(SD)));
|
||||
dec32 k = 99.49f;
|
||||
double d2 = (double)k;
|
||||
return 0;
|
||||
const char *check_str = "99.49";
|
||||
char print_str[32];
|
||||
|
||||
snprintf(print_str, 32, "%f", d2);
|
||||
return memcmp(print_str, check_str, 5);
|
||||
}
|
||||
],[
|
||||
ac_cv_decimal_fp_supported=yes
|
||||
|
||||
+3
-2
@@ -951,14 +951,15 @@ int odbc_bindcols(odbc_result *result TSRMLS_DC)
|
||||
SQLUSMALLINT colfieldid;
|
||||
int charextraalloc;
|
||||
|
||||
colfieldid = SQL_COLUMN_DISPLAY_SIZE;
|
||||
charextraalloc = 0;
|
||||
result->values = (odbc_result_value *) safe_emalloc(sizeof(odbc_result_value), result->numcols, 0);
|
||||
|
||||
result->longreadlen = ODBCG(defaultlrl);
|
||||
result->binmode = ODBCG(defaultbinmode);
|
||||
|
||||
for(i = 0; i < result->numcols; i++) {
|
||||
charextraalloc = 0;
|
||||
colfieldid = SQL_COLUMN_DISPLAY_SIZE;
|
||||
|
||||
rc = SQLColAttributes(result->stmt, (SQLUSMALLINT)(i+1), SQL_COLUMN_NAME,
|
||||
result->values[i].name, sizeof(result->values[i].name), &colnamelen, 0);
|
||||
rc = SQLColAttributes(result->stmt, (SQLUSMALLINT)(i+1), SQL_COLUMN_TYPE,
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
--TEST--
|
||||
odbc_exec(): Getting accurate date data from query
|
||||
--SKIPIF--
|
||||
<?php include 'skipif.inc'; ?>
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
include 'config.inc';
|
||||
|
||||
$id_1_date = '2014-09-23';
|
||||
$id_2_date = '2014-09-24';
|
||||
|
||||
$conn = odbc_connect($dsn, $user, $pass);
|
||||
|
||||
@odbc_exec($conn, 'CREATE DATABASE odbcTEST');
|
||||
|
||||
odbc_exec($conn, 'CREATE TABLE FOO (ID INT, VARCHAR_COL VARCHAR(100), DATE_COL DATE)');
|
||||
|
||||
odbc_exec($conn, "INSERT INTO FOO(ID, VARCHAR_COL, DATE_COL) VALUES (1, 'hello', '$id_1_date')");
|
||||
odbc_exec($conn, "INSERT INTO FOO(ID, VARCHAR_COL, DATE_COL) VALUES (2, 'helloagain', '$id_2_date')");
|
||||
|
||||
$res = odbc_exec($conn, 'SELECT * FROM FOO ORDER BY ID ASC');
|
||||
|
||||
while(odbc_fetch_row($res)) {
|
||||
$id = odbc_result($res, "ID");
|
||||
$varchar_col = odbc_result($res, "VARCHAR_COL");
|
||||
$date = odbc_result($res, "DATE_COL");
|
||||
|
||||
if ($id == 1) {
|
||||
if ($date != $id_1_date) {
|
||||
print "Date_1 mismatched\n";
|
||||
} else {
|
||||
print "Date_1 matched\n";
|
||||
}
|
||||
} else {
|
||||
if ($date != $id_2_date) {
|
||||
print "Date_2 mismatched\n";
|
||||
} else {
|
||||
print "Date_2 matched\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
||||
--EXPECT--
|
||||
Date_1 matched
|
||||
Date_2 matched
|
||||
--CLEAN--
|
||||
<?php
|
||||
include 'config.inc';
|
||||
|
||||
$conn = odbc_connect($dsn, $user, $pass);
|
||||
|
||||
odbc_exec($conn, 'DROP TABLE FOO');
|
||||
odbc_exec($conn, 'DROP DATABASE odbcTEST');
|
||||
|
||||
?>
|
||||
@@ -171,6 +171,7 @@ static int handle_ssl_error(php_stream *stream, int nr_bytes, zend_bool is_init
|
||||
return retry;
|
||||
}
|
||||
|
||||
|
||||
static size_t php_openssl_sockop_write(php_stream *stream, const char *buf, size_t count TSRMLS_DC)
|
||||
{
|
||||
php_openssl_netstream_data_t *sslsock = (php_openssl_netstream_data_t*)stream->abstract;
|
||||
@@ -834,6 +835,21 @@ static int php_openssl_sockop_cast(php_stream *stream, int castas, void **ret TS
|
||||
|
||||
case PHP_STREAM_AS_FD_FOR_SELECT:
|
||||
if (ret) {
|
||||
/* OpenSSL has an internal buffer which select() cannot see. If we don't
|
||||
* fetch it into the stream's buffer, no activity will be reported on the
|
||||
* stream even though there is data waiting to be read - but we only fetch
|
||||
* the lower of bytes OpenSSL has ready to give us or chunk_size since we
|
||||
* weren't asked for any data at this stage. This is only likely to cause
|
||||
* issues with non-blocking streams, but it's harmless to always do it. */
|
||||
size_t pending;
|
||||
if (stream->writepos == stream->readpos
|
||||
&& sslsock->ssl_active
|
||||
&& (pending = (size_t)SSL_pending(sslsock->ssl_handle)) > 0) {
|
||||
php_stream_fill_read_buffer(stream, pending < stream->chunk_size
|
||||
? pending
|
||||
: stream->chunk_size);
|
||||
}
|
||||
|
||||
*(php_socket_t *)ret = sslsock->s.socket;
|
||||
}
|
||||
return SUCCESS;
|
||||
|
||||
@@ -3380,6 +3380,7 @@ static zend_op_array *phar_compile_file(zend_file_handle *file_handle, int type
|
||||
|
||||
zend_try {
|
||||
failed = 0;
|
||||
CG(zend_lineno) = 0;
|
||||
res = phar_orig_compile_file(file_handle, type TSRMLS_CC);
|
||||
} zend_catch {
|
||||
failed = 1;
|
||||
|
||||
@@ -6061,7 +6061,7 @@ ZEND_END_ARG_INFO()
|
||||
static const zend_function_entry reflection_zend_extension_functions[] = {
|
||||
ZEND_ME(reflection, __clone, arginfo_reflection__void, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
|
||||
ZEND_ME(reflection_zend_extension, export, arginfo_reflection_extension_export, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
|
||||
ZEND_ME(reflection_zend_extension, __construct, arginfo_reflection_extension___construct, 0)
|
||||
ZEND_ME(reflection_zend_extension, __construct, arginfo_reflection_zend_extension___construct, 0)
|
||||
ZEND_ME(reflection_zend_extension, __toString, arginfo_reflection__void, 0)
|
||||
ZEND_ME(reflection_zend_extension, getName, arginfo_reflection__void, 0)
|
||||
ZEND_ME(reflection_zend_extension, getVersion, arginfo_reflection__void, 0)
|
||||
|
||||
@@ -49,6 +49,41 @@ static inline int spl_instantiate_arg_ex2(zend_class_entry *pce, zval **retval,
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
/* {{{ spl_instantiate_arg_n */
|
||||
static inline void spl_instantiate_arg_n(zend_class_entry *pce, zval **retval, int argc, zval ***argv TSRMLS_DC)
|
||||
{
|
||||
zend_function *func = pce->constructor;
|
||||
zend_fcall_info fci;
|
||||
zend_fcall_info_cache fcc;
|
||||
zval *dummy;
|
||||
zval z_name;
|
||||
|
||||
spl_instantiate(pce, retval, 0 TSRMLS_CC);
|
||||
|
||||
ZVAL_STRING(&z_name, func->common.function_name, 0);
|
||||
|
||||
fci.size = sizeof(zend_fcall_info);
|
||||
fci.function_table = &pce->function_table;
|
||||
fci.function_name = &z_name;
|
||||
fci.object_ptr = *retval;
|
||||
fci.symbol_table = NULL;
|
||||
fci.retval_ptr_ptr = &dummy;
|
||||
fci.param_count = argc;
|
||||
fci.params = argv;
|
||||
fci.no_separation = 1;
|
||||
|
||||
fcc.initialized = 1;
|
||||
fcc.function_handler = func;
|
||||
fcc.calling_scope = EG(scope);
|
||||
fcc.called_scope = pce;
|
||||
fcc.object_ptr = *retval;
|
||||
|
||||
zend_call_function(&fci, &fcc TSRMLS_CC);
|
||||
|
||||
zval_ptr_dtor(&dummy);
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
#endif /* SPL_ENGINE_H */
|
||||
|
||||
/*
|
||||
|
||||
+52
-5
@@ -1979,8 +1979,10 @@ SPL_METHOD(RegexIterator, accept)
|
||||
|
||||
if (intern->current.data == NULL) {
|
||||
RETURN_FALSE;
|
||||
} else if (Z_TYPE_P(intern->current.data) == IS_ARRAY) {
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
|
||||
if (intern->u.regex.flags & REGIT_USE_KEY) {
|
||||
subject_ptr = intern->current.key;
|
||||
} else {
|
||||
@@ -2014,8 +2016,7 @@ SPL_METHOD(RegexIterator, accept)
|
||||
ALLOC_INIT_ZVAL(intern->current.data);
|
||||
php_pcre_match_impl(intern->u.regex.pce, subject, subject_len, &zcount,
|
||||
intern->current.data, intern->u.regex.mode == REGIT_MODE_ALL_MATCHES, intern->u.regex.use_flags, intern->u.regex.preg_flags, 0 TSRMLS_CC);
|
||||
count = zend_hash_num_elements(Z_ARRVAL_P(intern->current.data));
|
||||
RETVAL_BOOL(count > 0);
|
||||
RETVAL_BOOL(Z_LVAL(zcount) > 0);
|
||||
break;
|
||||
|
||||
case REGIT_MODE_SPLIT:
|
||||
@@ -2193,7 +2194,7 @@ SPL_METHOD(RecursiveRegexIterator, __construct)
|
||||
SPL_METHOD(RecursiveRegexIterator, getChildren)
|
||||
{
|
||||
spl_dual_it_object *intern;
|
||||
zval *retval, *regex;
|
||||
zval *retval;
|
||||
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
@@ -2203,16 +2204,61 @@ SPL_METHOD(RecursiveRegexIterator, getChildren)
|
||||
|
||||
zend_call_method_with_0_params(&intern->inner.zobject, intern->inner.ce, NULL, "getchildren", &retval);
|
||||
if (!EG(exception)) {
|
||||
zval **args[5], *object, *regex, *mode, *flags, *preg_flags;
|
||||
|
||||
MAKE_STD_ZVAL(object);
|
||||
MAKE_STD_ZVAL(regex);
|
||||
MAKE_STD_ZVAL(mode);
|
||||
MAKE_STD_ZVAL(flags);
|
||||
MAKE_STD_ZVAL(preg_flags);
|
||||
|
||||
MAKE_COPY_ZVAL(&retval, object);
|
||||
ZVAL_STRING(regex, intern->u.regex.regex, 1);
|
||||
spl_instantiate_arg_ex2(Z_OBJCE_P(getThis()), &return_value, 0, retval, regex TSRMLS_CC);
|
||||
ZVAL_LONG(mode, intern->u.regex.mode);
|
||||
ZVAL_LONG(flags, intern->u.regex.flags);
|
||||
ZVAL_LONG(preg_flags, intern->u.regex.preg_flags);
|
||||
|
||||
args[0] = &object;
|
||||
args[1] = ®ex;
|
||||
args[2] = &mode;
|
||||
args[3] = &flags;
|
||||
args[4] = &preg_flags;
|
||||
|
||||
spl_instantiate_arg_n(Z_OBJCE_P(getThis()), &return_value, 5, args TSRMLS_CC);
|
||||
|
||||
zval_ptr_dtor(&object);
|
||||
zval_ptr_dtor(®ex);
|
||||
zval_ptr_dtor(&mode);
|
||||
zval_ptr_dtor(&flags);
|
||||
zval_ptr_dtor(&preg_flags);
|
||||
}
|
||||
if (retval) {
|
||||
zval_ptr_dtor(&retval);
|
||||
}
|
||||
} /* }}} */
|
||||
|
||||
SPL_METHOD(RecursiveRegexIterator, accept)
|
||||
{
|
||||
spl_dual_it_object *intern;
|
||||
zval *rv;
|
||||
|
||||
if (zend_parse_parameters_none() == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
SPL_FETCH_AND_CHECK_DUAL_IT(intern, getThis());
|
||||
|
||||
if (intern->current.data == NULL) {
|
||||
RETURN_FALSE;
|
||||
} else if (Z_TYPE_P(intern->current.data) == IS_ARRAY) {
|
||||
RETURN_BOOL(zend_hash_num_elements(Z_ARRVAL_P(intern->current.data)) > 0);
|
||||
}
|
||||
|
||||
zend_call_method_with_0_params(&(getThis()), spl_ce_RegexIterator, NULL, "accept", &rv);
|
||||
|
||||
RETURN_ZVAL(rv, 1, 1);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/* {{{ spl_dual_it_dtor */
|
||||
@@ -2403,6 +2449,7 @@ ZEND_END_ARG_INFO();
|
||||
|
||||
static const zend_function_entry spl_funcs_RecursiveRegexIterator[] = {
|
||||
SPL_ME(RecursiveRegexIterator, __construct, arginfo_rec_regex_it___construct, ZEND_ACC_PUBLIC)
|
||||
SPL_ME(RecursiveRegexIterator, accept, arginfo_recursive_it_void, ZEND_ACC_PUBLIC)
|
||||
SPL_ME(RecursiveFilterIterator, hasChildren, arginfo_recursive_it_void, ZEND_ACC_PUBLIC)
|
||||
SPL_ME(RecursiveRegexIterator, getChildren, arginfo_recursive_it_void, ZEND_ACC_PUBLIC)
|
||||
PHP_FE_END
|
||||
|
||||
@@ -0,0 +1,91 @@
|
||||
--TEST--
|
||||
Bug #68128 - RecursiveRegexIterator raises "Array to string conversion" notice
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
$array = new ArrayIterator(array('a', array('b', 'c')));
|
||||
$regex = new RegexIterator($array, '/Array/');
|
||||
|
||||
foreach ($regex as $match) {
|
||||
var_dump($match);
|
||||
}
|
||||
|
||||
$rArrayIterator = new RecursiveArrayIterator(array('test1', array('tet3', 'test4', 'test5')));
|
||||
$rRegexIterator = new RecursiveRegexIterator($rArrayIterator, '/^(t)est(\d*)/',
|
||||
RecursiveRegexIterator::ALL_MATCHES, 0, PREG_PATTERN_ORDER);
|
||||
|
||||
foreach ($rRegexIterator as $key1 => $value1) {
|
||||
|
||||
if ($rRegexIterator->hasChildren()) {
|
||||
|
||||
// print all children
|
||||
echo "Children: ";
|
||||
foreach ($rRegexIterator->getChildren() as $key => $value) {
|
||||
print_r($value);
|
||||
}
|
||||
echo "\n";
|
||||
} else {
|
||||
echo "No children ";
|
||||
print_r($value1);
|
||||
echo "\n";
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
||||
--EXPECT--
|
||||
No children Array
|
||||
(
|
||||
[0] => Array
|
||||
(
|
||||
[0] => test1
|
||||
)
|
||||
|
||||
[1] => Array
|
||||
(
|
||||
[0] => t
|
||||
)
|
||||
|
||||
[2] => Array
|
||||
(
|
||||
[0] => 1
|
||||
)
|
||||
|
||||
)
|
||||
|
||||
Children: Array
|
||||
(
|
||||
[0] => Array
|
||||
(
|
||||
[0] => test4
|
||||
)
|
||||
|
||||
[1] => Array
|
||||
(
|
||||
[0] => t
|
||||
)
|
||||
|
||||
[2] => Array
|
||||
(
|
||||
[0] => 4
|
||||
)
|
||||
|
||||
)
|
||||
Array
|
||||
(
|
||||
[0] => Array
|
||||
(
|
||||
[0] => test5
|
||||
)
|
||||
|
||||
[1] => Array
|
||||
(
|
||||
[0] => t
|
||||
)
|
||||
|
||||
[2] => Array
|
||||
(
|
||||
[0] => 5
|
||||
)
|
||||
|
||||
)
|
||||
|
||||
@@ -13,11 +13,6 @@ class MyRecursiveRegexIterator extends RecursiveRegexIterator
|
||||
var_dump($v);
|
||||
}
|
||||
}
|
||||
|
||||
function accept()
|
||||
{
|
||||
return $this->hasChildren() || parent::accept();
|
||||
}
|
||||
}
|
||||
|
||||
$ar = new RecursiveArrayIterator(array('Foo', array('Bar'), 'FooBar', array('Baz'), 'Biz'));
|
||||
|
||||
@@ -46,8 +46,6 @@ array(3) {
|
||||
[2]=>
|
||||
%s(1) "2"
|
||||
}
|
||||
|
||||
Notice: Array to string conversion in %siterator_050.php on line %d
|
||||
int(0)
|
||||
array(2) {
|
||||
[0]=>
|
||||
@@ -69,8 +67,6 @@ array(2) {
|
||||
[1]=>
|
||||
%s(1) "1"
|
||||
}
|
||||
|
||||
Notice: Array to string conversion in %siterator_050.php on line %d
|
||||
object(ArrayIterator)#%d (1) {
|
||||
%s"storage"%s"ArrayIterator":private]=>
|
||||
array(9) {
|
||||
|
||||
@@ -46,18 +46,6 @@ var_dump($ar);
|
||||
<?php exit(0); ?>
|
||||
--EXPECTF--
|
||||
bool(true)
|
||||
int(0)
|
||||
array(3) {
|
||||
[0]=>
|
||||
array(0) {
|
||||
}
|
||||
[1]=>
|
||||
array(0) {
|
||||
}
|
||||
[2]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
bool(true)
|
||||
int(1)
|
||||
array(3) {
|
||||
@@ -97,85 +85,11 @@ array(3) {
|
||||
}
|
||||
}
|
||||
bool(true)
|
||||
int(3)
|
||||
array(3) {
|
||||
[0]=>
|
||||
array(0) {
|
||||
}
|
||||
[1]=>
|
||||
array(0) {
|
||||
}
|
||||
[2]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
bool(true)
|
||||
int(4)
|
||||
array(3) {
|
||||
[0]=>
|
||||
array(0) {
|
||||
}
|
||||
[1]=>
|
||||
array(0) {
|
||||
}
|
||||
[2]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
|
||||
Notice: Array to string conversion in %siterator_052.php on line %d
|
||||
bool(false)
|
||||
bool(true)
|
||||
int(5)
|
||||
array(3) {
|
||||
[0]=>
|
||||
array(0) {
|
||||
}
|
||||
[1]=>
|
||||
array(0) {
|
||||
}
|
||||
[2]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
bool(true)
|
||||
int(6)
|
||||
array(3) {
|
||||
[0]=>
|
||||
array(0) {
|
||||
}
|
||||
[1]=>
|
||||
array(0) {
|
||||
}
|
||||
[2]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
bool(true)
|
||||
int(7)
|
||||
array(3) {
|
||||
[0]=>
|
||||
array(0) {
|
||||
}
|
||||
[1]=>
|
||||
array(0) {
|
||||
}
|
||||
[2]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
bool(true)
|
||||
int(8)
|
||||
array(3) {
|
||||
[0]=>
|
||||
array(0) {
|
||||
}
|
||||
[1]=>
|
||||
array(0) {
|
||||
}
|
||||
[2]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
bool(true)
|
||||
int(0)
|
||||
array(2) {
|
||||
@@ -231,67 +145,11 @@ array(2) {
|
||||
}
|
||||
}
|
||||
bool(true)
|
||||
int(3)
|
||||
array(2) {
|
||||
[0]=>
|
||||
array(0) {
|
||||
}
|
||||
[1]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
bool(true)
|
||||
int(4)
|
||||
array(2) {
|
||||
[0]=>
|
||||
array(0) {
|
||||
}
|
||||
[1]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
|
||||
Notice: Array to string conversion in %siterator_052.php on line %d
|
||||
bool(false)
|
||||
bool(true)
|
||||
int(5)
|
||||
array(2) {
|
||||
[0]=>
|
||||
array(0) {
|
||||
}
|
||||
[1]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
bool(true)
|
||||
int(6)
|
||||
array(2) {
|
||||
[0]=>
|
||||
array(0) {
|
||||
}
|
||||
[1]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
bool(true)
|
||||
int(7)
|
||||
array(2) {
|
||||
[0]=>
|
||||
array(0) {
|
||||
}
|
||||
[1]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
bool(true)
|
||||
int(8)
|
||||
array(2) {
|
||||
[0]=>
|
||||
array(0) {
|
||||
}
|
||||
[1]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
object(ArrayIterator)#%d (1) {
|
||||
["storage":"ArrayIterator":private]=>
|
||||
array(9) {
|
||||
|
||||
@@ -46,122 +46,14 @@ var_dump($ar);
|
||||
<?php exit(0); ?>
|
||||
--EXPECTF--
|
||||
bool(true)
|
||||
int(0)
|
||||
array(3) {
|
||||
[0]=>
|
||||
array(0) {
|
||||
}
|
||||
[1]=>
|
||||
array(0) {
|
||||
}
|
||||
[2]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
bool(true)
|
||||
int(1)
|
||||
array(3) {
|
||||
[0]=>
|
||||
array(0) {
|
||||
}
|
||||
[1]=>
|
||||
array(0) {
|
||||
}
|
||||
[2]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
bool(true)
|
||||
int(2)
|
||||
array(3) {
|
||||
[0]=>
|
||||
array(0) {
|
||||
}
|
||||
[1]=>
|
||||
array(0) {
|
||||
}
|
||||
[2]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
bool(true)
|
||||
int(3)
|
||||
array(3) {
|
||||
[0]=>
|
||||
array(0) {
|
||||
}
|
||||
[1]=>
|
||||
array(0) {
|
||||
}
|
||||
[2]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
bool(true)
|
||||
int(4)
|
||||
array(3) {
|
||||
[0]=>
|
||||
array(0) {
|
||||
}
|
||||
[1]=>
|
||||
array(0) {
|
||||
}
|
||||
[2]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
bool(false)
|
||||
bool(true)
|
||||
int(5)
|
||||
array(3) {
|
||||
[0]=>
|
||||
array(0) {
|
||||
}
|
||||
[1]=>
|
||||
array(0) {
|
||||
}
|
||||
[2]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
bool(true)
|
||||
int(6)
|
||||
array(3) {
|
||||
[0]=>
|
||||
array(0) {
|
||||
}
|
||||
[1]=>
|
||||
array(0) {
|
||||
}
|
||||
[2]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
bool(true)
|
||||
int(7)
|
||||
array(3) {
|
||||
[0]=>
|
||||
array(0) {
|
||||
}
|
||||
[1]=>
|
||||
array(0) {
|
||||
}
|
||||
[2]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
bool(true)
|
||||
int(8)
|
||||
array(3) {
|
||||
[0]=>
|
||||
array(0) {
|
||||
}
|
||||
[1]=>
|
||||
array(0) {
|
||||
}
|
||||
[2]=>
|
||||
array(0) {
|
||||
}
|
||||
}
|
||||
bool(true)
|
||||
int(0)
|
||||
array(2) {
|
||||
@@ -232,20 +124,7 @@ array(2) {
|
||||
string(1) "4"
|
||||
}
|
||||
}
|
||||
bool(true)
|
||||
int(5)
|
||||
array(2) {
|
||||
[0]=>
|
||||
array(1) {
|
||||
[0]=>
|
||||
string(1) "5"
|
||||
}
|
||||
[1]=>
|
||||
array(1) {
|
||||
[0]=>
|
||||
string(1) "5"
|
||||
}
|
||||
}
|
||||
bool(false)
|
||||
bool(true)
|
||||
int(6)
|
||||
array(2) {
|
||||
|
||||
@@ -42,8 +42,6 @@ array(3) {
|
||||
[2]=>
|
||||
string(1) "3"
|
||||
}
|
||||
|
||||
Notice: Array to string conversion in %siterator_054.php on line %d
|
||||
int(7)
|
||||
array(2) {
|
||||
[0]=>
|
||||
|
||||
@@ -75,6 +75,7 @@ $sample_urls = array (
|
||||
);
|
||||
|
||||
foreach ($sample_urls as $url) {
|
||||
echo "\n--> $url: ";
|
||||
var_dump(@parse_url($url));
|
||||
}
|
||||
|
||||
@@ -84,21 +85,24 @@ $sample_urls = array (
|
||||
}
|
||||
?>
|
||||
--EXPECT--
|
||||
array(1) {
|
||||
--> : array(1) {
|
||||
["path"]=>
|
||||
string(0) ""
|
||||
}
|
||||
array(1) {
|
||||
|
||||
--> 64.246.30.37: array(1) {
|
||||
["path"]=>
|
||||
string(12) "64.246.30.37"
|
||||
}
|
||||
array(2) {
|
||||
|
||||
--> http://64.246.30.37: array(2) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
string(12) "64.246.30.37"
|
||||
}
|
||||
array(3) {
|
||||
|
||||
--> http://64.246.30.37/: array(3) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -106,11 +110,13 @@ array(3) {
|
||||
["path"]=>
|
||||
string(1) "/"
|
||||
}
|
||||
array(1) {
|
||||
|
||||
--> 64.246.30.37/: array(1) {
|
||||
["path"]=>
|
||||
string(13) "64.246.30.37/"
|
||||
}
|
||||
array(3) {
|
||||
|
||||
--> 64.246.30.37:80/: array(3) {
|
||||
["host"]=>
|
||||
string(12) "64.246.30.37"
|
||||
["port"]=>
|
||||
@@ -118,21 +124,25 @@ array(3) {
|
||||
["path"]=>
|
||||
string(1) "/"
|
||||
}
|
||||
array(1) {
|
||||
|
||||
--> php.net: array(1) {
|
||||
["path"]=>
|
||||
string(7) "php.net"
|
||||
}
|
||||
array(1) {
|
||||
|
||||
--> php.net/: array(1) {
|
||||
["path"]=>
|
||||
string(8) "php.net/"
|
||||
}
|
||||
array(2) {
|
||||
|
||||
--> http://php.net: array(2) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
string(7) "php.net"
|
||||
}
|
||||
array(3) {
|
||||
|
||||
--> http://php.net/: array(3) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -140,21 +150,25 @@ array(3) {
|
||||
["path"]=>
|
||||
string(1) "/"
|
||||
}
|
||||
array(1) {
|
||||
|
||||
--> www.php.net: array(1) {
|
||||
["path"]=>
|
||||
string(11) "www.php.net"
|
||||
}
|
||||
array(1) {
|
||||
|
||||
--> www.php.net/: array(1) {
|
||||
["path"]=>
|
||||
string(12) "www.php.net/"
|
||||
}
|
||||
array(2) {
|
||||
|
||||
--> http://www.php.net: array(2) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
string(11) "www.php.net"
|
||||
}
|
||||
array(3) {
|
||||
|
||||
--> http://www.php.net/: array(3) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -162,13 +176,15 @@ array(3) {
|
||||
["path"]=>
|
||||
string(1) "/"
|
||||
}
|
||||
array(2) {
|
||||
|
||||
--> www.php.net:80: array(2) {
|
||||
["host"]=>
|
||||
string(11) "www.php.net"
|
||||
["port"]=>
|
||||
int(80)
|
||||
}
|
||||
array(3) {
|
||||
|
||||
--> http://www.php.net:80: array(3) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -176,7 +192,8 @@ array(3) {
|
||||
["port"]=>
|
||||
int(80)
|
||||
}
|
||||
array(4) {
|
||||
|
||||
--> http://www.php.net:80/: array(4) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -186,7 +203,8 @@ array(4) {
|
||||
["path"]=>
|
||||
string(1) "/"
|
||||
}
|
||||
array(3) {
|
||||
|
||||
--> http://www.php.net/index.php: array(3) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -194,11 +212,13 @@ array(3) {
|
||||
["path"]=>
|
||||
string(10) "/index.php"
|
||||
}
|
||||
array(1) {
|
||||
|
||||
--> www.php.net/?: array(1) {
|
||||
["path"]=>
|
||||
string(12) "www.php.net/"
|
||||
}
|
||||
array(3) {
|
||||
|
||||
--> www.php.net:80/?: array(3) {
|
||||
["host"]=>
|
||||
string(11) "www.php.net"
|
||||
["port"]=>
|
||||
@@ -206,7 +226,8 @@ array(3) {
|
||||
["path"]=>
|
||||
string(1) "/"
|
||||
}
|
||||
array(3) {
|
||||
|
||||
--> http://www.php.net/?: array(3) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -214,7 +235,8 @@ array(3) {
|
||||
["path"]=>
|
||||
string(1) "/"
|
||||
}
|
||||
array(4) {
|
||||
|
||||
--> http://www.php.net:80/?: array(4) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -224,7 +246,8 @@ array(4) {
|
||||
["path"]=>
|
||||
string(1) "/"
|
||||
}
|
||||
array(4) {
|
||||
|
||||
--> http://www.php.net:80/index.php: array(4) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -234,7 +257,8 @@ array(4) {
|
||||
["path"]=>
|
||||
string(10) "/index.php"
|
||||
}
|
||||
array(4) {
|
||||
|
||||
--> http://www.php.net:80/foo/bar/index.php: array(4) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -244,7 +268,8 @@ array(4) {
|
||||
["path"]=>
|
||||
string(18) "/foo/bar/index.php"
|
||||
}
|
||||
array(4) {
|
||||
|
||||
--> http://www.php.net:80/this/is/a/very/deep/directory/structure/and/file.php: array(4) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -254,7 +279,8 @@ array(4) {
|
||||
["path"]=>
|
||||
string(53) "/this/is/a/very/deep/directory/structure/and/file.php"
|
||||
}
|
||||
array(5) {
|
||||
|
||||
--> http://www.php.net:80/this/is/a/very/deep/directory/structure/and/file.php?lots=1&of=2¶meters=3&too=4&here=5: array(5) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -266,7 +292,8 @@ array(5) {
|
||||
["query"]=>
|
||||
string(37) "lots=1&of=2¶meters=3&too=4&here=5"
|
||||
}
|
||||
array(4) {
|
||||
|
||||
--> http://www.php.net:80/this/is/a/very/deep/directory/structure/and/: array(4) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -276,7 +303,8 @@ array(4) {
|
||||
["path"]=>
|
||||
string(45) "/this/is/a/very/deep/directory/structure/and/"
|
||||
}
|
||||
array(4) {
|
||||
|
||||
--> http://www.php.net:80/this/is/a/very/deep/directory/structure/and/file.php: array(4) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -286,7 +314,8 @@ array(4) {
|
||||
["path"]=>
|
||||
string(53) "/this/is/a/very/deep/directory/structure/and/file.php"
|
||||
}
|
||||
array(4) {
|
||||
|
||||
--> http://www.php.net:80/this/../a/../deep/directory: array(4) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -296,7 +325,8 @@ array(4) {
|
||||
["path"]=>
|
||||
string(28) "/this/../a/../deep/directory"
|
||||
}
|
||||
array(4) {
|
||||
|
||||
--> http://www.php.net:80/this/../a/../deep/directory/: array(4) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -306,7 +336,8 @@ array(4) {
|
||||
["path"]=>
|
||||
string(29) "/this/../a/../deep/directory/"
|
||||
}
|
||||
array(4) {
|
||||
|
||||
--> http://www.php.net:80/this/is/a/very/deep/directory/../file.php: array(4) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -316,7 +347,8 @@ array(4) {
|
||||
["path"]=>
|
||||
string(42) "/this/is/a/very/deep/directory/../file.php"
|
||||
}
|
||||
array(4) {
|
||||
|
||||
--> http://www.php.net:80/index.php: array(4) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -326,7 +358,8 @@ array(4) {
|
||||
["path"]=>
|
||||
string(10) "/index.php"
|
||||
}
|
||||
array(4) {
|
||||
|
||||
--> http://www.php.net:80/index.php?: array(4) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -336,7 +369,8 @@ array(4) {
|
||||
["path"]=>
|
||||
string(10) "/index.php"
|
||||
}
|
||||
array(5) {
|
||||
|
||||
--> http://www.php.net:80/#foo: array(5) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -348,7 +382,8 @@ array(5) {
|
||||
["fragment"]=>
|
||||
string(3) "foo"
|
||||
}
|
||||
array(4) {
|
||||
|
||||
--> http://www.php.net:80/?#: array(4) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -358,7 +393,8 @@ array(4) {
|
||||
["path"]=>
|
||||
string(1) "/"
|
||||
}
|
||||
array(5) {
|
||||
|
||||
--> http://www.php.net:80/?test=1: array(5) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -370,7 +406,8 @@ array(5) {
|
||||
["query"]=>
|
||||
string(6) "test=1"
|
||||
}
|
||||
array(4) {
|
||||
|
||||
--> http://www.php.net/?test=1&: array(4) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -380,7 +417,8 @@ array(4) {
|
||||
["query"]=>
|
||||
string(7) "test=1&"
|
||||
}
|
||||
array(5) {
|
||||
|
||||
--> http://www.php.net:80/?&: array(5) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -392,7 +430,8 @@ array(5) {
|
||||
["query"]=>
|
||||
string(1) "&"
|
||||
}
|
||||
array(5) {
|
||||
|
||||
--> http://www.php.net:80/index.php?test=1&: array(5) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -404,7 +443,8 @@ array(5) {
|
||||
["query"]=>
|
||||
string(7) "test=1&"
|
||||
}
|
||||
array(4) {
|
||||
|
||||
--> http://www.php.net/index.php?&: array(4) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -414,7 +454,8 @@ array(4) {
|
||||
["query"]=>
|
||||
string(1) "&"
|
||||
}
|
||||
array(5) {
|
||||
|
||||
--> http://www.php.net:80/index.php?foo&: array(5) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -426,7 +467,8 @@ array(5) {
|
||||
["query"]=>
|
||||
string(4) "foo&"
|
||||
}
|
||||
array(4) {
|
||||
|
||||
--> http://www.php.net/index.php?&foo: array(4) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -436,7 +478,8 @@ array(4) {
|
||||
["query"]=>
|
||||
string(4) "&foo"
|
||||
}
|
||||
array(5) {
|
||||
|
||||
--> http://www.php.net:80/index.php?test=1&test2=char&test3=mixesCI: array(5) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -448,7 +491,8 @@ array(5) {
|
||||
["query"]=>
|
||||
string(31) "test=1&test2=char&test3=mixesCI"
|
||||
}
|
||||
array(5) {
|
||||
|
||||
--> www.php.net:80/index.php?test=1&test2=char&test3=mixesCI#some_page_ref123: array(5) {
|
||||
["host"]=>
|
||||
string(11) "www.php.net"
|
||||
["port"]=>
|
||||
@@ -460,7 +504,8 @@ array(5) {
|
||||
["fragment"]=>
|
||||
string(16) "some_page_ref123"
|
||||
}
|
||||
array(7) {
|
||||
|
||||
--> http://secret@www.php.net:80/index.php?test=1&test2=char&test3=mixesCI#some_page_ref123: array(7) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -476,13 +521,16 @@ array(7) {
|
||||
["fragment"]=>
|
||||
string(16) "some_page_ref123"
|
||||
}
|
||||
array(6) {
|
||||
|
||||
--> http://secret:@www.php.net/index.php?test=1&test2=char&test3=mixesCI#some_page_ref123: array(7) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
string(11) "www.php.net"
|
||||
["user"]=>
|
||||
string(6) "secret"
|
||||
["pass"]=>
|
||||
string(0) ""
|
||||
["path"]=>
|
||||
string(10) "/index.php"
|
||||
["query"]=>
|
||||
@@ -490,13 +538,16 @@ array(6) {
|
||||
["fragment"]=>
|
||||
string(16) "some_page_ref123"
|
||||
}
|
||||
array(7) {
|
||||
|
||||
--> http://:hideout@www.php.net:80/index.php?test=1&test2=char&test3=mixesCI#some_page_ref123: array(8) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
string(11) "www.php.net"
|
||||
["port"]=>
|
||||
int(80)
|
||||
["user"]=>
|
||||
string(0) ""
|
||||
["pass"]=>
|
||||
string(7) "hideout"
|
||||
["path"]=>
|
||||
@@ -506,7 +557,8 @@ array(7) {
|
||||
["fragment"]=>
|
||||
string(16) "some_page_ref123"
|
||||
}
|
||||
array(7) {
|
||||
|
||||
--> http://secret:hideout@www.php.net/index.php?test=1&test2=char&test3=mixesCI#some_page_ref123: array(7) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -522,7 +574,8 @@ array(7) {
|
||||
["fragment"]=>
|
||||
string(16) "some_page_ref123"
|
||||
}
|
||||
array(7) {
|
||||
|
||||
--> http://secret@hideout@www.php.net:80/index.php?test=1&test2=char&test3=mixesCI#some_page_ref123: array(7) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -538,7 +591,8 @@ array(7) {
|
||||
["fragment"]=>
|
||||
string(16) "some_page_ref123"
|
||||
}
|
||||
array(8) {
|
||||
|
||||
--> http://secret:hid:out@www.php.net:80/index.php?test=1&test2=char&test3=mixesCI#some_page_ref123: array(8) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -556,13 +610,15 @@ array(8) {
|
||||
["fragment"]=>
|
||||
string(16) "some_page_ref123"
|
||||
}
|
||||
array(2) {
|
||||
|
||||
--> nntp://news.php.net: array(2) {
|
||||
["scheme"]=>
|
||||
string(4) "nntp"
|
||||
["host"]=>
|
||||
string(12) "news.php.net"
|
||||
}
|
||||
array(3) {
|
||||
|
||||
--> ftp://ftp.gnu.org/gnu/glic/glibc.tar.gz: array(3) {
|
||||
["scheme"]=>
|
||||
string(3) "ftp"
|
||||
["host"]=>
|
||||
@@ -570,25 +626,29 @@ array(3) {
|
||||
["path"]=>
|
||||
string(22) "/gnu/glic/glibc.tar.gz"
|
||||
}
|
||||
array(2) {
|
||||
|
||||
--> zlib:http://foo@bar: array(2) {
|
||||
["scheme"]=>
|
||||
string(4) "zlib"
|
||||
["path"]=>
|
||||
string(14) "http://foo@bar"
|
||||
}
|
||||
array(2) {
|
||||
|
||||
--> zlib:filename.txt: array(2) {
|
||||
["scheme"]=>
|
||||
string(4) "zlib"
|
||||
["path"]=>
|
||||
string(12) "filename.txt"
|
||||
}
|
||||
array(2) {
|
||||
|
||||
--> zlib:/path/to/my/file/file.txt: array(2) {
|
||||
["scheme"]=>
|
||||
string(4) "zlib"
|
||||
["path"]=>
|
||||
string(25) "/path/to/my/file/file.txt"
|
||||
}
|
||||
array(3) {
|
||||
|
||||
--> foo://foo@bar: array(3) {
|
||||
["scheme"]=>
|
||||
string(3) "foo"
|
||||
["host"]=>
|
||||
@@ -596,25 +656,29 @@ array(3) {
|
||||
["user"]=>
|
||||
string(3) "foo"
|
||||
}
|
||||
array(2) {
|
||||
|
||||
--> mailto:me@mydomain.com: array(2) {
|
||||
["scheme"]=>
|
||||
string(6) "mailto"
|
||||
["path"]=>
|
||||
string(15) "me@mydomain.com"
|
||||
}
|
||||
array(2) {
|
||||
|
||||
--> /foo.php?a=b&c=d: array(2) {
|
||||
["path"]=>
|
||||
string(8) "/foo.php"
|
||||
["query"]=>
|
||||
string(7) "a=b&c=d"
|
||||
}
|
||||
array(2) {
|
||||
|
||||
--> foo.php?a=b&c=d: array(2) {
|
||||
["path"]=>
|
||||
string(7) "foo.php"
|
||||
["query"]=>
|
||||
string(7) "a=b&c=d"
|
||||
}
|
||||
array(6) {
|
||||
|
||||
--> http://user:passwd@www.example.com:8080?bar=1&boom=0: array(6) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -628,13 +692,15 @@ array(6) {
|
||||
["query"]=>
|
||||
string(12) "bar=1&boom=0"
|
||||
}
|
||||
array(2) {
|
||||
|
||||
--> file:///path/to/file: array(2) {
|
||||
["scheme"]=>
|
||||
string(4) "file"
|
||||
["path"]=>
|
||||
string(13) "/path/to/file"
|
||||
}
|
||||
array(3) {
|
||||
|
||||
--> file://path/to/file: array(3) {
|
||||
["scheme"]=>
|
||||
string(4) "file"
|
||||
["host"]=>
|
||||
@@ -642,13 +708,15 @@ array(3) {
|
||||
["path"]=>
|
||||
string(8) "/to/file"
|
||||
}
|
||||
array(2) {
|
||||
|
||||
--> file:/path/to/file: array(2) {
|
||||
["scheme"]=>
|
||||
string(4) "file"
|
||||
["path"]=>
|
||||
string(13) "/path/to/file"
|
||||
}
|
||||
array(4) {
|
||||
|
||||
--> http://1.2.3.4:/abc.asp?a=1&b=2: array(4) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -658,7 +726,8 @@ array(4) {
|
||||
["query"]=>
|
||||
string(7) "a=1&b=2"
|
||||
}
|
||||
array(3) {
|
||||
|
||||
--> http://foo.com#bar: array(3) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -666,11 +735,13 @@ array(3) {
|
||||
["fragment"]=>
|
||||
string(3) "bar"
|
||||
}
|
||||
array(1) {
|
||||
|
||||
--> scheme:: array(1) {
|
||||
["scheme"]=>
|
||||
string(6) "scheme"
|
||||
}
|
||||
array(4) {
|
||||
|
||||
--> foo+bar://baz@bang/bla: array(4) {
|
||||
["scheme"]=>
|
||||
string(7) "foo+bar"
|
||||
["host"]=>
|
||||
@@ -680,13 +751,15 @@ array(4) {
|
||||
["path"]=>
|
||||
string(4) "/bla"
|
||||
}
|
||||
array(2) {
|
||||
|
||||
--> gg:9130731: array(2) {
|
||||
["scheme"]=>
|
||||
string(2) "gg"
|
||||
["path"]=>
|
||||
string(7) "9130731"
|
||||
}
|
||||
array(7) {
|
||||
|
||||
--> http://user:@pass@host/path?argument?value#etc: array(7) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
@@ -710,3 +783,4 @@ string(7) "hideout"
|
||||
string(10) "/index.php"
|
||||
string(31) "test=1&test2=char&test3=mixesCI"
|
||||
string(16) "some_page_ref123"
|
||||
|
||||
@@ -454,13 +454,15 @@ echo "Done";
|
||||
string(16) "some_page_ref123"
|
||||
}
|
||||
|
||||
--> http://secret:@www.php.net/index.php?test=1&test2=char&test3=mixesCI#some_page_ref123: array(6) {
|
||||
--> http://secret:@www.php.net/index.php?test=1&test2=char&test3=mixesCI#some_page_ref123: array(7) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
string(11) "www.php.net"
|
||||
["user"]=>
|
||||
string(6) "secret"
|
||||
["pass"]=>
|
||||
string(0) ""
|
||||
["path"]=>
|
||||
string(10) "/index.php"
|
||||
["query"]=>
|
||||
@@ -469,13 +471,15 @@ echo "Done";
|
||||
string(16) "some_page_ref123"
|
||||
}
|
||||
|
||||
--> http://:hideout@www.php.net:80/index.php?test=1&test2=char&test3=mixesCI#some_page_ref123: array(7) {
|
||||
--> http://:hideout@www.php.net:80/index.php?test=1&test2=char&test3=mixesCI#some_page_ref123: array(8) {
|
||||
["scheme"]=>
|
||||
string(4) "http"
|
||||
["host"]=>
|
||||
string(11) "www.php.net"
|
||||
["port"]=>
|
||||
int(80)
|
||||
["user"]=>
|
||||
string(0) ""
|
||||
["pass"]=>
|
||||
string(7) "hideout"
|
||||
["path"]=>
|
||||
|
||||
@@ -66,7 +66,7 @@ echo "Done";
|
||||
--> www.php.net:80/index.php?test=1&test2=char&test3=mixesCI#some_page_ref123 : NULL
|
||||
--> http://secret@www.php.net:80/index.php?test=1&test2=char&test3=mixesCI#some_page_ref123 : string(6) "secret"
|
||||
--> http://secret:@www.php.net/index.php?test=1&test2=char&test3=mixesCI#some_page_ref123 : string(6) "secret"
|
||||
--> http://:hideout@www.php.net:80/index.php?test=1&test2=char&test3=mixesCI#some_page_ref123 : NULL
|
||||
--> http://:hideout@www.php.net:80/index.php?test=1&test2=char&test3=mixesCI#some_page_ref123 : string(0) ""
|
||||
--> http://secret:hideout@www.php.net/index.php?test=1&test2=char&test3=mixesCI#some_page_ref123 : string(6) "secret"
|
||||
--> http://secret@hideout@www.php.net:80/index.php?test=1&test2=char&test3=mixesCI#some_page_ref123 : string(14) "secret@hideout"
|
||||
--> http://secret:hid:out@www.php.net:80/index.php?test=1&test2=char&test3=mixesCI#some_page_ref123 : string(6) "secret"
|
||||
|
||||
@@ -65,7 +65,7 @@ echo "Done";
|
||||
--> http://www.php.net:80/index.php?test=1&test2=char&test3=mixesCI : NULL
|
||||
--> www.php.net:80/index.php?test=1&test2=char&test3=mixesCI#some_page_ref123 : NULL
|
||||
--> http://secret@www.php.net:80/index.php?test=1&test2=char&test3=mixesCI#some_page_ref123 : NULL
|
||||
--> http://secret:@www.php.net/index.php?test=1&test2=char&test3=mixesCI#some_page_ref123 : NULL
|
||||
--> http://secret:@www.php.net/index.php?test=1&test2=char&test3=mixesCI#some_page_ref123 : string(0) ""
|
||||
--> http://:hideout@www.php.net:80/index.php?test=1&test2=char&test3=mixesCI#some_page_ref123 : string(7) "hideout"
|
||||
--> http://secret:hideout@www.php.net/index.php?test=1&test2=char&test3=mixesCI#some_page_ref123 : string(7) "hideout"
|
||||
--> http://secret@hideout@www.php.net:80/index.php?test=1&test2=char&test3=mixesCI#some_page_ref123 : NULL
|
||||
|
||||
+4
-8
@@ -240,16 +240,12 @@ PHPAPI php_url *php_url_parse_ex(char const *str, int length)
|
||||
/* check for login and password */
|
||||
if ((p = zend_memrchr(s, '@', (e-s)))) {
|
||||
if ((pp = memchr(s, ':', (p-s)))) {
|
||||
if ((pp-s) > 0) {
|
||||
ret->user = estrndup(s, (pp-s));
|
||||
php_replace_controlchars_ex(ret->user, (pp - s));
|
||||
}
|
||||
ret->user = estrndup(s, (pp-s));
|
||||
php_replace_controlchars_ex(ret->user, (pp - s));
|
||||
|
||||
pp++;
|
||||
if (p-pp > 0) {
|
||||
ret->pass = estrndup(pp, (p-pp));
|
||||
php_replace_controlchars_ex(ret->pass, (p-pp));
|
||||
}
|
||||
ret->pass = estrndup(pp, (p-pp));
|
||||
php_replace_controlchars_ex(ret->pass, (p-pp));
|
||||
} else {
|
||||
ret->user = estrndup(s, (p-s));
|
||||
php_replace_controlchars_ex(ret->user, (p-s));
|
||||
|
||||
@@ -201,9 +201,13 @@ static int date_from_ISO8601 (const char *text, time_t * value) {
|
||||
}
|
||||
p++;
|
||||
}
|
||||
text = buf;
|
||||
*p2 = 0;
|
||||
text = buf;
|
||||
}
|
||||
|
||||
if (strlen(text)<17) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
tm.tm_isdst = -1;
|
||||
|
||||
|
||||
@@ -59,9 +59,17 @@ PHPAPI int php_getopt(int argc, char* const *argv, const opt_struct opts[], char
|
||||
{
|
||||
static int optchr = 0;
|
||||
static int dash = 0; /* have already seen the - */
|
||||
static char **prev_optarg = NULL;
|
||||
|
||||
php_optidx = -1;
|
||||
|
||||
if(prev_optarg && prev_optarg != optarg) {
|
||||
/* reset the state */
|
||||
optchr = 0;
|
||||
dash = 0;
|
||||
}
|
||||
prev_optarg = optarg;
|
||||
|
||||
if (*optind >= argc) {
|
||||
return(EOF);
|
||||
}
|
||||
|
||||
@@ -297,6 +297,9 @@ PHPAPI size_t _php_stream_write(php_stream *stream, const char *buf, size_t coun
|
||||
#define php_stream_write_string(stream, str) _php_stream_write(stream, str, strlen(str) TSRMLS_CC)
|
||||
#define php_stream_write(stream, buf, count) _php_stream_write(stream, (buf), (count) TSRMLS_CC)
|
||||
|
||||
PHPAPI void _php_stream_fill_read_buffer(php_stream *stream, size_t size TSRMLS_DC);
|
||||
#define php_stream_fill_read_buffer(stream, size) _php_stream_fill_read_buffer((stream), (size) TSRMLS_CC)
|
||||
|
||||
#ifdef ZTS
|
||||
PHPAPI size_t _php_stream_printf(php_stream *stream TSRMLS_DC, const char *fmt, ...) PHP_ATTRIBUTE_FORMAT(printf, 3, 4);
|
||||
#else
|
||||
|
||||
+3
-3
@@ -2,7 +2,7 @@
|
||||
/* edit configure.in to change version number */
|
||||
#define PHP_MAJOR_VERSION 5
|
||||
#define PHP_MINOR_VERSION 5
|
||||
#define PHP_RELEASE_VERSION 18
|
||||
#define PHP_RELEASE_VERSION 19
|
||||
#define PHP_EXTRA_VERSION ""
|
||||
#define PHP_VERSION "5.5.18"
|
||||
#define PHP_VERSION_ID 50518
|
||||
#define PHP_VERSION "5.5.19"
|
||||
#define PHP_VERSION_ID 50519
|
||||
@@ -568,7 +568,7 @@ fprintf(stderr, "stream_free: %s:%p[%s] preserve_handle=%d release_cast=%d remov
|
||||
|
||||
/* {{{ generic stream operations */
|
||||
|
||||
static void php_stream_fill_read_buffer(php_stream *stream, size_t size TSRMLS_DC)
|
||||
PHPAPI void _php_stream_fill_read_buffer(php_stream *stream, size_t size TSRMLS_DC)
|
||||
{
|
||||
/* allocate/fill the buffer */
|
||||
|
||||
@@ -736,7 +736,7 @@ PHPAPI size_t _php_stream_read(php_stream *stream, char *buf, size_t size TSRMLS
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
php_stream_fill_read_buffer(stream, size TSRMLS_CC);
|
||||
php_stream_fill_read_buffer(stream, size);
|
||||
|
||||
toread = stream->writepos - stream->readpos;
|
||||
if (toread > size) {
|
||||
@@ -972,7 +972,7 @@ PHPAPI char *_php_stream_get_line(php_stream *stream, char *buf, size_t maxlen,
|
||||
}
|
||||
}
|
||||
|
||||
php_stream_fill_read_buffer(stream, toread TSRMLS_CC);
|
||||
php_stream_fill_read_buffer(stream, toread);
|
||||
|
||||
if (stream->writepos - stream->readpos == 0) {
|
||||
break;
|
||||
@@ -1047,7 +1047,7 @@ PHPAPI char *php_stream_get_record(php_stream *stream, size_t maxlen, size_t *re
|
||||
|
||||
to_read_now = MIN(maxlen - buffered_len, stream->chunk_size);
|
||||
|
||||
php_stream_fill_read_buffer(stream, buffered_len + to_read_now TSRMLS_CC);
|
||||
php_stream_fill_read_buffer(stream, buffered_len + to_read_now);
|
||||
|
||||
just_read = STREAM_BUFFERED_AMOUNT(stream) - buffered_len;
|
||||
|
||||
|
||||
+43
-42
@@ -39,29 +39,6 @@ struct listening_socket_s {
|
||||
|
||||
static struct fpm_array_s sockets_list;
|
||||
|
||||
static int fpm_sockets_resolve_af_inet(char *node, char *service, struct sockaddr_in *addr) /* {{{ */
|
||||
{
|
||||
struct addrinfo *res;
|
||||
struct addrinfo hints;
|
||||
int ret;
|
||||
|
||||
memset(&hints, 0, sizeof(hints));
|
||||
hints.ai_family = AF_INET;
|
||||
ret = getaddrinfo(node, service, &hints, &res);
|
||||
|
||||
if (ret != 0) {
|
||||
zlog(ZLOG_ERROR, "can't resolve hostname '%s%s%s': getaddrinfo said: %s%s%s\n",
|
||||
node, service ? ":" : "", service ? service : "",
|
||||
gai_strerror(ret), ret == EAI_SYSTEM ? ", system error: " : "", ret == EAI_SYSTEM ? strerror(errno) : "");
|
||||
return -1;
|
||||
}
|
||||
|
||||
*addr = *(struct sockaddr_in *) res->ai_addr;
|
||||
freeaddrinfo(res);
|
||||
return 0;
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
enum { FPM_GET_USE_SOCKET = 1, FPM_STORE_SOCKET = 2, FPM_STORE_USE_SOCKET = 3 };
|
||||
|
||||
static void fpm_sockets_cleanup(int which, void *arg) /* {{{ */
|
||||
@@ -98,14 +75,23 @@ static void fpm_sockets_cleanup(int which, void *arg) /* {{{ */
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
static void *fpm_get_in_addr(struct sockaddr *sa) /* {{{ */
|
||||
{
|
||||
if (sa->sa_family == AF_INET) {
|
||||
return &(((struct sockaddr_in*)sa)->sin_addr);
|
||||
}
|
||||
|
||||
return &(((struct sockaddr_in6*)sa)->sin6_addr);
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
static int fpm_sockets_hash_op(int sock, struct sockaddr *sa, char *key, int type, int op) /* {{{ */
|
||||
{
|
||||
if (key == NULL) {
|
||||
switch (type) {
|
||||
case FPM_AF_INET : {
|
||||
struct sockaddr_in *sa_in = (struct sockaddr_in *) sa;
|
||||
key = alloca(sizeof("xxx.xxx.xxx.xxx:ppppp"));
|
||||
sprintf(key, "%u.%u.%u.%u:%u", IPQUAD(&sa_in->sin_addr), (unsigned int) ntohs(sa_in->sin_port));
|
||||
key = alloca(INET6_ADDRSTRLEN);
|
||||
inet_ntop(sa->sa_family, fpm_get_in_addr(sa), key, sizeof key);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -254,11 +240,14 @@ enum fpm_address_domain fpm_sockets_domain_from_address(char *address) /* {{{ */
|
||||
|
||||
static int fpm_socket_af_inet_listening_socket(struct fpm_worker_pool_s *wp) /* {{{ */
|
||||
{
|
||||
struct sockaddr_in sa_in;
|
||||
struct addrinfo hints, *servinfo, *p;
|
||||
char *dup_address = strdup(wp->config->listen_address);
|
||||
char *port_str = strchr(dup_address, ':');
|
||||
char *port_str = strrchr(dup_address, ':');
|
||||
char *addr = NULL;
|
||||
int addr_len;
|
||||
int port = 0;
|
||||
int sock;
|
||||
int status;
|
||||
|
||||
if (port_str) { /* this is host:port pair */
|
||||
*port_str++ = '\0';
|
||||
@@ -274,23 +263,35 @@ static int fpm_socket_af_inet_listening_socket(struct fpm_worker_pool_s *wp) /*
|
||||
return -1;
|
||||
}
|
||||
|
||||
memset(&sa_in, 0, sizeof(sa_in));
|
||||
|
||||
if (addr) {
|
||||
sa_in.sin_addr.s_addr = inet_addr(addr);
|
||||
if (sa_in.sin_addr.s_addr == INADDR_NONE) { /* do resolve */
|
||||
if (0 > fpm_sockets_resolve_af_inet(addr, NULL, &sa_in)) {
|
||||
return -1;
|
||||
}
|
||||
zlog(ZLOG_NOTICE, "address '%s' resolved as %u.%u.%u.%u", addr, IPQUAD(&sa_in.sin_addr));
|
||||
// strip brackets from address for getaddrinfo
|
||||
if (addr != NULL) {
|
||||
addr_len = strlen(addr);
|
||||
if (addr[0] == '[' && addr[addr_len - 1] == ']') {
|
||||
addr[addr_len - 1] = '\0';
|
||||
addr++;
|
||||
}
|
||||
} else {
|
||||
sa_in.sin_addr.s_addr = htonl(INADDR_ANY);
|
||||
}
|
||||
sa_in.sin_family = AF_INET;
|
||||
sa_in.sin_port = htons(port);
|
||||
|
||||
memset(&hints, 0, sizeof hints);
|
||||
hints.ai_family = AF_UNSPEC;
|
||||
hints.ai_socktype = SOCK_STREAM;
|
||||
|
||||
if ((status = getaddrinfo(addr, port_str, &hints, &servinfo)) != 0) {
|
||||
zlog(ZLOG_ERROR, "getaddrinfo: %s\n", gai_strerror(status));
|
||||
return -1;
|
||||
}
|
||||
|
||||
free(dup_address);
|
||||
return fpm_sockets_get_listening_socket(wp, (struct sockaddr *) &sa_in, sizeof(struct sockaddr_in));
|
||||
|
||||
for (p = servinfo; p != NULL; p = p->ai_next) {
|
||||
if ((sock = fpm_sockets_get_listening_socket(wp, p->ai_addr, p->ai_addrlen)) != -1) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
freeaddrinfo(servinfo);
|
||||
|
||||
return sock;
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
|
||||
@@ -45,10 +45,4 @@ static inline int fd_set_blocked(int fd, int blocked) /* {{{ */
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
#define IPQUAD(sin_addr) \
|
||||
(unsigned int) ((unsigned char *) &(sin_addr)->s_addr)[0], \
|
||||
(unsigned int) ((unsigned char *) &(sin_addr)->s_addr)[1], \
|
||||
(unsigned int) ((unsigned char *) &(sin_addr)->s_addr)[2], \
|
||||
(unsigned int) ((unsigned char *) &(sin_addr)->s_addr)[3]
|
||||
|
||||
#endif
|
||||
@@ -152,6 +152,8 @@ group = @php_fpm_group@
|
||||
; Valid syntaxes are:
|
||||
; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific address on
|
||||
; a specific port;
|
||||
; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
|
||||
; a specific port;
|
||||
; 'port' - to listen on a TCP socket to all addresses on a
|
||||
; specific port;
|
||||
; '/path/to/unix/socket' - to listen on a unix socket.
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
--TEST--
|
||||
FPM: Test IPv6 support
|
||||
--SKIPIF--
|
||||
<?php include "skipif.inc"; ?>
|
||||
--FILE--
|
||||
<?php
|
||||
|
||||
include "include.inc";
|
||||
|
||||
$logfile = dirname(__FILE__).'/php-fpm.log.tmp';
|
||||
|
||||
$cfg = <<<EOT
|
||||
[global]
|
||||
error_log = $logfile
|
||||
[unconfined]
|
||||
listen = [::1]:9000
|
||||
pm = dynamic
|
||||
pm.max_children = 5
|
||||
pm.start_servers = 2
|
||||
pm.min_spare_servers = 1
|
||||
pm.max_spare_servers = 3
|
||||
EOT;
|
||||
|
||||
$fpm = run_fpm($cfg, $tail);
|
||||
if (is_resource($fpm)) {
|
||||
var_dump(fgets($tail));
|
||||
var_dump(fgets($tail));
|
||||
$i = 0;
|
||||
while (($i++ < 30) && !($fp = fsockopen('[::1]', 9000))) {
|
||||
usleep(10000);
|
||||
}
|
||||
if ($fp) {
|
||||
echo "Done\n";
|
||||
fclose($fp);
|
||||
}
|
||||
proc_terminate($fpm);
|
||||
stream_get_contents($tail);
|
||||
fclose($tail);
|
||||
proc_close($fpm);
|
||||
}
|
||||
|
||||
?>
|
||||
--EXPECTF--
|
||||
string(%d) "[%d-%s-%d %d:%d:%d] NOTICE: fpm is running, pid %d
|
||||
"
|
||||
string(%d) "[%d-%s-%d %d:%d:%d] NOTICE: ready to handle connections
|
||||
"
|
||||
Done
|
||||
--CLEAN--
|
||||
<?php
|
||||
$logfile = dirname(__FILE__).'/php-fpm.log.tmp';
|
||||
@unlink($logfile);
|
||||
?>
|
||||
@@ -69,7 +69,7 @@
|
||||
|
||||
#define SAPI_LSAPI_MAX_HEADER_LENGTH 2048
|
||||
|
||||
static int lsapi_mode = 1;
|
||||
static int lsapi_mode = 0;
|
||||
static char *php_self = "";
|
||||
static char *script_filename = "";
|
||||
static int source_highlight = 0;
|
||||
@@ -1053,6 +1053,7 @@ int main( int argc, char * argv[] )
|
||||
LSAPI_Init();
|
||||
|
||||
LSAPI_Init_Env_Parameters( NULL );
|
||||
lsapi_mode = 1;
|
||||
|
||||
slow_script_msec = LSAPI_Get_Slow_Req_Msecs();
|
||||
|
||||
|
||||
Reference in new issue
Block a user