Open Build Service

php8.changes Changed

@@ -1,4 +1,159 @@
 -------------------------------------------------------------------
+Mon Aug 7 10:04:45 UTC 2023 - Angelo Grossini <rottame@intercom.it>
+
+- merge conflicts
+- build imap only in main flavor
+
+-------------------------------------------------------------------
+Mon Jul 17 08:18:25 UTC 2023 - pgajdos@suse.com
+
+- version update to 8.1.21
+- modified patches
+ % php-sort-filelist-phar.patch (refreshed)
+
+-------------------------------------------------------------------
+Tue May 30 16:59:37 UTC 2023 - pgajdos@suse.com
+
+- version update to 8.1.20
+ * This is a security release.
+ * https://www.php.net/ChangeLog-8.php#8.1.20
+- force to repack tarball after update
+ https://github.com/php/php-src/issues/11300
+- session.save_path set to /var/lib/php8/sessions in mod_php8.conf
+ and www.conf php-fpm pool example
+- modified sources
+ % mod_php8.conf
+- added sources
+ + repack.sh
+ + php-unicode-allow-redistribution.patch
+
+-------------------------------------------------------------------
+Thu May 25 06:56:48 UTC 2023 - pgajdos@suse.com
+
+- repack the tarball temporarily bsc#1211648
+
+-------------------------------------------------------------------
+Tue May 23 12:39:00 UTC 2023 - pgajdos@suse.com
+
+- also MIT license (systzdata patch, ext/date/lib/parse_posix.c)
+ https://build.suse.de/request/show/298230
+
+-------------------------------------------------------------------
+Fri May 12 10:28:10 UTC 2023 - pgajdos@suse.com
+
+- version update to 8.1.19
+ * This is a bug fix release.
+ * https://www.php.net/ChangeLog-8.php#8.1.19
+- modified patches
+ % php-ar-flags.patch (refreshed)
+ % php-build-reproducible-phar.patch (refreshed)
+ % php-ini.patch (refreshed)
+ % php-systzdata-v23.patch (refreshed)
+
+-------------------------------------------------------------------
+Wed May 10 06:40:59 UTC 2023 - pgajdos@suse.com
+
+- downgrade back to 8.1.18
+ https://lists.opensuse.org/archives/list/factory@lists.opensuse.org/thread/4ADCEV2FII7J5FZEWREFETTEVX7CDUSR/
+
+-------------------------------------------------------------------
+Thu May 4 08:16:37 UTC 2023 - pgajdos@suse.com
+
+- version update to 8.2.5
+ * Readonly classes
+ * Disjunctive Normal Form (DNF) Types
+ * Allow null, false, and true as stand-alone types
+ * New "Random" extension
+ * Constants in traits
+ * Deprecate dynamic properties
+ * for details, see
+ https://www.php.net/releases/8.2/en.php
+ https://www.php.net/manual/en/migration82.php
+- modified patches
+ % php-ar-flags.patch (refreshed)
+ % php-build-reproducible-phar.patch (refreshed)
+ % php-ini.patch (refreshed)
+- deleted patches
+ - php-crypt-tests.patch (not needed)
+- modified sources
+ % php8.keyring
+
+-------------------------------------------------------------------
+Thu Apr 20 21:19:59 UTC 2023 - Arjen de Korte <suse+build@de-korte.org>
+
+- The %_restart_on_update macro was removed from systemd-rpm-macros.
+ Remove %posttrans for FPM as it wasn't working as intended anyway.
+ boo#1210576
+
+-------------------------------------------------------------------
+Fri Apr 14 06:06:55 UTC 2023 - pgajdos@suse.com
+
+- version update to 8.1.18
+ * This is a bug fix release.
+ https://www.php.net/ChangeLog-8.php#8.1.18
+- modified patches
+ % php-ar-flags.patch (refreshed)
+ % php-build-reproducible-phar.patch (refreshed)
+ % php-ini.patch (refreshed)
+
+-------------------------------------------------------------------
+Thu Mar 16 12:45:14 UTC 2023 - pgajdos@suse.com
+
+- version update to 8.1.17
+ * This is a bug fix release.
+ https://www.php.net/ChangeLog-8.php#8.1.17
+
+-------------------------------------------------------------------
+Tue Mar 14 09:50:55 UTC 2023 - pgajdos@suse.com
+
+- update to newest systzdata patch bsc#1208199
+- deleted patches
+ - php-systzdata-v21.patch (upstreamed)
+- added patches
+ fix use of the system timezone database
+ + php-systzdata-v23.patch
+
+-------------------------------------------------------------------
+Sun Mar 5 09:54:13 UTC 2023 - Aeneas Jaißle <aj@ajaissle.de>
+
+- add "/usr/share/php" to include_path
+
+-------------------------------------------------------------------
+Fri Mar 3 13:56:09 UTC 2023 - pgajdos@suse.com
+
+- allow to specify load order of extensions in %{php_sysconf}/conf.d
+ bsc#1205162
+
+-------------------------------------------------------------------
+Sat Feb 25 20:36:50 UTC 2023 - Arjen de Korte <suse+build@de-korte.org>
+
+- change to %bcond conditional build dependencies
+
+-------------------------------------------------------------------
+Thu Feb 16 09:00:52 UTC 2023 - pgajdos@suse.com
+
+- version update to 8.1.16
+ * This is a security release that addresses CVE-2023-0567,
+ CVE-2023-0568, and CVE-2023-0662.
+ (bsc#1208366, bsc#1208367, bsc#1208388)
+ * https://www.php.net/ChangeLog-8.php#8.1.16
+
+-------------------------------------------------------------------
+Fri Feb 3 15:04:35 UTC 2023 - pgajdos@suse.com
+
+- version update to 8.1.15
+ * This is a bug fix release.
+ * https://www.php.net/ChangeLog-8.php#8.1.15
+
+-------------------------------------------------------------------
+Fri Jan 6 09:40:33 UTC 2023 - pgajdos@suse.com
+
+- version update to 8.1.14
+ * This is a security release.
+ * fixed: CVE-2022-31631 bsc#1206958
+ * https://www.php.net/ChangeLog-8.php#8.1.14
+
+-------------------------------------------------------------------
 Tue Mar 7 14:13:46 UTC 2023 - Angelo Grossini <rottame@intercom.it>
 
 - enable imap extension
@@ -216,7 +371,7 @@
 -------------------------------------------------------------------
 Wed Aug 4 01:36:39 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
 
-- fix apparmor support: seems it requires a configure flag now. 
+- fix apparmor support: seems it requires a configure flag now.
 
 -------------------------------------------------------------------
 Thu Jul 29 16:42:04 UTC 2021 - Arjen de Korte <suse+build@de-korte.org>
@@ -310,7 +465,7 @@
 Fri Jan 15 09:02:57 UTC 2021 - Arjen de Korte <suse+build@de-korte.org>
 
 - deleted patch (redundant cast, both sides are already signed int)
- - php-odbc-cmp-int-cast.patch 
+ - php-odbc-cmp-int-cast.patch
 
 -------------------------------------------------------------------
 Wed Jan 13 20:04:12 UTC 2021 - Arjen de Korte <suse+build@de-korte.org>
@@ -496,7 +651,7 @@
 
 - updated to 7.4.9: This is a security release which also contains
 several bug fixes. See https://www.php.net/ChangeLog-7.php#7.4.9
- 
+
 -------------------------------------------------------------------
 Thu Jul 9 14:09:09 UTC 2020 - Arjen de Korte <suse+build@de-korte.org>
 
@@ -659,7 +814,7 @@
 % php-systemd-unit.patch
 % php7.keyring (use keys of the PHP-7.4 release managers)
 % php7.rpmlintrc
- 
+
 -------------------------------------------------------------------
 Tue Nov 19 09:50:52 UTC 2019 - pgajdos@suse.com
 
@@ -729,7 +884,7 @@
 
 - updated to 7.3.9: This is a security release which also contains
 several bug fixes. See https://www.php.net/ChangeLog-7.php#7.3.9
- 
+
 -------------------------------------------------------------------
 Sat Aug 3 08:34:12 UTC 2019 - suse+build@de-korte.org
 
@@ -814,19 +969,19 @@
 moreover, php$N prefix causes issues when package is renamed,
 e. g. php7 to php72
 - deleted patches
- - php7-crypt-tests.patch 
- - php7-date-regenerate-lexers.patch 
- - php7-embed.patch 
- - php7-fix_net-snmp_disable_MD5.patch 
- - php7-ini.patch 
- - php7-no-build-date.patch 
- - php7-odbc-cmp-int-cast.patch 
- - php7-openssl.patch 
- - php7-php-config.patch 
- - php7-phpize.patch 
- - php7-pts.patch 
- - php7-systemd-unit.patch 
- - php7-systzdata-v17.patch 
+ - php7-crypt-tests.patch
+ - php7-date-regenerate-lexers.patch
+ - php7-embed.patch
+ - php7-fix_net-snmp_disable_MD5.patch
+ - php7-ini.patch
+ - php7-no-build-date.patch
+ - php7-odbc-cmp-int-cast.patch
+ - php7-openssl.patch
+ - php7-php-config.patch
+ - php7-phpize.patch
+ - php7-pts.patch
+ - php7-systemd-unit.patch
+ - php7-systzdata-v17.patch
 - added patches
 + php-crypt-tests.patch
 + php-date-regenerate-lexers.patch
@@ -937,7 +1092,7 @@
 -------------------------------------------------------------------
 Thu Dec 20 18:30:27 UTC 2018 - Cristian Rodríguez <crodriguez@owncloud.com>
 
-- update install-pear-nozlib.phar to its latest version, otherwise 
+- update install-pear-nozlib.phar to its latest version, otherwise
 pecl stops working due to protocol switch http -> https
 
 -------------------------------------------------------------------
@@ -954,7 +1109,7 @@
 -------------------------------------------------------------------
 Mon Dec 10 13:03:49 UTC 2018 - Cristian Rodríguez <crrodriguez@opensuse.org>
 
-- update to pcre2 broke building third party modules, php7-devel 
+- update to pcre2 broke building third party modules, php7-devel
 needs pcre-devel --> pcre2-devel change.
 
 -------------------------------------------------------------------
@@ -1011,7 +1166,7 @@
 -------------------------------------------------------------------
 Fri Nov 16 08:40:23 UTC 2018 - Petr Gajdos <pgajdos@suse.com>
 
-- core package recommends instead of requires smtp_daemon 
+- core package recommends instead of requires smtp_daemon
 bsc#1115213
 
 -------------------------------------------------------------------
@@ -1033,7 +1188,7 @@
 -------------------------------------------------------------------
 Mon Sep 17 13:09:37 UTC 2018 - Petr Gajdos <pgajdos@suse.com>
 
-- updated to 7.2.10: This is a security release which also contains 
+- updated to 7.2.10: This is a security release which also contains
 several minor bug fixes.
 http://php.net/ChangeLog-7.php
 
@@ -1065,14 +1220,14 @@
 -------------------------------------------------------------------
 Fri Aug 3 14:10:48 UTC 2018 - pgajdos@suse.com
 
-- updated to 7.2.8: This is a security release which also contains 
+- updated to 7.2.8: This is a security release which also contains
 several minor bug fixes.
 http://php.net/ChangeLog-7.php#7.2.8
 
 -------------------------------------------------------------------
 Tue Jun 26 09:56:39 UTC 2018 - pgajdos@suse.com
 
-- updated to 7.2.7: A Bugfix release which includes a segfault fix 
+- updated to 7.2.7: A Bugfix release which includes a segfault fix
 for opcache.
 http://php.net/ChangeLog-7.php#7.2.7
 
@@ -1090,7 +1245,7 @@
 -------------------------------------------------------------------
 Tue May 29 07:46:46 UTC 2018 - pgajdos@suse.com
 
-- updated to 7.2.6: Bugfix release which includes a memory 
+- updated to 7.2.6: Bugfix release which includes a memory
 corruption fix for EXIF.
 http://php.net/ChangeLog-7.php#7.2.6
 
@@ -1190,7 +1345,7 @@
 -------------------------------------------------------------------
 Thu Feb 22 18:46:32 UTC 2018 - crrodriguez@opensuse.org
 
-- php7-date-regenerate-lexers.patch: honor RE2C_FLAGS 
+- php7-date-regenerate-lexers.patch: honor RE2C_FLAGS
 
 -------------------------------------------------------------------
 Thu Feb 22 14:49:53 UTC 2018 - crrodriguez@opensuse.org
@@ -1203,7 +1358,7 @@
 
 - Remove buildRequires on:
 * libevent-devel: php7-fpm does not use it.
- * pam-devel: not used 
+ * pam-devel: not used
 - Add buildrequire on zlib-devel explicitly.
 - libvpx is not needed but libwebp is, only when not building
 against system gd. xft likewise.
@@ -1219,7 +1374,7 @@
 -------------------------------------------------------------------
 Wed Feb 7 17:50:36 UTC 2018 - pgajdos@suse.com
 
-- updated to 7.2.2: This is a bugfix release, with several bug 
+- updated to 7.2.2: This is a bugfix release, with several bug
 fixes included.
 http://php.net/ChangeLog-7.php#7.2.2
 
@@ -1268,7 +1423,7 @@
 -------------------------------------------------------------------
 Mon Nov 27 08:35:48 UTC 2017 - pgajdos@suse.com
 
-- updated to 7.1.12: This is a bugfix release, with several bug 
+- updated to 7.1.12: This is a bugfix release, with several bug
 fixes included.
 
 -------------------------------------------------------------------
@@ -1279,7 +1434,7 @@
 -------------------------------------------------------------------
 Fri Oct 27 08:54:26 UTC 2017 - pgajdos@suse.com
 
-- updated to 7.1.11: This is a bugfix release, with several bug 
+- updated to 7.1.11: This is a bugfix release, with several bug
 fixes included.
 
 -------------------------------------------------------------------
@@ -1327,7 +1482,7 @@
 %pear_cfgdir, %pear_wwwdir, %pear_metadir, %pecl_phpdir,
 %pecl_docdir, %pecl_testdir, %pecl_datadir
 
-- Updated packaging documentation in README.macros 
+- Updated packaging documentation in README.macros
 
 -------------------------------------------------------------------
 Thu Aug 31 16:57:08 UTC 2017 - ilya@ilya.pp.ua
@@ -1372,7 +1527,7 @@
 -------------------------------------------------------------------
 Mon Jul 17 08:14:37 UTC 2017 - pgajdos@suse.com
 
-- updated to 7.1.7: This is a security release with several bug 
+- updated to 7.1.7: This is a security release with several bug
 fixes included.
 
 -------------------------------------------------------------------
@@ -1448,8 +1603,8 @@
 -------------------------------------------------------------------
 Tue Jan 24 12:39:44 UTC 2017 - pgajdos@suse.com
 
-- updated to 7.0.15: Several security bugs were fixed in this 
- release. 
+- updated to 7.0.15: Several security bugs were fixed in this
+ release.
 
 -------------------------------------------------------------------
 Mon Dec 12 17:30:19 UTC 2016 - fbui@suse.com
@@ -1462,13 +1617,13 @@
 -------------------------------------------------------------------
 Mon Dec 12 09:37:39 UTC 2016 - pgajdos@suse.com
 
-- updated to 7.0.14: Several security bugs were fixed in this 
+- updated to 7.0.14: Several security bugs were fixed in this
 release.
 
 -------------------------------------------------------------------
 Fri Nov 11 08:57:59 UTC 2016 - pgajdos@suse.com
 
-- updated to 7.0.13: This is a security release. Several security 
+- updated to 7.0.13: This is a security release. Several security
 bugs were fixed in this release.
 
 -------------------------------------------------------------------
@@ -1479,13 +1634,13 @@
 -------------------------------------------------------------------
 Mon Oct 17 15:27:30 UTC 2016 - pgajdos@suse.com
 
-- updated to 7.0.12: This is a security release. Several security 
+- updated to 7.0.12: This is a security release. Several security
 bugs were fixed in this release.
 
 -------------------------------------------------------------------
 Thu Sep 15 14:07:37 UTC 2016 - pgajdos@suse.com
 
-- updated to 7.0.11: Several security bugs were fixed in this 
+- updated to 7.0.11: Several security bugs were fixed in this
 release.
 
 -------------------------------------------------------------------
@@ -1497,19 +1652,19 @@
 -------------------------------------------------------------------
 Mon Aug 22 08:21:18 UTC 2016 - pgajdos@suse.com
 
-- updated to 7.0.10: Several security bugs were fixed in this 
+- updated to 7.0.10: Several security bugs were fixed in this
 release.
 
 -------------------------------------------------------------------
 Mon Aug 1 14:10:20 UTC 2016 - pgajdos@suse.com
 
-- updated to 7.0.9: Several security bugs were fixed in this 
+- updated to 7.0.9: Several security bugs were fixed in this
 release, including the HTTP_PROXY issue.
 
 -------------------------------------------------------------------
 Thu Jun 23 13:50:13 UTC 2016 - pgajdos@suse.com
 
-- updated to 7.0.8: This is a security release. Several security 
+- updated to 7.0.8: This is a security release. Several security
 bugs were fixed in this release.
 - removed: php7-mbstring-missing-return.patch (upstreamed)
 
@@ -1521,7 +1676,7 @@
 -------------------------------------------------------------------
 Mon May 30 09:30:57 UTC 2016 - pgajdos@suse.com
 
-- updated to 7.0.7: This is a security release. Several security 
+- updated to 7.0.7: This is a security release. Several security
 bugs were fixed in this release.
 
 -------------------------------------------------------------------
@@ -1579,7 +1734,7 @@
 -------------------------------------------------------------------
 Fri Jan 8 14:07:28 UTC 2016 - pgajdos@suse.com
 
-- update to 7.0.2: 31 reported bugs has been fixed, including 
+- update to 7.0.2: 31 reported bugs has been fixed, including
 6 security related issues.
 
 -------------------------------------------------------------------
@@ -1661,13 +1816,13 @@
 -------------------------------------------------------------------
 Mon Jul 13 17:40:28 UTC 2015 - pgajdos@suse.com
 
-- updated to 5.6.11: Five security-related issues in PHP were fixed 
+- updated to 5.6.11: Five security-related issues in PHP were fixed
 in this release, including CVE-2015-3152.
 
 -------------------------------------------------------------------
 Thu Jun 25 04:01:44 UTC 2015 - crrodriguez@opensuse.org
 
-- php5-systemd-unit.patch: set Killmode=mixed in order 
+- php5-systemd-unit.patch: set Killmode=mixed in order
 to ensure fpm and children forked by script can terminate
 cleanly.
 
@@ -1684,8 +1839,8 @@
 -------------------------------------------------------------------
 Thu Jun 18 09:47:53 UTC 2015 - pgajdos@suse.com
 
-- updated to 5.6.10: Several bugs have been fixed as well as several 
- security issues into some bundled libraries (CVE-2015-3414, 
+- updated to 5.6.10: Several bugs have been fixed as well as several
+ security issues into some bundled libraries (CVE-2015-3414,
 CVE-2015-3415, CVE-2015-3416, CVE-2015-2325 and CVE-2015-2326).
 
 -------------------------------------------------------------------
@@ -1704,7 +1859,7 @@
 -------------------------------------------------------------------
 Fri Apr 24 06:17:51 UTC 2015 - pgajdos@suse.com
 
-- update to 5.6.8: Several bugs have been fixed some of them beeing 
+- update to 5.6.8: Several bugs have been fixed some of them beeing
 security related, like CVE-2015-1351 and CVE-2015-1352.
 - refreshed php5-crypto-checks.patch
 
@@ -1728,7 +1883,7 @@
 -------------------------------------------------------------------
 Tue Mar 24 13:26:49 UTC 2015 - pgajdos@suse.com
 
-- update to 5.6.7: Several bugs have been fixed as well as 
+- update to 5.6.7: Several bugs have been fixed as well as
 CVE-2015-0231, CVE-2015-2305 and CVE-2015-2331.
 
 -------------------------------------------------------------------
@@ -1744,7 +1899,7 @@
 -------------------------------------------------------------------
 Mon Feb 23 11:36:32 UTC 2015 - pgajdos@suse.com
 
-- update to 5.6.6: fixes several bugs and addresses CVE-2015-0235 
+- update to 5.6.6: fixes several bugs and addresses CVE-2015-0235
 and CVE-2015-0273.
 
 -------------------------------------------------------------------
@@ -1760,7 +1915,7 @@
 -------------------------------------------------------------------
 Mon Jan 26 08:52:12 UTC 2015 - pgajdos@suse.com
 
-- update to 5.6.5: This release fixes several bugs as well as 
+- update to 5.6.5: This release fixes several bugs as well as
 CVE-2015-0231, CVE-2014-9427 and CVE-2015-0232.
 - removed patches:
 * php-CVE-2014-9426.patch
@@ -1781,20 +1936,20 @@
 -------------------------------------------------------------------
 Fri Dec 19 08:00:32 UTC 2014 - pgajdos@suse.com
 
-- update to 5.6.4: This release fixes several bugs and one CVE 
+- update to 5.6.4: This release fixes several bugs and one CVE
 related to unserialization.
 
 -------------------------------------------------------------------
 Tue Nov 18 14:28:08 UTC 2014 - pgajdos@suse.com
 
-- update to 5.6.3: This release fixes several bugs and one CVE 
+- update to 5.6.3: This release fixes several bugs and one CVE
 in the fileinfo extension.
 
 -------------------------------------------------------------------
 Mon Oct 27 07:30:03 UTC 2014 - pgajdos@suse.com
 
-- update to 5.6.2: Four security-related bugs were fixed in this 
- release, including fixes for CVE-2014-3668, CVE-2014-3669 and 
+- update to 5.6.2: Four security-related bugs were fixed in this
+ release, including fixes for CVE-2014-3668, CVE-2014-3669 and
 CVE-2014-3670.
 
 -------------------------------------------------------------------
@@ -1806,7 +1961,7 @@
 -------------------------------------------------------------------
 Thu Oct 2 20:27:56 UTC 2014 - crrodriguez@opensuse.org
 
-- php5-crypto-checks.patch: Fix broken libcrypto checks 
+- php5-crypto-checks.patch: Fix broken libcrypto checks
 DSA_get_default_method is in -lcrypto not -lssl
 - DO not use xorg-x11-devel, just pkgconfig(xpm) and xft
 - Support WEBP in the gd extension by buildrequiring libvpx-devel
@@ -1834,8 +1989,8 @@
 Thu Aug 28 12:49:25 UTC 2014 - pgajdos@suse.com
 
 - updated to 5.6.0:
- * Most improvements in PHP 5.6.x have no impact on existing code. 
- There are a few incompatibilities and new features that should 
+ * Most improvements in PHP 5.6.x have no impact on existing code.
+ There are a few incompatibilities and new features that should
 be considered:
 http://php.net/manual/en/migration56.php
 - removed patches:
@@ -1847,9 +2002,9 @@
 -------------------------------------------------------------------
 Tue Aug 26 06:50:40 UTC 2014 - pgajdos@suse.com
 
-- This release fixes several bugs against PHP 5.5.15 and resolves 
- CVE-2014-3538, CVE-2014-3587, CVE-2014-2497, CVE-2014-5120 and 
- CVE-2014-3597. 
+- This release fixes several bugs against PHP 5.5.15 and resolves
+ CVE-2014-3538, CVE-2014-3587, CVE-2014-2497, CVE-2014-5120 and
+ CVE-2014-3597.
 - removed patches:
 * php-CVE-2014-2497.patch
 
@@ -1857,7 +2012,7 @@
 Tue Jul 29 08:04:01 UTC 2014 - pgajdos@suse.com
 
 - updated to 5.5.15:
- This release fixes several bugs against PHP 5.5.14. 
+ This release fixes several bugs against PHP 5.5.14.
 The list of changes is recorded in the ChangeLog or
 http://php.net/ChangeLog-5.php#5.5.15.
 - removed patches:
@@ -1889,7 +2044,7 @@
 Tue Jun 17 07:17:37 UTC 2014 - pgajdos@suse.com
 
 - php5-5.5.10-CVE-2014-2497.patch renamed to
- php-5.5.10-CVE-2014-2497.patch to be consistent with other 
+ php-5.5.10-CVE-2014-2497.patch to be consistent with other
 product php patches names
 
 -------------------------------------------------------------------
@@ -1901,20 +2056,20 @@
 -------------------------------------------------------------------
 Mon Jun 2 09:37:59 UTC 2014 - pgajdos@suse.com
 
-- updated to 5.5.13: This release fixes several bugs in PHP 5.5.12, 
+- updated to 5.5.13: This release fixes several bugs in PHP 5.5.12,
 and addresses two CVEs in Fileinfo (CVE-2014-0238 and CVE-2014-0237).
 
 -------------------------------------------------------------------
 Wed May 7 12:08:46 UTC 2014 - pgajdos@suse.com
 
-- updated to 5.5.12: Fixed several bugs against PHP 5.5.11, 
+- updated to 5.5.12: Fixed several bugs against PHP 5.5.11,
 as well as CVE-2014-0185 regarding PHP-FPM.
 - improved build-test.sh
 
 -------------------------------------------------------------------
 Wed Apr 30 12:07:22 UTC 2014 - pgajdos@suse.com
 
-- build-test.sh: use relevant api for build; propagate build 
+- build-test.sh: use relevant api for build; propagate build
 parameters to osc
 
 -------------------------------------------------------------------
@@ -1925,10 +2080,10 @@
 -------------------------------------------------------------------
 Tue Apr 29 09:34:56 UTC 2014 - pgajdos@suse.com
 
-- add build-test.sh and latest_test_results.txt for testing 
+- add build-test.sh and latest_test_results.txt for testing
 regressions in tests before and after update. Run
- 
- sh build-test.sh 
+
+ sh build-test.sh
 
 after changes. php will get built and test results will be
 compared with latest_test_results.txt and differences reported.
@@ -1941,7 +2096,7 @@
 Wed Apr 9 06:29:41 UTC 2014 - pgajdos@suse.com
 
 - updated to 5.5.11:
- * Several bugs were fixed in this release, some bundled libraries 
+ * Several bugs were fixed in this release, some bundled libraries
 updated and a security issue has been fixed : CVE-2013-7345.
 
 -------------------------------------------------------------------
@@ -1953,8 +2108,8 @@
 Mon Mar 17 12:11:34 UTC 2014 - pgajdos@suse.com
 
 - updated to 5.5.10:
- * Several bugs were fixed in this release, including security 
- issues related to CVEs. CVE-2014-1943, CVE-2014-2270 and 
+ * Several bugs were fixed in this release, including security
+ issues related to CVEs. CVE-2014-1943, CVE-2014-2270 and
 CVE-2013-7327 have been addressed in this release.
 
 -------------------------------------------------------------------
@@ -1967,7 +2122,7 @@
 
 - updated to 5.5.9:
 * This release fixes several bugs against PHP 5.5.8.
- * see NEWS or http://www.php.net/ChangeLog-5.php#5.5.9 for 
+ * see NEWS or http://www.php.net/ChangeLog-5.php#5.5.9 for
 details
 - modified patches:
 * php5-no-build-date.patch (refreshed using quilt)
@@ -1975,7 +2130,7 @@
 -------------------------------------------------------------------
 Mon Jan 13 08:35:59 UTC 2014 - pgajdos@suse.com
 
-- updated to 5.5.8: 
+- updated to 5.5.8:
 * fixes CVE-2013-6712 and build against freetype2
 * see http://www.php.net/ChangeLog-5.php#5.5.8
 for more
@@ -1992,7 +2147,7 @@
 Wed Dec 18 11:35:27 UTC 2013 - pgajdos@suse.com
 
 - updated to 5.5.7:
- * fixes some bugs against PHP 5.5.6 and it also includes a fix 
+ * fixes some bugs against PHP 5.5.6 and it also includes a fix
 for CVE-2013-6420 in OpenSSL extension
 -> removed CVE-2013-6420.patch
 
@@ -2100,7 +2255,7 @@
 -------------------------------------------------------------------
 Sun Oct 13 21:24:58 UTC 2013 - crrodriguez@opensuse.org
 
-- build with --with-fpm-systemd and install systemd unit 
+- build with --with-fpm-systemd and install systemd unit
 - php5-systemd-unit.patch: tweak systemd unit for openSUSE requirements
 - php5-openssl.patch: only openSSL_config() is really needed.
 - Recommended for 13.1 and Factory
@@ -2115,14 +2270,14 @@
 Thu Sep 5 12:44:11 UTC 2013 - pgajdos@suse.com
 
 - updated to 5.4.19:
- * These releases fix a bug in the patch for CVE-2013-4248 in 
+ * These releases fix a bug in the patch for CVE-2013-4248 in
 OpenSSL module and compile failure with ZTS enabled in PHP 5.4.
 
 -------------------------------------------------------------------
 Tue Aug 20 10:44:04 UTC 2013 - pgajdos@suse.com
 
 - updated to 5.4.18:
- * About 30 bugs were fixed, including security issues CVE-2013-4113 
+ * About 30 bugs were fixed, including security issues CVE-2013-4113
 and CVE-2013-4248.
 
 -------------------------------------------------------------------
@@ -2136,8 +2291,8 @@
 -------------------------------------------------------------------
 Wed Jul 31 01:21:24 UTC 2013 - crrodriguez@opensuse.org
 
-- php5-per-mod-log.patch Support apache 2.4 per module logging 
-- php5-apache24-updates.patch Use proper API in apache 2.4 
+- php5-per-mod-log.patch Support apache 2.4 per module logging
+- php5-apache24-updates.patch Use proper API in apache 2.4
 to determine when the module has to be loaded.
 I made this patches at least a year ago, but for some reason
 they went out of my radar and were not applied to upstream
@@ -2153,7 +2308,7 @@
 Fixed bug #64960 (Segfault in gc_zval_possible_root).
 Fixed bug #64936 (doc comments picked up from previous scanner run).
 Fixed bug #64934 (Apache2 TS crash with get_browser()).
- Fixed bug #64166 (quoted-printable-encode stream filter incorrectly 
+ Fixed bug #64166 (quoted-printable-encode stream filter incorrectly
 discarding whitespace).
 DateTime:
 Fixed bug #53437 (Crash when using unserialized DatePeriod instance).
@@ -2161,29 +2316,29 @@
 Fixed bug #64915 (error_log ignored when daemonize=0).
 Implemented FR #64764 (add support for FPM init.d script).
 PDO:
- Fixed bug #63176 (Segmentation fault when instantiate 2 persistent 
+ Fixed bug #63176 (Segmentation fault when instantiate 2 persistent
 PDO to the same db server).
 PDO_DBlib:
 Fixed bug #63638 (Cannot connect to SQL Server 2008 with PDO dblib).
 Fixed bug #64338 (pdo_dblib can't connect to Azure SQL).
- Fixed bug #64808 (FreeTDS PDO getColumnMeta on a prepared but not 
+ Fixed bug #64808 (FreeTDS PDO getColumnMeta on a prepared but not
 executed statement crashes).
 PDO_firebird:
 Fixed bug #64037 (Firebird return wrong value for numeric field).
- Fixed bug #62024 (Cannot insert second row with null using 
+ Fixed bug #62024 (Cannot insert second row with null using
 parametrized query).
 PDO_mysql:
- Fixed bug #48724 (getColumnMeta() doesn't return native_type for BIT, 
+ Fixed bug #48724 (getColumnMeta() doesn't return native_type for BIT,
 TINYINT and YEAR).
 PDO_pgsql:
 Fixed bug #64949 (Buffer overflow in _pdo_pgsql_error).
 pgsql:
 Fixed bug #64609 (pg_convert enum type support).
 Readline:
- Implement FR #55694 (Expose additional readline variable to prevent 
+ Implement FR #55694 (Expose additional readline variable to prevent
 default filename completion).
 SPL:
- Fixed bug #64997 (Segfault while using RecursiveIteratorIterator 
+ Fixed bug #64997 (Segfault while using RecursiveIteratorIterator
 on 64-bits systems).
 
 -------------------------------------------------------------------
@@ -2246,21 +2401,21 @@
 
 - updated to 5.4.15:
 Core:
- Fixed bug #64578 (debug_backtrace in set_error_handler 
+ Fixed bug #64578 (debug_backtrace in set_error_handler
 corrupts zend heap: segfault).
- Fixed bug #64458 (dns_get_record result with string of 
+ Fixed bug #64458 (dns_get_record result with string of
 length -1).
- Fixed bug #64433 (follow_location parameter of context 
+ Fixed bug #64433 (follow_location parameter of context
 is ignored for most response codes).
 Fixed bug #47675 (fd leak on Solaris).
 Fixed bug #64577 (fd leak on Solaris).
 Fileinfo:
 Upgraded libmagic to 5.14.
 Streams:
- Fixed Windows x64 version of stream_socket_pair() and 
+ Fixed Windows x64 version of stream_socket_pair() and
 improved error handling.
 Zip:
- Fixed bug #64342 (ZipArchive::addFile() has to check 
+ Fixed bug #64342 (ZipArchive::addFile() has to check
 for file existence).
 
 -------------------------------------------------------------------
@@ -2286,7 +2441,7 @@
 -------------------------------------------------------------------
 Wed Apr 17 17:35:33 UTC 2013 - slavb18@gmail.com
 
-- add php5-firebird providing php5-interbase and php5-pdo_firebird 
+- add php5-firebird providing php5-interbase and php5-pdo_firebird
 
 -------------------------------------------------------------------
 Mon Apr 15 09:38:23 UTC 2013 - pgajdos@suse.com
@@ -2294,25 +2449,25 @@
 - updated to 5.4.14:
 Core:
 Fixed bug #64529 (Ran out of opcode space).
- Fixed bug #64515 (Memoryleak when using the same variablename 
+ Fixed bug #64515 (Memoryleak when using the same variablename
 two times in function declaration).
 Fixed bug #64432 (more empty delimiter warning in strX methods).
- Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes 
+ Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes
 fatal error).
 Fixed bug #64370 (microtime(true) less than $_SERVER'REQUEST_TIME_FLOAT').
- Fixed bug #64239 (Debug backtrace changed behavior since 5.4.10 
+ Fixed bug #64239 (Debug backtrace changed behavior since 5.4.10
 or 5.4.11).
- Fixed bug #63976 (Parent class incorrectly using child constant 
+ Fixed bug #63976 (Parent class incorrectly using child constant
 in class property).
- Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not 
+ Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not
 handle exceptions properly).
 Fixed bug #62343 (Show class_alias In get_declared_classes()).
 PCRE:
 Merged PCRE 8.32.
 SNMP:
- Fixed bug #61981 (OO API, walk: $suffix_as_key is not working correctly). 
+ Fixed bug #61981 (OO API, walk: $suffix_as_key is not working correctly).
 Zip:
- Fixed bug #64452 (Zip crash intermittently). (Anatol) 
+ Fixed bug #64452 (Zip crash intermittently). (Anatol)
 
 -------------------------------------------------------------------
 Mon Apr 15 09:22:26 UTC 2013 - pgajdos@suse.com
@@ -2463,22 +2618,22 @@
 Wed Jul 25 12:48:08 UTC 2012 - pgajdos@suse.com
 
 - updated to 5.3.15:
- * fixes over 30 bugs and includes a fix for a security related 
+ * fixes over 30 bugs and includes a fix for a security related
 overflow issue in the stream implementation (CVE-2012-2688)
 bnc#772582 and open_basedir bypass, CVE-2012-3365 bnc#772580
 
 -------------------------------------------------------------------
 Mon Jun 18 17:08:57 UTC 2012 - pgajdos@suse.com
 
-- updated to 5.3.14: 
+- updated to 5.3.14:
 * bug-fix release, see NEWS for details
 
 -------------------------------------------------------------------
 Fri May 25 15:10:26 UTC 2012 - pgajdos@suse.com
 
-- updated to 5.3.13: various security fixes, 
+- updated to 5.3.13: various security fixes,
 CVE-2012-1823, CVE-2012-2311, CVE-2012-2335, CVE-2012-2336
- * removed php-5.3.10-pcre_fullinfo.patch 
+ * removed php-5.3.10-pcre_fullinfo.patch
 * refreshed php-5.3.2-aconf26x.patch
 
 -------------------------------------------------------------------
@@ -2489,12 +2644,12 @@
 -------------------------------------------------------------------
 Tue Feb 28 09:08:30 UTC 2012 - pgajdos@suse.com
 
-- fixed build with new pcre (php bug 60986) 
+- fixed build with new pcre (php bug 60986)
 
 -------------------------------------------------------------------
 Sat Feb 4 16:35:07 UTC 2012 - crrodriguez@opensuse.org
 
-- Build with -fpie 
+- Build with -fpie
 
 -------------------------------------------------------------------
 Thu Feb 2 21:31:00 UTC 2012 - crrodriguez@opensuse.org
@@ -2504,7 +2659,7 @@
 -------------------------------------------------------------------
 Sat Jan 28 18:52:35 UTC 2012 - crrodriguez@opensuse.org
 
-- remove unapplied patches 
+- remove unapplied patches
 
 -------------------------------------------------------------------
 Wed Jan 18 15:17:02 UTC 2012 - pgajdos@suse.com
@@ -2572,13 +2727,13 @@
 Sun Sep 18 22:08:00 UTC 2011 - crrodriguez@opensuse.org
 
 - Fix wrong PAGE_SIZE assumption, must use sysconf() instead
-- Fix integer overflow when attempting to use more than 2 Gb 
+- Fix integer overflow when attempting to use more than 2 Gb
 of memory.
 
 -------------------------------------------------------------------
 Mon Sep 5 01:20:22 UTC 2011 - crrodriguez@opensuse.org
 
-- call openssl_config too in order to load user-provided 
+- call openssl_config too in order to load user-provided
 engine configuration.
 
 -------------------------------------------------------------------
@@ -2599,18 +2754,18 @@
 -------------------------------------------------------------------
 Fri Aug 12 02:27:08 UTC 2011 - crrodriguez@opensuse.org
 
-- Add mssql support with freetds 
+- Add mssql support with freetds
 - Update PHP snapshot.
 
 -------------------------------------------------------------------
 Tue Aug 9 22:11:30 UTC 2011 - crrodriguez@opensuse.org
 
-- Update snapshot, more static analyzer fixes. 
+- Update snapshot, more static analyzer fixes.
 
 -------------------------------------------------------------------
 Sun Aug 7 20:32:28 UTC 2011 - crrodriguez@opensuse.org
 
-- Update snapshot, fix converity warnings 
+- Update snapshot, fix converity warnings
 
 -------------------------------------------------------------------
 Fri Aug 5 03:00:45 UTC 2011 - crrodriguez@opensuse.org
@@ -2620,7 +2775,7 @@
 -------------------------------------------------------------------
 Wed Aug 3 17:51:56 UTC 2011 - crrodriguez@opensuse.org
 
-- Fix build in Factory 
+- Fix build in Factory
 - Fix Segfault with allow_call_time_pass_reference = Off
 - Using class constants in array definition fails
 
@@ -2633,22 +2788,22 @@
 -------------------------------------------------------------------
 Sun Jul 31 16:06:16 UTC 2011 - crrodriguez@opensuse.org
 
-- Update snap, PHP 5.3.7-RC4 
+- Update snap, PHP 5.3.7-RC4
 
 -------------------------------------------------------------------
 Wed Jul 27 04:36:37 UTC 2011 - crrodriguez@opensuse.org
 
-- Update snapshot again. 
+- Update snapshot again.
 
 -------------------------------------------------------------------
 Sat Jul 23 18:27:26 UTC 2011 - crrodriguez@opensuse.org
 
-- Update snapshot. 
+- Update snapshot.
 
 -------------------------------------------------------------------
 Thu Jul 14 04:42:23 UTC 2011 - crrodriguez@opensuse.org
 
-- is_a() function is throwing an annoying warning 
+- is_a() function is throwing an annoying warning
 "Unknown class passed as parameter" which is noticeable when
 you use PEAR, fix it, if your code uses it you should be
 using the instanceof operator anyway.
@@ -2663,7 +2818,7 @@
 -------------------------------------------------------------------
 Wed Jul 6 18:55:15 UTC 2011 - crrodriguez@opensuse.org
 
-- Fixed missing Expires and Cache-Control headers for ping and status pages 
+- Fixed missing Expires and Cache-Control headers for ping and status pages
 - fix crypt() issue with overlong salt
 - Fixed bug #52935 (call exit in user_error_handler cause stream relate core).
 
@@ -2674,17 +2829,17 @@
 - Fixed exit at FPM startup on fpm_resources_prepare
 - Added master rlimit_files and rlimit_core
 - Removed pid in debug logs written by chrildren processes
-- Replaced shm_slots with a real scoreboard 
+- Replaced shm_slots with a real scoreboard
 
 -------------------------------------------------------------------
 Wed Jun 22 21:05:07 UTC 2011 - crrodriguez@opensuse.org
 
-- Enable mysqlnd compression protocol. 
+- Enable mysqlnd compression protocol.
 
 -------------------------------------------------------------------
 Thu Jun 16 19:24:49 UTC 2011 - crrodriguez@opensuse.org
 
-- Update snapshot to 5.3.7 RC1 
+- Update snapshot to 5.3.7 RC1
 
 -------------------------------------------------------------------
 Tue Jun 14 17:10:52 UTC 2011 - crrodriguez@opensuse.org
@@ -2695,15 +2850,15 @@
 -------------------------------------------------------------------
 Fri Jun 10 21:25:59 UTC 2011 - crrodriguez@opensuse.org
 
-- Update 5.3 snap 
+- Update 5.3 snap
 - Fix compiler failure that happended after compile error.
 - Stream not closed and error not returned when SSL CN_match fails.
 
 -------------------------------------------------------------------
 Mon Jun 6 23:08:38 UTC 2011 - crrodriguez@opensuse.org
 
-- Update 5.3 snap 
-- Update bundled PEAR 
+- Update 5.3 snap
+- Update bundled PEAR
 - Case discrepancy in timezone names cause Uncaught exception and fatal error.
 - SEEK_CUR with 0 value, returns a warning
 - Restore fix: do not accept paths with NULL in them
@@ -2719,22 +2874,22 @@
 Sun May 29 20:12:46 UTC 2011 - crrodriguez@opensuse.org
 
 - Drop Update alternatives usage, there are no alternatives
- PHP4 is gone and PHP6 is not coming at any time soon. 
+ PHP4 is gone and PHP6 is not coming at any time soon.
 - Remove "mm" support from session module, virtually nothing
- uses it and it doesnt support proper locking, mount 
+ uses it and it doesnt support proper locking, mount
 /var/lib/php5 in tmpfs instead.
 
 -------------------------------------------------------------------
 Sun May 29 17:10:52 UTC 2011 - crrodriguez@opensuse.org
 
 - Update to 5.3.6.201105291701
-* Fixes random crash with apache2 SAPI and php_admin_value 
+* Fixes random crash with apache2 SAPI and php_admin_value
 in virtualhost configuration.
 
 -------------------------------------------------------------------
 Fri May 20 02:52:34 UTC 2011 - crrodriguez@opensuse.org
 
-- Update 5.3 branch 
+- Update 5.3 branch
 - Fix a few memory leaks
 - Check if tempfile can be created in phar extension
 - Fix problems with __halt_compiler and imported namespaces
@@ -2749,11 +2904,11 @@
 -------------------------------------------------------------------
 Mon May 9 01:16:17 UTC 2011 - crrodriguez@opensuse.org
 
-- Update to current 5.3 svn version. 
+- Update to current 5.3 svn version.
 - For practical reasons now the hash extension is built-in,hence
 deprecates package php5-hash, it is nowdays required by the session
 and phar extensions but must be statically built to work.
-- Drop php5-session patch, needed only to workaround compile 
+- Drop php5-session patch, needed only to workaround compile
 failure when hash extension is built as loadable extension.
 - php.ini now clearly says that by "3" in session.hash_function
 we mean SHA256.
@@ -2761,7 +2916,7 @@
 -------------------------------------------------------------------
 Fri Apr 29 03:33:41 UTC 2011 - crrodriguez@opensuse.org
 
-- Update to a recent 5.3.x SVN version, mostly bug fixes 
+- Update to a recent 5.3.x SVN version, mostly bug fixes
 * track_errors causes segfault
 * classes from dl()'ed extensions are not destroyed
 * Crash when assigning value to a dimension in a non-array
@@ -2771,7 +2926,7 @@
 Wed Apr 13 23:39:33 UTC 2011 - crrodriguez@opensuse.org
 
 - fix crash on destruction.
-- allow openssl extension to be built w/o SSLv2 
+- allow openssl extension to be built w/o SSLv2
 
 -------------------------------------------------------------------
 Tue Apr 5 06:41:50 UTC 2011 - lang@b1-systems.de
@@ -2783,7 +2938,7 @@
 Sat Apr 2 00:52:57 UTC 2011 - crrodriguez@opensuse.org
 
 - Intl extension failed to load bnc#659868
-- Fix update-alternatives usage,will be dropped in the future. 
+- Fix update-alternatives usage,will be dropped in the future.
 
 -------------------------------------------------------------------
 Mon Mar 28 20:46:25 UTC 2011 - sbutler1@illinois.edu
@@ -2799,12 +2954,12 @@
 * Fixed bug #54193 (Integer overflow in shmop_read()). (CVE-2011-1092)
 * Fixed bug #54055 (buffer overrun with high values for precision ini setting).
 * Fixed bug #54002 (crash on crafted tag in exif). (CVE-2011-0708)
-* Fixed bug #53885 (ZipArchive segfault with FL_UNCHANGED on empty archive). (CVE-2011-0421) 
+* Fixed bug #53885 (ZipArchive segfault with FL_UNCHANGED on empty archive). (CVE-2011-0421)
 
 -------------------------------------------------------------------
 Wed Mar 16 03:49:41 UTC 2011 - crrodriguez@opensuse.org
 
-- Upgrade to PHP 5.3.6.RC3 
+- Upgrade to PHP 5.3.6.RC3
 * Drop obsoleted patches
 * fix some rpmlint warnings
 * Hundreds of changes, see NEWS for details
@@ -2839,7 +2994,7 @@
 -------------------------------------------------------------------
 Thu Jan 13 17:20:40 CET 2011 - pgajdos@suse.cz
 
-- security fix: 
+- security fix:
 * fopen_https_proxy_auth_fix.patch bnc#656523
 
 -------------------------------------------------------------------
@@ -2857,7 +3012,7 @@
 -------------------------------------------------------------------
 Sun Jan 9 01:32:33 UTC 2011 - cristian.rodriguez@opensuse.org
 
-- Use mysqlnd driver, this is a newer PHP-native mysql 
+- Use mysqlnd driver, this is a newer PHP-native mysql
 extension, that does not require external libraries.
 Now you can use mysql, mariadb or drizzle without extra libs.
 fixes bnc #661464 and other old feature requests.
@@ -2879,7 +3034,7 @@
 
 - Add php-5.3.4-dlopen.patch from fedora,makes dlopen to use
 bind_now instead of lazy.
-- Compiler is now in C99 mode for both core and extensions. 
+- Compiler is now in C99 mode for both core and extensions.
 
 -------------------------------------------------------------------
 Tue Dec 14 01:08:07 UTC 2010 - cristian.rodriguez@opensuse.org
@@ -2907,14 +3062,14 @@
 * Added a 3rd parameter to get_html_translation_table. It now takes a charset hint, like htmlentities et al.
 * Implemented FR #52348, added new constant ZEND_MULTIBYTE to detect zend multibyte at runtime.
 * Multiple improvements to the FPM SAPI.
-* Over 100 other bug fixes. 
+* Over 100 other bug fixes.
 - SUSE specific;
 * enable PTY support in proc_open (temporary)
 
 -------------------------------------------------------------------
 Wed Nov 24 01:47:31 CET 2010 - ro@suse.de
 
-- xft-config is gone 
+- xft-config is gone
 
 -------------------------------------------------------------------
 Tue Nov 2 02:23:00 UTC 2010 - cristian.rodriguez@opensuse.org
@@ -2922,26 +3077,26 @@
 - Update to 5.3.3_svn201011020214
 * Fix Performance issue, array_diff may take hours instead
 of seconds in some scenarios,regression appeared in version
- 5.2.5 
+ 5.2.5
 
 -------------------------------------------------------------------
 Wed Oct 27 22:09:03 UTC 2010 - cristian.rodriguez@opensuse.org
 
 - Update to 5.3.3_svn20101027xx
-- Fix init script again. 
+- Fix init script again.
 
 -------------------------------------------------------------------
 Thu Oct 14 03:36:44 UTC 2010 - crrodriguez@opensuse.org
 
 - update to 5.3.3_svn201010140300
-- Fix php-fpm init script. 
+- Fix php-fpm init script.
 
 -------------------------------------------------------------------
 Sat Oct 9 16:20:10 UTC 2010 - cristian.rodriguez@opensuse.org
 
 - Update to an slightly newer PHP 5.3.3.x snap, fixes
 around 100 bugs including open_basedir problems.
-- add the fpm sapi to the package. 
+- add the fpm sapi to the package.
 
 -------------------------------------------------------------------
 Tue Aug 3 04:36:49 UTC 2010 - cristian.rodriguez@opensuse.org
@@ -2965,13 +3120,13 @@
 Tue Jul 20 03:15:19 UTC 2010 - cristian.rodriguez@opensuse.org
 
 - Update to PHP 5.3.3 RC3
-- Massive lot of security fixes see list 
- here http://www.php-security.org/category/vulnerabilities/index.html 
+- Massive lot of security fixes see list
+ here http://www.php-security.org/category/vulnerabilities/index.html
 
 -------------------------------------------------------------------
 Tue Jun 1 16:32:20 UTC 2010 - cristian.rodriguez@opensuse.org
 
-- possible fix for bnc#610633 
+- possible fix for bnc#610633
 
 -------------------------------------------------------------------
 Fri Apr 16 15:51:49 UTC 2010 - crrodriguez@opensuse.org
@@ -2981,14 +3136,14 @@
 -------------------------------------------------------------------
 Sun Apr 4 12:43:07 UTC 2010 - crrodriguez@opensuse.org
 
-- remove obsolete buildRequires 
+- remove obsolete buildRequires
 
 -------------------------------------------------------------------
 Fri Apr 2 14:59:46 UTC 2010 - crrodriguez@opensuse.org
 
 - remove build date from binaries so they dont get
 republished every time
-- fix invalid path 
+- fix invalid path
 
 -------------------------------------------------------------------
 Thu Apr 1 22:03:47 UTC 2010 - crrodriguez@opensuse.org
@@ -3043,7 +3198,7 @@
 -------------------------------------------------------------------
 Tue Sep 8 13:20:55 CEST 2009 - crrodriguez@suse.de
 
-- make php5-pear noarch in Factory 
+- make php5-pear noarch in Factory
 
 -------------------------------------------------------------------
 Wed Aug 26 15:30:59 CEST 2009 - crrodriguez@suse.de
@@ -3056,22 +3211,22 @@
 -------------------------------------------------------------------
 Mon Aug 24 02:53:28 CEST 2009 - crrodriguez@suse.de
 
-- PHP read_exif_data() only returns the first letter of UTF-16 strings bnc#518300 
+- PHP read_exif_data() only returns the first letter of UTF-16 strings bnc#518300
 
 -------------------------------------------------------------------
 Sun Aug 23 23:03:49 CEST 2009 - crrodriguez@suse.de
 
-- fix missing return values of suhosin extension 
+- fix missing return values of suhosin extension
 
 -------------------------------------------------------------------
 Thu Aug 20 00:03:39 CEST 2009 - crrodriguez@novell.com
 
-- fix build on CODE10 products 
+- fix build on CODE10 products
 
 -------------------------------------------------------------------
 Wed Aug 19 23:45:26 CEST 2009 - crrodriguez@novell.com
 
-- fix horrible broken open_basedir functionality 
+- fix horrible broken open_basedir functionality
 
 -------------------------------------------------------------------
 Sun Aug 16 16:19:19 CEST 2009 - crrodriguez@suse.de
@@ -3087,7 +3242,7 @@
 Fri Aug 14 23:57:25 CEST 2009 - crrodriguez@suse.de
 
 - add suhosin patch and newer suhosin extension for compatibility
- reasons 
+ reasons
 
 -------------------------------------------------------------------
 Thu Aug 13 21:23:57 CEST 2009 - crrodriguez@suse.de
@@ -3119,11 +3274,11 @@
 * Fixed bug #47564 (unpacking unsigned long 32bit big endian returns wrong result). (Ilia)
 * Fixed bug #47365 (ip2long() may allow some invalid values on certain 64bit systems).
 * Over 100 bug fixes.
- 
+
 -------------------------------------------------------------------
 Thu May 21 22:29:41 CEST 2009 - crrodriguez@suse.de
 
-- add temporary backport of openssl prng function 
+- add temporary backport of openssl prng function
 
 -------------------------------------------------------------------
 Sat Mar 14 18:38:21 CET 2009 - crrodriguez@suse.de
@@ -3132,43 +3287,43 @@
 * VUL-0: php5: memory disclosure by imagerotate() bnc#480850
 * VUL-0: php5: mbstring.func_overload set in .htaccess becomes global bnc#471419
 * Fixed a segfault when malformed string is passed to json_decode()
- * Fixed explode() behavior with empty string to respect negative limit. 
+ * Fixed explode() behavior with empty string to respect negative limit.
 
 -------------------------------------------------------------------
 Sun Dec 14 16:55:52 CET 2008 - crrodriguez@suse.de
 
-- remove ming extension, moved to server:php:extensions later 
+- remove ming extension, moved to server:php:extensions later
 
 -------------------------------------------------------------------
 Tue Dec 9 05:50:38 CET 2008 - crrodriguez@suse.de
 
-- Update to PHP 5.2.8 
+- Update to PHP 5.2.8
 
 -------------------------------------------------------------------
 Mon Dec 8 17:30:53 CET 2008 - crrodriguez@suse.de
 
 - fix BLOCKER magic_quotes breakage, if your code
- relies on this feature, it is broken,time to press the panic button. 
+ relies on this feature, it is broken,time to press the panic button.
 
 -------------------------------------------------------------------
 Fri Dec 5 16:26:42 CET 2008 - crrodriguez@suse.de
 
-- update to PHP 5.2.7 final, no mayor changes since RC5 
+- update to PHP 5.2.7 final, no mayor changes since RC5
 
 -------------------------------------------------------------------
 Fri Nov 28 15:26:15 CET 2008 - crrodriguez@suse.de
 
-- update to PHP 5.2.7RC5 see news for details 
+- update to PHP 5.2.7RC5 see news for details
 
 -------------------------------------------------------------------
 Fri Nov 21 02:22:25 CET 2008 - crrodriguez@suse.de
 
-- update to PHP 5.2.7RC4, see news for details 
+- update to PHP 5.2.7RC4, see news for details
 
 -------------------------------------------------------------------
 Sun Nov 16 04:43:25 CET 2008 - crrodriguez@suse.de
 
-- update to PHP 5.2.7RC3, see NEWS for details 
+- update to PHP 5.2.7RC3, see NEWS for details
 
 -------------------------------------------------------------------
 Mon Sep 8 10:38:25 CEST 2008 - crrodriguez@suse.de
@@ -3185,7 +3340,7 @@
 -------------------------------------------------------------------
 Mon Jul 14 00:14:13 CEST 2008 - crrodriguez@suse.de
 
-- merge patches from schwab 
+- merge patches from schwab
 
 -------------------------------------------------------------------
 Fri May 2 10:12:59 CEST 2008 - crrodriguez@suse.de
@@ -3214,7 +3369,7 @@
 -------------------------------------------------------------------
 Wed Feb 6 00:37:17 CET 2008 - crrodriguez@suse.de
 
-- update suhosin extension to version 0.9.23 
+- update suhosin extension to version 0.9.23
 - Fixed suhosin extension now compiles with snapshots of PHP 5.3
 - Fixed crypt() behaves like normal again when there is no salt supplied
 - wrong Obsoletes causes upgrade trouble bnc #355618
@@ -3242,8 +3397,8 @@
 -------------------------------------------------------------------
 Thu Dec 27 08:10:15 CET 2007 - crrodriguez@suse.de
 
-- PHP is leaking file descriptors badly on relative includes 
- (php-5.2.5-fdleak.patch) 
+- PHP is leaking file descriptors badly on relative includes
+ (php-5.2.5-fdleak.patch)
 
 
 -------------------------------------------------------------------
@@ -3256,13 +3411,13 @@
 - Fixed compilation problem on OS/X
 - Added protection against some attacks through _SERVER variables
 - Added suhosin.server.strip and suhosin.server.encode
- 
+
 
 -------------------------------------------------------------------
 Tue Dec 11 06:37:03 CET 2007 - crrodriguez@suse.de
 
 - use /dev/urandom for generating session-IDs #337005
-- L3: PHP: Venezuela Time Zone Update starting date changed to December 9 #345548 
+- L3: PHP: Venezuela Time Zone Update starting date changed to December 9 #345548
 
 -------------------------------------------------------------------
 Mon Nov 12 06:40:39 CET 2007 - crrodriguez@suse.de
@@ -3332,7 +3487,7 @@
 * Fixed bug #42139 (XMLReader option constants are broken using XML()). (Rob)
 * Fixed bug #42086 (SoapServer return Procedure '' not present for WSIBasic compliant wsdl). (Dmitry)
 * Fixed bug #41822 (Relative includes broken when getcwd() fails). (Ab5602, Jani)
- * Fixed bug #39651 (proc_open() append mode doesn't work on windows). (Nuno) 
+ * Fixed bug #39651 (proc_open() append mode doesn't work on windows). (Nuno)
 
 -------------------------------------------------------------------
 Thu Aug 30 03:52:35 CEST 2007 - crrodriguez@suse.de
@@ -3356,7 +3511,7 @@
 - Fixed bug #37273 (Symlinks and mod_files session handler allow open_basedir
 bypass). (Ilia)
 - remove wrong hardcoded requirement on libedit
-- devel package at least does not need libtool the php build enviroment uses a private copy. 
+- devel package at least does not need libtool the php build enviroment uses a private copy.
 - drop no longer needed patches already in upstream
 
 -------------------------------------------------------------------
@@ -3388,7 +3543,7 @@
 - Fixed bug #42082 (NodeList length zero should be empty). (Hannes)
 - Fixed bug #36492 (Userfilters can leak buckets). (Sara)
 - Fixed bug #31892 (PHP_SELF incorrect without cgi.fix_pathinfo, but turning
- on screws up PATH_INFO). (Dmitry) 
+ on screws up PATH_INFO). (Dmitry)
 
 -------------------------------------------------------------------
 Mon Aug 6 19:28:46 CEST 2007 - anosek@suse.cz
@@ -3445,13 +3600,13 @@
 Tue Jul 24 12:34:32 UTC 2007 - judas_iscariote@shorewall.net
 
 - fix nasty deadlock in pear
-- update php5-ze2-fixes.patch and actually apply it. 
+- update php5-ze2-fixes.patch and actually apply it.
 
 -------------------------------------------------------------------
 Tue Jul 17 07:52:46 CEST 2007 - anosek@suse.cz
 
 - fixed YOU honors Recommends, breaks php update #291551
- (moved php-suhosin from Recommends to Suggests) 
+ (moved php-suhosin from Recommends to Suggests)
 
 -------------------------------------------------------------------
 Mon Jun 25 12:07:56 CEST 2007 - mmarek@suse.cz
@@ -3462,7 +3617,7 @@
 -------------------------------------------------------------------
 Sat Jun 23 11:03:50 UTC 2007 - judas_iscariote@shorewall.net
 
-- fixed a mess with update-alternatives PreReq uncovered by newer build versions. 
+- fixed a mess with update-alternatives PreReq uncovered by newer build versions.
 actually every subpackage that uses update-alternatives should PreReq it.
 - fix some ZE2 bugs.
 
@@ -3483,7 +3638,7 @@
 
 - use system re2c in factory.
 - enable support for qbdm in the dba extension (build service only)
-- enable the ming extension (build service only) 
+- enable the ming extension (build service only)
 
 -------------------------------------------------------------------
 Mon May 21 12:00:45 CEST 2007 - mmarek@suse.cz
@@ -3555,7 +3710,7 @@
 Thu May 3 08:25:46 UTC 2007 - judas_iscariote@shorewall.net
 
 - upgrade to PHP 5.2.2, fixed hundreds of bugs including MOPB ones
- if you need the complete changes see http://www.php.net/ChangeLog-5.php#5.2.2 
+ if you need the complete changes see http://www.php.net/ChangeLog-5.php#5.2.2
 
 -------------------------------------------------------------------
 Thu May 3 04:47:57 UTC 2007 - judas_iscariote@shorewall.net
@@ -3589,7 +3744,7 @@
 Wed Mar 14 14:00:00 CET 2007 - judas_iscariote@shorewall.net
 
 - add security fixes for MOPB 20, 21 and 22.
-- RPM_BUILD_ROOT is never defined in %post. 
+- RPM_BUILD_ROOT is never defined in %post.
 
 -------------------------------------------------------------------
 Fri Mar 11 14:00:00 CET 2007 - judas_iscariote@shorewall.net
@@ -3599,7 +3754,7 @@
 Vulnerability.
 - add secfix for import_request_variables() ancient problem, users
 of suhosin extension are not affected.
-- Run the test suite here 
+- Run the test suite here
 
 -------------------------------------------------------------------
 Tue Mar 06 14:00:00 CET 2007 - judas_iscariote@shorewall.net
@@ -3610,7 +3765,7 @@
 -------------------------------------------------------------------
 Mon Mar 05 14:00:00 CET 2007 - judas_iscariote@shorewall.net
 
-- Update suhosin extension to version 0.9.17. see 
+- Update suhosin extension to version 0.9.17. see
 http://www.hardened-php.net/suhosin/changelog.html for details.
 
 -------------------------------------------------------------------
@@ -3645,7 +3800,7 @@
 takes care of this.
 * patch potential HTTP_SESSION_VARS et all hijack when
 register_globals is On users from suhosin extension are
- not affected.(php5-session-rgon-hijack.patch) 
+ not affected.(php5-session-rgon-hijack.patch)
 * on 10.2 and up php5-devel should require pcre-devel
 sqlite-devel sqlite2-devel
 * php5-devel is mostly useless without autoconf automake libtool
@@ -3660,7 +3815,7 @@
 Fri Jan 26 11:10:44 CET 2007 - mmarek@suse.cz
 
 - fixed string comparison in xmlrpc module (strcmp.patch)
-- allways apply %%patch9 
+- allways apply %%patch9
 
 -------------------------------------------------------------------
 Fri Jan 26 11:01:28 CET 2007 - mmarek@suse.cz
@@ -3672,7 +3827,7 @@
 Tue Dec 19 14:19:28 CET 2006 - anosek@suse.cz
 
 - fixed VUL-0: php session.save_path open_basedir bypass
- #227569 (save_path-secfix.patch) 
+ #227569 (save_path-secfix.patch)
 
 -------------------------------------------------------------------
 Wed Dec 6 16:42:52 CET 2006 - anosek@suse.cz
@@ -3755,7 +3910,7 @@
 * added version specific registry keys to allow different configurations for
 different php version
 * added "PHPINIDir" Apache directive to apache and apache_hooks SAPIs
- * added an optional boolean parameter to memory_get_usage() and 
+ * added an optional boolean parameter to memory_get_usage() and
 memory_get_peak_usage() to get memory size allocated by emalloc() or real
 size of memory allocated from system
 * moved extensions to PECL (filepro and hwapi)
@@ -3768,7 +3923,7 @@
 * build CLI with libedit support (really-with-libedit.patch)
 * tweaked the default config a bit, to make it more secure
 * removed ini entries related to extensions we don't ship
- * t1lib is not currently needed for build, we need t1lib5 to do 
+ * t1lib is not currently needed for build, we need t1lib5 to do
 something useful
 * removeed --enable-ucd-snmp-hack (needed for ucd-snmp, but we use net-snmp)
 * pdo_odbc provided by php-odbc
@@ -3778,7 +3933,7 @@
 * dropped extensions:
 o mysql, mysqli and pdo_mysql provided by php-mysql (reduce package count)
 o php-pdo_sqlite provided by php-sqlite
- o php-pdo_pgsql provided by php-pgsql 
+ o php-pdo_pgsql provided by php-pgsql
 o filepro dropped by upstream
 * new extension:
 o filter (kept static and cannot be unloaded, due security reasons)
@@ -3786,11 +3941,11 @@
 o zip (it uses a bundled library)
 
 - fixed gcc issues (gcc.patch)
-- droped obsoleted patches: include_path.patch, bug-37720.patch, 
+- droped obsoleted patches: include_path.patch, bug-37720.patch,
 bug-37306.patch, cgi_bugs.patch, bug-37587.patch, gd-fixes.patch,
- bug-37416.patch, main_bugs.patch, soap.patch, standard.patch, 
+ bug-37416.patch, main_bugs.patch, soap.patch, standard.patch,
 mbstring_bugs.patch, ze2_bugs.patch, xsl_bugs.patch, curl.patch
- 
+
 -------------------------------------------------------------------
 Wed Aug 16 14:01:02 CEST 2006 - postadal@suse.cz
 
@@ -3801,7 +3956,7 @@
 
 - updated to version 5.1.4
 * FastCGI interface was completely reimplemented
- * multitude of improvements to the SPL, SimpleXML, GD, CURL and 
+ * multitude of improvements to the SPL, SimpleXML, GD, CURL and
 Reflection extensions
 * support for many additional date formats added to the strtotime()
 * a performance improvements added to the engine and core extensions
@@ -3810,28 +3965,28 @@
 * upgraded bundled PCRE library to version 6.6
 
 - merged changes from openSUSE build service
- * removed unneeded sablot-devel,sqlite-devel,pcre-devel,fam-devel 
+ * removed unneeded sablot-devel,sqlite-devel,pcre-devel,fam-devel
 and libmcal from BuildRequires
 * added php-ctype,php-dom,php-iconv,php-pdo,php-pdo_sqlite,php-sqlite,
 php-tokenizer,php-xmlreader,php-xmlwriter to Recommends
 * added php-mbstring php-gd php-pear php-gettext php-mysqli to Suggests
- * added support for optional readline(libedit) for CLI 
+ * added support for optional readline(libedit) for CLI
 (disabled by default)
- * patches for zendengine (ze2_bugs.patch), xsl (xsl_bugs.patch), 
+ * patches for zendengine (ze2_bugs.patch), xsl (xsl_bugs.patch),
 curl (curl.patch) and mbstring bugs (mbstring_bugs.patch),
 big soap patch (soap.patch)
- * removed obsoleted patches 
+ * removed obsoleted patches
 * fixed Safe Mode Bypass #188243 (standard.patch)
- * upstream patches 
+ * upstream patches
 php#37306, php#37416, php#37587, php#37720
 php#37576, php#37496, php#37341, php#37313, php#37256 (cgi_bugs.patch)
 php#37346, php#37360 (gd-fixes.patch)
 * fixed build inconsistences, added php-hash module #173023
 * added pdo_odbc.so to php-odbc module #190614
 * build without explicit safe_mode and magic_quotes (unneeded)
- * removed useless GD --with-ttf configure option, only suitable 
+ * removed useless GD --with-ttf configure option, only suitable
 for freetype 1
- 
+
 -------------------------------------------------------------------
 Fri Jun 9 12:54:47 CEST 2006 - poeml@suse.de
 
@@ -3841,18 +3996,18 @@
 -------------------------------------------------------------------
 Thu May 11 12:55:32 CEST 2006 - postadal@suse.cz
 
-- fixed memory leak in imagecreatefromgif() 
+- fixed memory leak in imagecreatefromgif()
 #173451 (phpbug-37346.patch)
-- fixed possibility of a wrong element being deleted by zend_hash_del() 
+- fixed possibility of a wrong element being deleted by zend_hash_del()
 #175976 (zend_hash_del.patch)
-- fixed substr_compare() when offset equals string length 
+- fixed substr_compare() when offset equals string length
 #169038, php#37394 (CVE-2006-1991, phpbug-37394.patch)
 - fixed _emalloc() on 64bit archs #169038 (emalloc.patch)
 
 -------------------------------------------------------------------
 Wed May 3 15:16:05 CEST 2006 - postadal@suse.cz
 
-- fixed completely broken SplTempFileObject php#37257 
+- fixed completely broken SplTempFileObject php#37257
 (phpbug-37257.patch)
 - fixed problem with with $_POST array php#37276
 (phpbug-37276.patch)
@@ -3860,7 +4015,7 @@
 -------------------------------------------------------------------
 Wed Apr 12 15:24:24 CEST 2006 - postadal@suse.cz
 
-- fixed security problem in copy() and tempname() 
+- fixed security problem in copy() and tempname()
 #164845 (CVE-2006-1494-1608.patch)
 - fixed phpinfo() XSS #164804 (CVE-2006-0996.patch)
 - fixed memory leak in html_entity_decode #161718 (CVE-2006-1490.patch)
@@ -3910,7 +4065,7 @@
 Fri Feb 10 19:32:13 CET 2006 - postadal@suse.cz
 
 - fixed upstream bugs:
- php#36306 (phpbug-36306.patch) 
+ php#36306 (phpbug-36306.patch)
 - fixed crc32() for 64bit arch
 php#36351 (phpbug-36351.patch)
 - parse_url() did not parse numeric paths properly
@@ -3937,11 +4092,11 @@
 
 - removed gd-devel from BuildRequires (better used bundled modified gd lib)
 - fixed upstream bugs:
- php#36268 (phpbug-36268.patch) 
- php#36148 (phpbug-36148.patch) 
- php#36185 (phpbug-36185.patch) 
- php#36208 (phpbug-36208.patch) 
- php#36158 (phpbug-36158.patch) 
+ php#36268 (phpbug-36268.patch)
+ php#36148 (phpbug-36148.patch)
+ php#36185 (phpbug-36185.patch)
+ php#36208 (phpbug-36208.patch)
+ php#36158 (phpbug-36158.patch)
 
 -------------------------------------------------------------------
 Tue Jan 31 14:08:55 CET 2006 - postadal@suse.cz
@@ -3953,9 +4108,9 @@
 
 - fixed upstream bugs:
 php#36176 (phpbug-36176.patch)
- (pdo.patch) 
+ (pdo.patch)
 - properly rewrite queries where a bound parameter appears more then once
- 
+
 -------------------------------------------------------------------
 Mon Jan 30 13:59:35 CET 2006 - poeml@suse.de
 
@@ -3970,11 +4125,11 @@
 -------------------------------------------------------------------
 Tue Jan 24 16:03:31 CET 2006 - postadal@suse.cz
 
-- added php5-pdo to requires for pdo_mysql, pdo_pgsql, pdo_sqlite and 
+- added php5-pdo to requires for pdo_mysql, pdo_pgsql, pdo_sqlite and
 sqlite and php5-dom to requires for xmlreader and xsl #144360
 - revert name of extensions (appended suffix .so) #143552
-- removed _FILE_OFFSET_BITS=64 and _LARGEFILE_SOURCE from CFLAGS 
- (doesn't work with apache2 configuration, which uses libapr with 
+- removed _FILE_OFFSET_BITS=64 and _LARGEFILE_SOURCE from CFLAGS
+ (doesn't work with apache2 configuration, which uses libapr with
 native support for large files) #144362
 - added -fstack-protector
 
@@ -3987,12 +4142,12 @@
 php#36071 (phpbug-36011.patch)
 php#36016 (phpbug-36016.patch)
 - realpath cache memleaks
- php#36071 (phpbug-36071.patch) 
- - Zend engine crash related with 'clone' 
- (zend-fix.patch) 
- - fix issues with static method invocation 
+ php#36071 (phpbug-36071.patch)
+ - Zend engine crash related with 'clone'
+ (zend-fix.patch)
+ - fix issues with static method invocation
 - ce_child is properly initialized
- php#36046 (phpbug-36046.patch) 
+ php#36046 (phpbug-36046.patch)
 - parse_ini_file() miscounts lines in multi-line values
 php#36037 (phpbug-36037.patch)
 - heredoc adds extra line number
@@ -4041,9 +4196,9 @@
 
 - updated to version 5.1.1 #135635, #139297
 - removed obsoleted patches: php5-with_lib.patch, soap.patch, posix.patch,
- gcc4.patch, save_path-segfault.patch, basedir-fix.patch, 
+ gcc4.patch, save_path-segfault.patch, basedir-fix.patch,
 RPC-CAN-2005-1921.patch, RPC-CAN-2005-2498.patch, pcre-overflow-bug-106209.patch,
- CVE-2005-3388.patch, CVE-2005-3389.patch, CVE-2005-3390.patch, 
+ CVE-2005-3388.patch, CVE-2005-3389.patch, CVE-2005-3390.patch,
 mod_rewrite-fix.patch, mbstring.patch, CVE-2005-3391.patch, CVE-2005-3392.patch,
 errordocument-fix.patch
 - removed sqlite2 from build dependencies and added libtidy libtidy-devel
@@ -4114,7 +4269,7 @@
 #131579 (CVE-2005-3389.patch)
 - fixed possible $GLOBALS overwrite
 #131580 (CVE-2005-3390.patch)
-- fixed handling basedirs that end with a / 
+- fixed handling basedirs that end with a /
 #118976 (basedir-fix.patch)
 - fixed segfaulting when save_path is set and safe_mode is On
 #130227 (save_path-segfault.patch)
@@ -4144,7 +4299,7 @@
 -------------------------------------------------------------------
 Thu Sep 1 15:58:30 CEST 2005 - postadal@suse.cz
 
-- added security patch pcre-overflow-bug-106209.patch for internal 
+- added security patch pcre-overflow-bug-106209.patch for internal
 libpcre and statically linked against it #114157
 - added include_path = "/usr/share/php" to php.ini #114406
 
@@ -4156,7 +4311,7 @@
 -------------------------------------------------------------------
 Thu Aug 18 17:28:55 CEST 2005 - postadal@suse.cz
 
-- fixed XML RPC command injection 
+- fixed XML RPC command injection
 (#94579, CAN-2005-192 and #104403, CAN-2005-2498)
 
 -------------------------------------------------------------------
@@ -4288,7 +4443,7 @@
 -------------------------------------------------------------------
 Thu Nov 18 15:40:36 CET 2004 - ro@suse.de
 
-- use kerberos-devel-packages 
+- use kerberos-devel-packages
 
 -------------------------------------------------------------------
 Thu Nov 4 16:07:12 CET 2004 - ro@suse.de
@@ -4453,7 +4608,7 @@
 -------------------------------------------------------------------
 Mon Nov 10 15:55:51 CET 2003 - ro@suse.de
 
-- use net-snmp instead of ucdsnmp 
+- use net-snmp instead of ucdsnmp
 
 -------------------------------------------------------------------
 Thu Oct 30 09:04:02 CET 2003 - tcrhak@suse.cz
@@ -4500,7 +4655,7 @@
 Mon Jun 30 12:14:50 CEST 2003 - ro@suse.de
 
 - always use libtool to compile objects
-- added directories to filelist 
+- added directories to filelist
 
 -------------------------------------------------------------------
 Thu Apr 10 12:58:19 CEST 2003 - tcrhak@suse.cz
@@ -4542,7 +4697,7 @@
 -------------------------------------------------------------------
 Thu Feb 13 23:40:55 CET 2003 - ro@suse.de
 
-- really disable (empty) subpackage servlet 
+- really disable (empty) subpackage servlet
 
 -------------------------------------------------------------------
 Wed Feb 12 15:03:09 CET 2003 - poeml@suse.de
@@ -4558,7 +4713,7 @@
 -------------------------------------------------------------------
 Wed Jan 15 16:28:35 CET 2003 - ro@suse.de
 
-- use sasl2 
+- use sasl2
 
 -------------------------------------------------------------------
 Fri Jan 10 15:50:43 CET 2003 - poeml@suse.de
@@ -4601,7 +4756,7 @@
 -------------------------------------------------------------------
 Thu Nov 21 18:35:27 CET 2002 - ro@suse.de
 
-- make it build with current automake 
+- make it build with current automake
 
 -------------------------------------------------------------------
 Wed Oct 16 18:54:17 CEST 2002 - tcrhak@suse.cz
@@ -4617,7 +4772,7 @@
 -------------------------------------------------------------------
 Wed Sep 18 01:50:00 CEST 2002 - ro@suse.de
 
-- removed bogus self-provides 
+- removed bogus self-provides
 
 -------------------------------------------------------------------
 Tue Sep 03 22:47:14 CEST 2002 - tcrhak@suse.cz
@@ -4649,7 +4804,7 @@
 -------------------------------------------------------------------
 Mon Aug 5 11:54:12 CEST 2002 - ro@suse.de
 
-- use "-follow" when searching for jni.h 
+- use "-follow" when searching for jni.h
 
 -------------------------------------------------------------------
 Sun Jul 28 08:49:53 CEST 2002 - kukuk@suse.de
@@ -4671,7 +4826,7 @@
 
 - update to version 4.2.2
 - update of asp2php to version 0.76.12
-- detect the module magic number if provided by apache, indicating 
+- detect the module magic number if provided by apache, indicating
 API changes, and add an RPM Require on it
 - add compiled extensions (currently gd.so, as it is build shared
 by a previous change by bk@suse.de) to php.ini and filelist
@@ -4684,12 +4839,12 @@
 -------------------------------------------------------------------
 Tue May 28 02:09:57 CEST 2002 - ro@suse.de
 
-- replaced /opt/jakarta with /opt/jakarta/tomcat 
+- replaced /opt/jakarta with /opt/jakarta/tomcat
 
 -------------------------------------------------------------------
 Mon May 27 18:19:38 CEST 2002 - ro@suse.de
 
-- first try for lib64 
+- first try for lib64
 
 -------------------------------------------------------------------
 Mon May 27 16:25:28 CEST 2002 - bk@suse.de
@@ -4699,7 +4854,7 @@
 -------------------------------------------------------------------
 Sat Mar 23 09:59:10 CET 2002 - ro@suse.de
 
-- removed unixODBC stuff, was never used (iodbc is used) 
+- removed unixODBC stuff, was never used (iodbc is used)
 
 -------------------------------------------------------------------
 Fri Mar 15 11:51:11 CET 2002 - tcrhak@suse.cz
@@ -4723,22 +4878,22 @@
 -------------------------------------------------------------------
 Mon Jan 28 12:40:33 CET 2002 - ro@suse.de
 
-- added des to neededforbuild 
+- added des to neededforbuild
 
 -------------------------------------------------------------------
 Mon Jan 28 01:35:33 CET 2002 - ro@suse.de
 
-- added heimdal stuff to build 
+- added heimdal stuff to build
 
 -------------------------------------------------------------------
 Wed Jan 23 01:59:36 CET 2002 - ro@suse.de
 
-- try to build with db-devel in neededforbuild 
+- try to build with db-devel in neededforbuild
 
 -------------------------------------------------------------------
 Thu Jan 17 01:07:13 CET 2002 - ro@suse.de
 
-- adapted for /etc/sysconfig/apache 
+- adapted for /etc/sysconfig/apache
 
 -------------------------------------------------------------------
 Thu Dec 20 14:16:12 CET 2001 - tcrhak@suse.cz
@@ -4768,7 +4923,7 @@
 - TTF - bug 9523
 - gd - bug 12226
 - changed the order in which subpackages (for Servers) are built,
-- so that the devel package corresponds to core 
+- so that the devel package corresponds to core
 - (=> experimental-zts disabled)
 - moved phpize to the devel package (fixed for autoconf 2.52)
 - added files needed by phpize to the devel package
@@ -4776,12 +4931,12 @@
 -------------------------------------------------------------------
 Mon Dec 3 14:57:15 CET 2001 - ro@suse.de
 
-- changed servlet dir for configure with jakarta 
+- changed servlet dir for configure with jakarta
 
 -------------------------------------------------------------------
 Mon Dec 3 09:31:42 CET 2001 - ro@suse.de
 
-- fixed neededforbuild <jakarta> to <jakarta-tomcat> 
+- fixed neededforbuild <jakarta> to <jakarta-tomcat>
 
 -------------------------------------------------------------------
 Tue Nov 20 16:47:27 CET 2001 - rolf@suse.de
@@ -4792,7 +4947,7 @@
 -------------------------------------------------------------------
 Mon Nov 19 00:51:02 CET 2001 - ro@suse.de
 
-- fix to find java 
+- fix to find java
 
 -------------------------------------------------------------------
 Wed Nov 14 17:41:40 CET 2001 - rolf@suse.de
@@ -4802,34 +4957,34 @@
 -------------------------------------------------------------------
 Mon Nov 12 17:22:02 CET 2001 - ro@suse.de
 
-- hack for libxml2 include location 
+- hack for libxml2 include location
 
 -------------------------------------------------------------------
 Fri Oct 26 01:36:56 CEST 2001 - ro@suse.de
 
-- use qt2 for qtdom (but aparently that is not built anyway) 
+- use qt2 for qtdom (but aparently that is not built anyway)
 
 -------------------------------------------------------------------
 Thu Oct 25 01:06:13 CEST 2001 - ro@suse.de
 
-- try neededforbuild alias apache-devel-packages 
+- try neededforbuild alias apache-devel-packages
 
 -------------------------------------------------------------------
 Tue Sep 11 00:01:57 CEST 2001 - ro@suse.de
 
 - remove roxen subpackage
- roxen is not in the distribution currently 
+ roxen is not in the distribution currently
 
 -------------------------------------------------------------------
 Wed Aug 22 13:11:37 CEST 2001 - ro@suse.de
 
-- removed pdflib from neededforbuild (license problems) 
+- removed pdflib from neededforbuild (license problems)
 
 -------------------------------------------------------------------
 Tue Aug 14 09:26:15 CEST 2001 - ro@suse.de
 
 - pear: changed header to look for php in "bindir" not "prefix/bin"
- to fix requires 
+ to fix requires
 
 -------------------------------------------------------------------
 Mon Aug 13 16:34:01 CEST 2001 - kukuk@suse.de
@@ -4912,12 +5067,12 @@
 -------------------------------------------------------------------
 Wed Mar 21 23:27:14 CET 2001 - ro@suse.de
 
-- changed neededforbuild to freetype2 
+- changed neededforbuild to freetype2
 
 -------------------------------------------------------------------
 Thu Mar 15 14:16:49 CET 2001 - ro@suse.de
 
-- build with openldap2 
+- build with openldap2
 
 -------------------------------------------------------------------
 Thu Mar 15 01:08:35 CET 2001 - ro@suse.de
@@ -4927,7 +5082,7 @@
 -------------------------------------------------------------------
 Mon Mar 5 23:58:57 CET 2001 - ro@suse.de
 
-- use -fPIC 
+- use -fPIC
 
 -------------------------------------------------------------------
 Fri Feb 23 16:24:24 CET 2001 - ro@suse.de
@@ -5006,17 +5161,17 @@
 -------------------------------------------------------------------
 Thu Nov 9 00:27:01 CET 2000 - ro@suse.de
 
-- prefer ndbm.h to db1/ndbm.h 
+- prefer ndbm.h to db1/ndbm.h
 
 -------------------------------------------------------------------
 Mon Nov 6 10:11:58 CET 2000 - ro@suse.de
 
-- added imap-devel to neededforbuild 
+- added imap-devel to neededforbuild
 
 -------------------------------------------------------------------
 Mon Nov 6 01:17:41 CET 2000 - ro@suse.de
 
-- fixed neededforbuild 
+- fixed neededforbuild
 
 -------------------------------------------------------------------
 Mon Oct 16 17:58:45 GMT 2000 - bk@suse.de
@@ -5048,7 +5203,7 @@
 -------------------------------------------------------------------
 Mon Jun 19 00:01:12 CEST 2000 - ro@suse.de
 
-- fixed to compile with new postgres 
+- fixed to compile with new postgres
 
 -------------------------------------------------------------------
 Mon May 22 13:50:13 CEST 2000 - rolf@suse.de

php8.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -40,25 +40,28 @@
 %define psuffix %{nil}
 %endif
 
-%global php_vhng_branch 8.1
-
-%define debug_build 0
-%define asan_build 0
+%global php_vhng_branch 8.1
 %global apiver 20210902
 %global zendver 20210902
 %define extension_dir %{_libdir}/%{php_name}/extensions
 %define php_sysconf %{_sysconfdir}/%{php_name}
-%define build_firebird 0
-%define build_sodium 1
-%define build_argon2 0
+
+%bcond_without	apparmor
 %if 0%{?suse_version} >= 1500
-%define build_argon2 1
+%bcond_without	argon2
+%else
+%bcond_with	argon2
 %endif
+%bcond_with	asan
+%bcond_with	debug
+%bcond_with	firebird
+%bcond_without	sodium
+
 Name: %{pprefix}%{php_name}%{psuffix}
-Version: 8.1.13
+Version: 8.1.21
 Release: 0
 Summary: Interpreter for the PHP scripting language version 8
-License: PHP-3.01
+License: MIT AND PHP-3.01
 Group: Development/Libraries/PHP
 URL: https://secure.php.net
 Source0: https://secure.php.net/distributions/php-%{version}.tar.xz
@@ -66,7 +69,10 @@
 Source2: %{php_name}-fpm.conf
 Source5: README.macros
 Source6: macros.php
-Source8: https://secure.php.net/distributions/php-%{version}.tar.xz.asc
+# temporarily repacked tarball https://github.com/php/php-src/issues/11300
+#Source8: https://secure.php.net/distributions/php-%{version}.tar.xz.asc
+Source7: repack.sh
+Source8: php-unicode-allow-redistribution.patch
 #Source9: https://www.php.net/distributions/php-keyring.gpg#/%%{php_name}.keyring
 Source9: %{php_name}.keyring
 Source11: %{php_name}.rpmlintrc
@@ -82,18 +88,12 @@
 # SUSE specific ini defaults
 Patch3: php-ini.patch
 # use of the system timezone database
-Patch4: php-systzdata-v21.patch
+Patch4: php-systzdata-v23.patch
 # adjust upstream systemd unit to SUSE needs
 Patch5: php-systemd-unit.patch
 # PATCH-FEATURE-OPENSUSE use ordered input files for reproducible /usr/bin/phar.phar
 Patch6: php-sort-filelist-phar.patch
 ## Bugfix patches
-# following patch is to fix configure tests for crypt; the aim is to have php
-# built against glibc's crypt; problem is, that our glibc doesn't support extended
-# DES, so as soon as upstream fixes this, don't forgot to remove extended DES
-# from their checking as I indicated in crypt-tests.patch yet, or php will
-# silently use his own implementation again
-Patch20: php-crypt-tests.patch
 # should be upstreamed, will do later
 Patch22: php-date-regenerate-lexers.patch
 # PATCH-FEATURE-UPSTREAM https://github.com/php/php-src/pull/6564
@@ -109,7 +109,6 @@
 BuildRequires: gpg2
 BuildRequires: imap-devel
 BuildRequires: libacl-devel
-BuildRequires: libapparmor-devel
 BuildRequires: libbz2-devel
 BuildRequires: libtidy-devel
 BuildRequires: libtiff-devel
@@ -149,15 +148,18 @@
 BuildRequires: pkgconfig(openssl) >= 1.0.2
 BuildRequires: pkgconfig(sqlite3) >= 3.7.7
 BuildRequires: pkgconfig(zlib) >= 1.2.0.4
-%if %{build_firebird}
+%if %{with apparmor}
+BuildRequires: pkgconfig(libapparmor)
+%endif
+%if %{with firebird}
 # firebird-devel was merged into libfbclient2-devel for firebird 3
 BuildRequires: firebird-devel
 BuildRequires: libfbclient2-devel
 %endif
-%if %{build_sodium}
+%if %{with sodium}
 BuildRequires: pkgconfig(libsodium) >= 1.0.8
 %endif
-%if %{build_argon2}
+%if %{with argon2}
 BuildRequires: pkgconfig(libargon2)
 %endif
 %if "%{flavor}" == "test"
@@ -347,6 +349,7 @@
 Requires(post): %{_sbindir}/a2enmod
 Supplements: (php-fpm and apache2)
 Conflicts: mod_php_any
+BuildArch: noarch
 
 %description apache
 Configuration for Apache to pass all requests for PHP scripts to the
@@ -622,7 +625,7 @@
 %description mysql
 PHP functions for access to MySQL database servers.
 
-%if %{build_firebird}
+%if %{with firebird}
 %package firebird
 Summary: Firebird database client for PHP
 Group: Development/Libraries/PHP
@@ -811,7 +814,7 @@
 communication functions based on the BSD sockets API, providing the
 possibility to act as a socket server as well as a client.
 
-%if %{build_sodium}
+%if %{with sodium}
 %package sodium
 Summary: Cryptographic Extension Based on Libsodium
 Group: Development/Libraries/PHP
@@ -965,7 +968,6 @@
 compressed files, through versions of most of the filesystem
 functions which work with gzip-compressed files (and uncompressed
 files, too, but not with sockets).
-%endif
 
 %package imap
 Summary: IMAP protocol support for PHP
@@ -974,6 +976,8 @@
 Provides: php-imap = %{version}
 Obsoletes: php5-imap
 
+%endif
+
 %description imap
 These functions enable you to operate with the IMAP protocol, as well
 as the NNTP, POP3 and local mailbox access methods.
@@ -1006,18 +1010,31 @@
 exit 1
 fi
 
+if grep -r 'specifically excludes the right'; then
+ echo
+ echo "https://github.com/php/php-src/issues/11300"
+ echo "please run repack.sh"
+ exit 1
+fi
+
 %build
+%if 150000 <= 0%{?sle_version} && 0%{?sle_version} <= 150200
+# former libcrypt does not support extended DES, so the build would fail
+# with --with-external-libcrypt
+sed -i 's:|| test "$ac_cv_crypt_ext_des" = "no"::' ext/standard/config.m4
+%endif
+
 # regenerate configure etc.
 ./buildconf --force
 
 # export flags
 CFLAGS="%{optflags} -O3 -fPIE -fPIC -DPIC -D_GNU_SOURCE -fno-strict-aliasing"
 CXXFLAGS="%{optflags} -O3 -fPIE -fPIC -DPIC -D_GNU_SOURCE -fno-strict-aliasing"
-%if %{build_firebird}
+%if %{with firebird}
 CFLAGS="$CFLAGS -I/usr/include/firebird"
 CXXFLAGS="$CXXFLAGS -I/usr/include/firebird"
 %endif
-%if %{debug_build}
+%if %{with debug}
 CFLAGS="$CFLAGS -Og"
 CXXFLAGS="$CXXFLAGS -Og"
 %endif
@@ -1061,9 +1078,10 @@
 --with-gnu-ld \
 --enable-re2c-cgoto \
 --with-system-tzdata=%{_datadir}/zoneinfo \
+ --with-external-libcrypt \
 --with-mhash \
 --disable-phpdbg \
-%if %{build_argon2}
+%if %{with argon2}
 --with-password-argon2=%{_usr} \
 %endif
 "$@" || { cat config.log; exit 1; }
@@ -1083,7 +1101,7 @@
 if $sapi == apache2 ; then
 sed -i 's/libphp/mod_%{php_name}/g' Makefile
 fi
-%if %{asan_build}
+%if %{with asan}
 sed -i -e 's/$^CFLAGS.*$/\1 -fsanitize=address/' \
 -e 's/$^EXTRA_LIBS =.*$/\1 -lasan/' \
 Makefile
@@ -1111,7 +1129,9 @@
 Build fpm \
 --enable-fpm \
 --with-fpm-acl \
+%if %{with apparmor}
 --with-fpm-apparmor \
+%endif
 --with-fpm-systemd \
 --with-fpm-user=%{apache_user} \
 --with-fpm-group=%{apache_group} \
@@ -1189,12 +1209,12 @@
 --with-pdo-sqlite=shared \
 --with-sqlite3=shared \
 --with-pdo-mysql=shared,mysqlnd \
-%if %{build_firebird}
+%if %{with firebird}
 --with-pdo-firebird=shared \
 %endif
 --with-pdo-pgsql=shared,%{_usr} \
 --with-pdo-odbc=shared,unixODBC,%{_usr} \
-%if %{build_sodium}
+%if %{with sodium}
 --with-sodium=shared \
 %endif
 --enable-opcache=shared \
@@ -1205,7 +1225,7 @@
 %endif
 
 %check
-%if %{asan_build}
+%if %{with asan}
 # no need for ASAN build
 exit 0
 %endif
@@ -1307,14 +1327,24 @@
 f=${f%.so}
 fi
 ext=${f##*/}
- echo "; comment out next line to disable $ext extension in php" > %{buildroot}%{php_sysconf}/conf.d/$ext.ini
 zend_=''
- if $ext == "opcache" ; then
- # https://secure.php.net/manual/en/opcache.installation.php
- zend_='zend_'
- fi
- echo "${zend_}extension=$ext.so" >> %{buildroot}%{php_sysconf}/conf.d/$ext.ini
+ case $ext in
+ # priority 0 (will be loaded first)
+ opcache)
+ ini_name=00-${ext}
+ zend_='zend_';;
+ # priority 2 (will be loaded after < 2)
+ pdo_*|mysqli|xmlreader)
+ ini_name=20-${ext};;
+ # priority 1 (will be loaded after < 1)
+ *)
+ ini_name=10-${ext};;
+ esac
+ echo "; comment out next line to disable $ext extension in php" > %{buildroot}%{php_sysconf}/conf.d/${ini_name}.ini
+ echo "${zend_}extension=$ext.so" >> %{buildroot}%{php_sysconf}/conf.d/${ini_name}.ini
 done
+# directory for sessions
+install -d %{buildroot}%{_localstatedir}/lib/%{php_name}/sessions
 # fix symlink (bnc#734176)
 ln -s %{_bindir}/php %{buildroot}%{_bindir}/%{php_name}
 # install the macros file:
@@ -1324,8 +1354,6 @@
 # install missing SAPI headers for embed
 install -d %{buildroot}%{_includedir}/%{php_name}/sapi/embed
 install -m 644 sapi/embed/php_embed.h %{buildroot}%{_includedir}/%{php_name}/sapi/embed/php_embed.h
-# mysqlnd must be loaded before mysqli (undefined symbol: mysqlnd_global_stats)
-mv %{buildroot}%{php_sysconf}/conf.d/{,_}mysqlnd.ini
 # fix file contains a shebang
 for f in %{buildroot}%{_datadir}/%{php_name}/build/{gen_stub.php,run-tests.php}; do
 sed -i '1{s|env ||}' $f
@@ -1369,17 +1397,7 @@
 %service_del_preun php-fpm.service
 
 %postun
-# do not try-restart yet as extensions may be updated too
-%if 0%{?suse_version} > 1500
-%service_del_postun_without_restart php-fpm.service
-%else
 %service_del_postun php-fpm.service
-%endif
-
-%posttrans
-if -x /usr/bin/systemctl ; then
-%_restart_on_update php-fpm.service
-fi
 
 %post apache
 if $1 -eq 1 ; then
@@ -1415,6 +1433,8 @@
 %dir %{extension_dir}
 %dir %{php_sysconf}
 %dir %{php_sysconf}/conf.d
+%attr(0755, %{apache_user}, root) %dir %{_localstatedir}/lib/%{php_name}
+%attr(0755, %{apache_user}, root) %dir %{_localstatedir}/lib/%{php_name}/sessions
 
 %files cli
 %defattr(-, root, root)
@@ -1487,32 +1507,32 @@
 %files bcmath
 %defattr(-, root, root)
 %{extension_dir}/bcmath.so
-%config(noreplace) %{php_sysconf}/conf.d/bcmath.ini
+%config(noreplace) %{php_sysconf}/conf.d/*bcmath.ini
 
 %files bz2
 %defattr(-, root, root)
 %{extension_dir}/bz2.so
-%config(noreplace) %{php_sysconf}/conf.d/bz2.ini
+%config(noreplace) %{php_sysconf}/conf.d/*bz2.ini
 
 %files calendar
 %defattr(-, root, root)
 %{extension_dir}/calendar.so
-%config(noreplace) %{php_sysconf}/conf.d/calendar.ini
+%config(noreplace) %{php_sysconf}/conf.d/*calendar.ini
 
 %files ctype
 %defattr(-, root, root)
 %{extension_dir}/ctype.so
-%config(noreplace) %{php_sysconf}/conf.d/ctype.ini
+%config(noreplace) %{php_sysconf}/conf.d/*ctype.ini
 
 %files curl
 %defattr(-, root, root)
 %{extension_dir}/curl.so
-%config(noreplace) %{php_sysconf}/conf.d/curl.ini
+%config(noreplace) %{php_sysconf}/conf.d/*curl.ini
 
 %files dba
 %defattr(-, root, root)
 %{extension_dir}/dba.so
-%config(noreplace) %{php_sysconf}/conf.d/dba.ini
+%config(noreplace) %{php_sysconf}/conf.d/*dba.ini
 
 %files dblib
 %defattr(644,root,root,755)
@@ -1522,220 +1542,225 @@
 %files dom
 %defattr(-, root, root)
 %{extension_dir}/dom.so
-%config(noreplace) %{php_sysconf}/conf.d/dom.ini
+%config(noreplace) %{php_sysconf}/conf.d/*dom.ini
 
 %files enchant
 %defattr(-, root, root)
 %{extension_dir}/enchant.so
-%config(noreplace) %{php_sysconf}/conf.d/enchant.ini
+%config(noreplace) %{php_sysconf}/conf.d/*enchant.ini
 
 %files exif
 %defattr(-, root, root)
 %{extension_dir}/exif.so
-%config(noreplace) %{php_sysconf}/conf.d/exif.ini
+%config(noreplace) %{php_sysconf}/conf.d/*exif.ini
 
 %files ffi
 %defattr(-, root, root)
 %{extension_dir}/ffi.so
-%config(noreplace) %{php_sysconf}/conf.d/ffi.ini
+%config(noreplace) %{php_sysconf}/conf.d/*ffi.ini
 
 %files fileinfo
 %defattr(-, root, root)
 %{extension_dir}/fileinfo.so
-%config(noreplace) %{php_sysconf}/conf.d/fileinfo.ini
+%config(noreplace) %{php_sysconf}/conf.d/*fileinfo.ini
 
 %files ftp
 %defattr(-, root, root)
 %{extension_dir}/ftp.so
-%config(noreplace) %{php_sysconf}/conf.d/ftp.ini
+%config(noreplace) %{php_sysconf}/conf.d/*ftp.ini
 
 %files gd
 %defattr(-, root, root)
 %{extension_dir}/gd.so
-%config(noreplace) %{php_sysconf}/conf.d/gd.ini
+%config(noreplace) %{php_sysconf}/conf.d/*gd.ini
 
 %files gettext
 %defattr(-, root, root)
 %{extension_dir}/gettext.so
-%config(noreplace) %{php_sysconf}/conf.d/gettext.ini
+%config(noreplace) %{php_sysconf}/conf.d/*gettext.ini
 
 %files gmp
 %defattr(-, root, root)
 %{extension_dir}/gmp.so
-%config(noreplace) %{php_sysconf}/conf.d/gmp.ini
+%config(noreplace) %{php_sysconf}/conf.d/*gmp.ini
 
 %files iconv
 %defattr(-, root, root)
 %{extension_dir}/iconv.so
-%config(noreplace) %{php_sysconf}/conf.d/iconv.ini
+%config(noreplace) %{php_sysconf}/conf.d/*iconv.ini
 
 %files intl
 %defattr(-, root, root)
 %{extension_dir}/intl.so
-%config(noreplace) %{php_sysconf}/conf.d/intl.ini
+%config(noreplace) %{php_sysconf}/conf.d/*intl.ini
 
 %files ldap
 %defattr(-, root, root)
 %{extension_dir}/ldap.so
-%config(noreplace) %{php_sysconf}/conf.d/ldap.ini
+%config(noreplace) %{php_sysconf}/conf.d/*ldap.ini
 
 %files mbstring
 %defattr(-, root, root)
 %{extension_dir}/mbstring.so
-%config(noreplace) %{php_sysconf}/conf.d/mbstring.ini
+%config(noreplace) %{php_sysconf}/conf.d/*mbstring.ini
 
 %files mysql
 %defattr(-, root, root)
 %{extension_dir}/mysqli.so
-%config(noreplace) %{php_sysconf}/conf.d/mysqli.ini
+%config(noreplace) %{php_sysconf}/conf.d/*mysqli.ini
 %{extension_dir}/mysqlnd.so
-%config(noreplace) %{php_sysconf}/conf.d/_mysqlnd.ini
+%config(noreplace) %{php_sysconf}/conf.d/*mysqlnd.ini
 %{extension_dir}/pdo_mysql.so
-%config(noreplace) %{php_sysconf}/conf.d/pdo_mysql.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pdo_mysql.ini
 
-%if %{build_firebird}
+%if %{with firebird}
 %files firebird
 %defattr(-, root, root)
 %{extension_dir}/pdo_firebird.so
-%config(noreplace) %{php_sysconf}/conf.d/pdo_firebird.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pdo_firebird.ini
 %endif
 
 %files odbc
 %defattr(-, root, root)
 %{extension_dir}/odbc.so
-%config(noreplace) %{php_sysconf}/conf.d/odbc.ini
+%config(noreplace) %{php_sysconf}/conf.d/*odbc.ini
 %{extension_dir}/pdo_odbc.so
-%config(noreplace) %{php_sysconf}/conf.d/pdo_odbc.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pdo_odbc.ini
 
 %files opcache
 %defattr(-, root, root)
 %{extension_dir}/opcache.so
-%config(noreplace) %{php_sysconf}/conf.d/opcache.ini
+%config(noreplace) %{php_sysconf}/conf.d/*opcache.ini
 
 %files openssl
 %defattr(-, root, root)
 %{extension_dir}/openssl.so
-%config(noreplace) %{php_sysconf}/conf.d/openssl.ini
+%config(noreplace) %{php_sysconf}/conf.d/*openssl.ini
 
 %files phar
 %defattr(-, root, root)
 %{_mandir}/man1/phar.1%{?ext_man}
 %{_mandir}/man1/phar.phar.1%{?ext_man}
 %{extension_dir}/phar.so
-%config(noreplace) %{php_sysconf}/conf.d/phar.ini
+%config(noreplace) %{php_sysconf}/conf.d/*phar.ini
 %{_bindir}/phar
 %{_bindir}/phar.phar
 
 %files pcntl
 %defattr(-, root, root)
 %{extension_dir}/pcntl.so
-%config(noreplace) %{php_sysconf}/conf.d/pcntl.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pcntl.ini
 
 %files pdo
 %defattr(-, root, root)
 %{extension_dir}/pdo.so
-%config(noreplace) %{php_sysconf}/conf.d/pdo.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pdo.ini
 
 %files pgsql
 %defattr(-, root, root)
 %{extension_dir}/pgsql.so
-%config(noreplace) %{php_sysconf}/conf.d/pgsql.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pgsql.ini
 %{extension_dir}/pdo_pgsql.so
-%config(noreplace) %{php_sysconf}/conf.d/pdo_pgsql.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pdo_pgsql.ini
 
 %files posix
 %defattr(-, root, root)
 %{extension_dir}/posix.so
-%config(noreplace) %{php_sysconf}/conf.d/posix.ini
+%config(noreplace) %{php_sysconf}/conf.d/*posix.ini
 
 %files readline
 %defattr(-, root, root)
 %{extension_dir}/readline.so
-%config(noreplace) %{php_sysconf}/conf.d/readline.ini
+%config(noreplace) %{php_sysconf}/conf.d/*readline.ini
 
 %files shmop
 %defattr(-, root, root)
 %{extension_dir}/shmop.so
-%config(noreplace) %{php_sysconf}/conf.d/shmop.ini
+%config(noreplace) %{php_sysconf}/conf.d/*shmop.ini
 
 %files snmp
 %defattr(-, root, root)
 %{extension_dir}/snmp.so
-%config(noreplace) %{php_sysconf}/conf.d/snmp.ini
+%config(noreplace) %{php_sysconf}/conf.d/*snmp.ini
 
 %files soap
 %defattr(-, root, root)
 %{extension_dir}/soap.so
-%config(noreplace) %{php_sysconf}/conf.d/soap.ini
+%config(noreplace) %{php_sysconf}/conf.d/*soap.ini
 
-%if %{build_sodium}
+%if %{with sodium}
 %files sodium
 %defattr(-, root, root)
 %{extension_dir}/sodium.so
-%config(noreplace) %{php_sysconf}/conf.d/sodium.ini
+%config(noreplace) %{php_sysconf}/conf.d/*sodium.ini
 %endif
 
 %files sockets
 %defattr(-, root, root)
 %{extension_dir}/sockets.so
-%config(noreplace) %{php_sysconf}/conf.d/sockets.ini
+%config(noreplace) %{php_sysconf}/conf.d/*sockets.ini
 
 %files sqlite
 %defattr(-, root, root)
 %{extension_dir}/pdo_sqlite.so
-%config(noreplace) %{php_sysconf}/conf.d/pdo_sqlite.ini
+%config(noreplace) %{php_sysconf}/conf.d/*pdo_sqlite.ini
 %{extension_dir}/sqlite3.so
-%config(noreplace) %{php_sysconf}/conf.d/sqlite3.ini
+%config(noreplace) %{php_sysconf}/conf.d/*sqlite3.ini
 
 %files sysvmsg
 %defattr(-, root, root)
 %{extension_dir}/sysvmsg.so
-%config(noreplace) %{php_sysconf}/conf.d/sysvmsg.ini
+%config(noreplace) %{php_sysconf}/conf.d/*sysvmsg.ini
 
 %files sysvsem
 %defattr(-, root, root)
 %{extension_dir}/sysvsem.so
-%config(noreplace) %{php_sysconf}/conf.d/sysvsem.ini
+%config(noreplace) %{php_sysconf}/conf.d/*sysvsem.ini
 
 %files sysvshm
 %defattr(-, root, root)
 %{extension_dir}/sysvshm.so
-%config(noreplace) %{php_sysconf}/conf.d/sysvshm.ini
+%config(noreplace) %{php_sysconf}/conf.d/*sysvshm.ini
 
 %files tidy
 %defattr(-, root, root)
 %{extension_dir}/tidy.so
-%config(noreplace) %{php_sysconf}/conf.d/tidy.ini
+%config(noreplace) %{php_sysconf}/conf.d/*tidy.ini
 
 %files tokenizer
 %defattr(-, root, root)
 %{extension_dir}/tokenizer.so
-%config(noreplace) %{php_sysconf}/conf.d/tokenizer.ini
+%config(noreplace) %{php_sysconf}/conf.d/*tokenizer.ini
 
 %files xmlreader
 %defattr(-, root, root)
 %{extension_dir}/xmlreader.so
-%config(noreplace) %{php_sysconf}/conf.d/xmlreader.ini
+%config(noreplace) %{php_sysconf}/conf.d/*xmlreader.ini
 
 %files xmlwriter
 %defattr(-, root, root)
 %{extension_dir}/xmlwriter.so
-%config(noreplace) %{php_sysconf}/conf.d/xmlwriter.ini
+%config(noreplace) %{php_sysconf}/conf.d/*xmlwriter.ini
 
 %files xsl
 %defattr(-, root, root)
 %{extension_dir}/xsl.so
-%config(noreplace) %{php_sysconf}/conf.d/xsl.ini
+%config(noreplace) %{php_sysconf}/conf.d/*xsl.ini
 
 %files zip
 %defattr(-, root, root)
 %{extension_dir}/zip.so
-%config(noreplace) %{php_sysconf}/conf.d/zip.ini
+%config(noreplace) %{php_sysconf}/conf.d/*zip.ini
 
 %files zlib
 %defattr(-, root, root)
 %{extension_dir}/zlib.so
-%config(noreplace) %{php_sysconf}/conf.d/zlib.ini
+%config(noreplace) %{php_sysconf}/conf.d/*zlib.ini
+
+%files imap
+%defattr(644,root,root,755)
+%{extension_dir}/imap.so
+%config(noreplace) %{php_sysconf}/conf.d/imap.ini
 %endif
 
 %if "%{flavor}" == "test"
@@ -1744,9 +1769,4 @@
 %doc testresults.txt
 %endif
 
-%files imap
-%defattr(644,root,root,755)
-%{extension_dir}/imap.so
-%config(noreplace) %{php_sysconf}/conf.d/imap.ini
-
 %changelog

php-ar-flags.patch Changed

php-build-reproducible-phar.patch Changed

@@ -16,11 +16,11 @@
  ext/phar/zip.c           |  2 +-
  6 files changed, 18 insertions(+), 5 deletions(-)
 
-Index: php-8.0.0/ext/phar/phar.c
+Index: php-8.1.19/ext/phar/phar.c
 ===================================================================
---- php-8.0.0.orig/ext/phar/phar.c	2020-11-24 18:04:03.000000000 +0100
-+++ php-8.0.0/ext/phar/phar.c	2021-01-07 10:56:10.978719743 +0100
-@@ -2995,7 +2995,7 @@ int phar_flush(phar_archive_data *phar,
+--- php-8.1.19.orig/ext/phar/phar.c
++++ php-8.1.19/ext/phar/phar.c
+@@ -3004,7 +3004,7 @@ int phar_flush(phar_archive_data *phar,
  			4: metadata-len
  			+: metadata
  		*/
@@ -29,10 +29,10 @@
  		phar_set_32(entry_buffer, entry->uncompressed_filesize);
  		phar_set_32(entry_buffer+4, mytime);
  		phar_set_32(entry_buffer+8, entry->compressed_filesize);
-Index: php-8.0.0/ext/phar/phar_internal.h
+Index: php-8.1.19/ext/phar/phar_internal.h
 ===================================================================
---- php-8.0.0.orig/ext/phar/phar_internal.h	2020-11-24 18:04:03.000000000 +0100
-+++ php-8.0.0/ext/phar/phar_internal.h	2021-01-07 10:56:10.978719743 +0100
+--- php-8.1.19.orig/ext/phar/phar_internal.h
++++ php-8.1.19/ext/phar/phar_internal.h
 @@ -427,6 +427,21 @@ static inline enum phar_fp_type phar_get
  	return PHAR_G(cached_fp)entry->phar->phar_pos.manifestentry->manifest_pos.fp_type;
  }
@@ -55,10 +55,10 @@
  static inline zend_off_t phar_get_fp_offset(phar_entry_info *entry)
  {
  	if (!entry->is_persistent) {
-Index: php-8.0.0/ext/phar/stream.c
+Index: php-8.1.19/ext/phar/stream.c
 ===================================================================
---- php-8.0.0.orig/ext/phar/stream.c	2020-11-24 18:04:03.000000000 +0100
-+++ php-8.0.0/ext/phar/stream.c	2021-01-07 10:56:10.978719743 +0100
+--- php-8.1.19.orig/ext/phar/stream.c
++++ php-8.1.19/ext/phar/stream.c
 @@ -463,7 +463,7 @@ static int phar_stream_flush(php_stream
  	phar_entry_data *data = (phar_entry_data *) stream->abstract;
  
@@ -68,11 +68,11 @@
  		ret = phar_flush(data->phar, 0, 0, 0, &error);
  		if (error) {
  			php_stream_wrapper_log_error(stream->wrapper, REPORT_ERRORS, "%s", error);
-Index: php-8.0.0/ext/phar/tar.c
+Index: php-8.1.19/ext/phar/tar.c
 ===================================================================
---- php-8.0.0.orig/ext/phar/tar.c	2020-11-24 18:04:03.000000000 +0100
-+++ php-8.0.0/ext/phar/tar.c	2021-01-07 10:56:10.978719743 +0100
-@@ -971,7 +971,7 @@ int phar_tar_flush(phar_archive_data *ph
+--- php-8.1.19.orig/ext/phar/tar.c
++++ php-8.1.19/ext/phar/tar.c
+@@ -972,7 +972,7 @@ int phar_tar_flush(phar_archive_data *ph
  	char halt_stub = "__HALT_COMPILER();";
  
  	entry.flags = PHAR_ENT_PERM_DEF_FILE;
@@ -81,10 +81,10 @@
  	entry.is_modified = 1;
  	entry.is_crc_checked = 1;
  	entry.is_tar = 1;
-Index: php-8.0.0/ext/phar/util.c
+Index: php-8.1.19/ext/phar/util.c
 ===================================================================
---- php-8.0.0.orig/ext/phar/util.c	2020-11-24 18:04:03.000000000 +0100
-+++ php-8.0.0/ext/phar/util.c	2021-01-07 10:56:10.982719768 +0100
+--- php-8.1.19.orig/ext/phar/util.c
++++ php-8.1.19/ext/phar/util.c
 @@ -574,7 +574,7 @@ phar_entry_data *phar_get_or_create_entr
  
  	phar_add_virtual_dirs(phar, path, path_len);
@@ -94,11 +94,11 @@
  	etemp.is_crc_checked = 1;
  	etemp.phar = phar;
  	etemp.filename = estrndup(path, path_len);
-Index: php-8.0.0/ext/phar/zip.c
+Index: php-8.1.19/ext/phar/zip.c
 ===================================================================
---- php-8.0.0.orig/ext/phar/zip.c	2020-11-24 18:04:03.000000000 +0100
-+++ php-8.0.0/ext/phar/zip.c	2021-01-07 10:56:10.982719768 +0100
-@@ -1214,7 +1214,7 @@ int phar_zip_flush(phar_archive_data *ph
+--- php-8.1.19.orig/ext/phar/zip.c
++++ php-8.1.19/ext/phar/zip.c
+@@ -1215,7 +1215,7 @@ int phar_zip_flush(phar_archive_data *ph
  
  	pass.error = &temperr;
  	entry.flags = PHAR_ENT_PERM_DEF_FILE;

php-crypt-tests.patch Deleted

@@ -1,13 +0,0 @@
-Index: php-8.0.0RC4/ext/standard/config.m4
-===================================================================
---- php-8.0.0RC4.orig/ext/standard/config.m4	2020-11-10 11:57:27.000000000 +0100
-+++ php-8.0.0RC4/ext/standard/config.m4	2020-11-15 09:13:55.955213068 +0100
-@@ -278,7 +278,7 @@ dnl
- dnl If one of them is missing, use our own implementation, portable code is then possible
- dnl
- dnl This is currently enabled by default
--if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "$ac_cv_crypt_md5" = "no" || test "$ac_cv_crypt_sha512" = "no" || test "$ac_cv_crypt_sha256" = "no" || test "$ac_cv_func_crypt_r" != "yes" || test "$PHP_EXTERNAL_LIBCRYPT" = "no"; then
-+if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_md5" = "no" || test "$ac_cv_crypt_sha512" = "no" || test "$ac_cv_crypt_sha256" = "no" || test "$ac_cv_func_crypt_r" != "yes"; then
-   if test "$PHP_EXTERNAL_LIBCRYPT" = "no"; then
-     AC_DEFINE_UNQUOTED(PHP_USE_PHP_CRYPT_R, 1, Whether PHP has to use its own crypt_r)
-

php-ini.patch Changed

@@ -1,8 +1,8 @@
-Index: php-8.0.0/php.ini-production
+Index: php-8.1.19/php.ini-production
 ===================================================================
---- php-8.0.0.orig/php.ini-production	2020-11-24 18:04:03.000000000 +0100
-+++ php-8.0.0/php.ini-production	2021-01-07 10:13:37.934622775 +0100
-@@ -737,7 +737,7 @@ default_charset = "UTF-8"
+--- php-8.1.19.orig/php.ini-production
++++ php-8.1.19/php.ini-production
+@@ -742,7 +742,7 @@ default_charset = "UTF-8"
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
@@ -11,7 +11,7 @@
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
-@@ -965,7 +965,7 @@ cli_server.color = On
+@@ -975,7 +975,7 @@ cli_server.color = On
  Date
  ; Defines the default timezone used by the date functions
  ; https://php.net/date.timezone
@@ -20,7 +20,7 @@
  
  ; https://php.net/date.default-latitude
  ;date.default_latitude = 31.7667
-@@ -1154,7 +1154,7 @@ mysqli.max_persistent = -1
+@@ -1164,7 +1164,7 @@ mysqli.max_persistent = -1
  
  ; Allow or prevent persistent links.
  ; https://php.net/mysqli.allow-persistent
@@ -29,3 +29,16 @@
  
  ; Maximum number of links.  -1 means no limit.
  ; https://php.net/mysqli.max-links
+Index: php-8.1.19/sapi/fpm/www.conf.in
+===================================================================
+--- php-8.1.19.orig/sapi/fpm/www.conf.in
++++ php-8.1.19/sapi/fpm/www.conf.in
+@@ -27,6 +27,8 @@
+ ;                 If the group is not set, the user's group is used.
+ user = @php_fpm_user@
+ group = @php_fpm_group@
++; session folder has to be writable by user:group
++php_valuesession.save_path = /var/lib/php8/sessions
+ 
+ ; The address on which to accept FastCGI requests.
+ ; Valid syntaxes are:

php-sort-filelist-phar.patch Changed

@@ -1,12 +1,13 @@
-diff -purN php-7.4.14RC1-orig/ext/phar/Makefile.frag php-7.4.14RC1/ext/phar/Makefile.frag
---- php-7.4.14RC1-orig/ext/phar/Makefile.frag	2020-12-15 17:07:01.000000000 +0100
-+++ php-7.4.14RC1/ext/phar/Makefile.frag	2021-01-03 10:57:09.681917866 +0100
-@@ -37,7 +37,7 @@ $(builddir)/phar.phar: $(builddir)/phar.
- 	-@echo "Generating phar.phar"
- 	-@rm -f $(builddir)/phar.phar
- 	-@rm -f $(srcdir)/phar.phar
--	@$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(builddir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x \\.svn -p 0 -s $(srcdir)/phar/phar.php -h sha1 -b "$(PHP_PHARCMD_BANG)"  $(srcdir)/phar/
-+	@$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(builddir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x \\.svn -p 0 -s $(srcdir)/phar/phar.php -h sha1 -b "$(PHP_PHARCMD_BANG)" -l 9  $(srcdir)/phar/*.inc
- 	-@chmod +x $(builddir)/phar.phar
- 
- install-pharcmd: pharcmd
+Index: php-8.1.21/ext/phar/Makefile.frag
+===================================================================
+--- php-8.1.21.orig/ext/phar/Makefile.frag
++++ php-8.1.21/ext/phar/Makefile.frag
+@@ -46,7 +46,7 @@ $(builddir)/phar.phar: $(builddir)/phar.
+ 	if  "$(TEST_PHP_EXECUTABLE_RES)" != 1 ; then \
+ 		rm -f $(builddir)/phar.phar; \
+ 		rm -f $(srcdir)/phar.phar; \
+-		$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(builddir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x \\.svn -p 0 -s $(srcdir)/phar/phar.php -h sha1 -b "$(PHP_PHARCMD_BANG)"  $(srcdir)/phar/; \
++		$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(builddir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x \\.svn -p 0 -s $(srcdir)/phar/phar.php -h sha1 -b "$(PHP_PHARCMD_BANG)"  -l 9  $(srcdir)/phar/*.inc; \
+ 		chmod +x $(builddir)/phar.phar; \
+ 	else \
+ 		echo "Skipping phar.phar generating during cross compilation"; \

php-systzdata-v21.patch -> php-systzdata-v23.patch Changed

@@ -5,6 +5,8 @@
 than embedding a copy.  Discussed upstream but was not desired.
 
 History:
+r23: fix possible buffer overflow
+r22: retrieve tzdata version from /usr/share/zoneinfo/tzdata.zi
 r21: adapt for timelib 2021.03 (in 8.1.0)
 r20: adapt for timelib 2020.03 (in 8.0.10RC1)
 r19: adapt for timelib 2020.02 (in 8.0.0beta2)
@@ -32,9 +34,10 @@
 r2: add filesystem trawl to set up name alias index
 r1: initial revision
 
-diff -up php-8.0.0beta3/ext/date/config0.m4.systzdata php-8.0.0beta3/ext/date/config0.m4
---- php-8.0.0beta3/ext/date/config0.m4.systzdata	2020-09-01 19:13:26.000000000 +0200
-+++ php-8.0.0beta3/ext/date/config0.m4	2020-09-02 08:07:51.039979873 +0200
+Index: php-8.1.19/ext/date/config0.m4
+===================================================================
+--- php-8.1.19.orig/ext/date/config0.m4
++++ php-8.1.19/ext/date/config0.m4
 @@ -4,6 +4,19 @@ AC_CHECK_HEADERS(io.h)
  dnl Check for strtoll, atoll
  AC_CHECK_FUNCS(strtoll atoll)
@@ -55,9 +58,10 @@
  PHP_DATE_CFLAGS="-Wno-implicit-fallthrough -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
  timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/parse_posix.c
                   lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
-diff -up php-8.0.0beta3/ext/date/lib/parse_tz.c.systzdata php-8.0.0beta3/ext/date/lib/parse_tz.c
---- php-8.0.0beta3/ext/date/lib/parse_tz.c.systzdata	2020-09-01 19:13:26.000000000 +0200
-+++ php-8.0.0beta3/ext/date/lib/parse_tz.c	2020-09-02 08:07:51.039979873 +0200
+Index: php-8.1.19/ext/date/lib/parse_tz.c
+===================================================================
+--- php-8.1.19.orig/ext/date/lib/parse_tz.c
++++ php-8.1.19/ext/date/lib/parse_tz.c
 @@ -26,9 +26,22 @@
  #include "timelib.h"
  #include "timelib_private.h"
@@ -93,7 +97,7 @@
  	/* read ID */
  	version = (*tzf)3 - '0';
  	*tzf += 4;
-@@ -577,7 +595,429 @@ void timelib_dump_tzinfo(timelib_tzinfo
+@@ -577,7 +595,467 @@ void timelib_dump_tzinfo(timelib_tzinfo
  	}
  }
  
@@ -161,7 +165,7 @@
 +
 +    /* Annoying encoding used by zone.tab has no decimal point, so use
 +     * the length to determine the format:
-+     * 
++     *
 +     * 4 = DDMM
 +     * 5 = DDDMM
 +     * 6 = DDMMSS
@@ -228,10 +232,10 @@
 +
 +        if (*p == '#' || *p == '\0' || *p == '\n')
 +            continue;
-+        
++
 +        if (!isalpha(p0) || !isalpha(p1) || p2 != '\t')
 +            continue;
-+        
++
 +        /* code => AA */
 +        code = p;
 +        p2 = 0;
@@ -265,7 +269,7 @@
 +
 +        if (*p == '\n' || *p == '\t')
 +            *p = '\0';
-+        
++
 +        hash = tz_hash(name);
 +        i = malloc(sizeof *i);
 +        memcpy(i->code, code, 2);
@@ -285,7 +289,7 @@
 +
 +/* Return location info from hash table, using given timezone name.
 + * Returns NULL if the name could not be found. */
-+const struct location_info *find_zone_info(struct location_info **li, 
++const struct location_info *find_zone_info(struct location_info **li,
 +                                           const char *name)
 +{
 +    uint32_t hash = tz_hash(name);
@@ -301,7 +305,7 @@
 +    }
 +
 +    return NULL;
-+}    
++}
 +
 +/* Filter out some non-tzdata files and the posix/right databases, if
 + * present. */
@@ -323,6 +327,44 @@
 +        return timelib_strcasecmp(alpha->id, beta->id);
 +}
 +
++/* Retrieve tzdata version. */
++static void retrieve_zone_version(timelib_tzdb *db)
++{
++    static char buf30;
++    char pathPATH_MAX;
++    FILE *fp;
++
++    strncpy(path, ZONEINFO_PREFIX "/tzdata.zi", sizeof(path));
++
++    fp = fopen(path, "r");
++    if (fp) {
++		if (fgets(buf, sizeof(buf), fp)) {
++			if (!memcmp(buf, "# version ", 10) &&
++				isdigit(buf10) &&
++				isdigit(buf11) &&
++				isdigit(buf12) &&
++				isdigit(buf13) &&
++				islower(buf14)) {
++				if (buf14 >= 't') {        /* 2022t = 2022.20 */
++					buf17 = 0;
++					buf16 = buf14 - 't' + '0';
++					buf15 = '2';
++				} else if (buf14 >= 'j') { /* 2022j = 2022.10 */
++					buf17 = 0;
++					buf16 = buf14 - 'j' + '0';
++					buf15 = '1';
++				} else {                     /* 2022a = 2022.1  */
++					buf16 = 0;
++					buf15 = buf14 - 'a' + '1';
++				}
++				buf14 = '.';
++				db->version = buf+10;
++			}
++		}
++		fclose(fp);
++    }
++}
++
 +
 +/* Create the zone identifier index by trawling the filesystem. */
 +static void create_zone_index(timelib_tzdb *db)
@@ -338,7 +380,7 @@
 +	dirstack = malloc(dirstack_size * sizeof *dirstack);
 +	dirstack_top = 1;
 +	dirstack0 = strdup("");
-+	
++
 +	/* Index array. */
 +	index_size = 64;
 +	db_index = malloc(index_size * sizeof *db_index);
@@ -359,22 +401,22 @@
 +			struct stat st;
 +			const char *leaf = entscount - 1->d_name;
 +
-+			snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s", 
++			snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s",
 +				 top, leaf);
-+			
++
 +			if (strlen(name) && stat(name, &st) == 0) {
 +				/* Name, relative to the zoneinfo prefix. */
 +				const char *root = top;
 +
 +				if (root0 == '/') root++;
 +
-+				snprintf(name, sizeof name, "%s%s%s", root, 
++				snprintf(name, sizeof name, "%s%s%s", root,
 +					 *root ? "/": "", leaf);
 +
 +				if (S_ISDIR(st.st_mode)) {
 +					if (dirstack_top == dirstack_size) {
 +						dirstack_size *= 2;
-+						dirstack = realloc(dirstack, 
++						dirstack = realloc(dirstack,
 +								   dirstack_size * sizeof *dirstack);
 +					}
 +					dirstackdirstack_top++ = strdup(name);
@@ -392,7 +434,7 @@
 +
 +			free(ents--count);
 +		}
-+		
++
 +		if (count != -1) free(ents);
 +		free(top);
 +	} while (dirstack_top);
@@ -414,8 +456,8 @@
 +{
 +        size_t n;
 +        char *data, *p;
-+        
-+        data = malloc(3 * sysdb->index_size + 7);
++
++        data = malloc(3 * sysdb->index_size + sizeof(FAKE_HEADER) - 1);
 +
 +        p = mempcpy(data, FAKE_HEADER, sizeof(FAKE_HEADER) - 1);
 +
@@ -447,7 +489,7 @@
 +                        ent->pos = 0;
 +                }
 +        }
-+        
++
 +        sysdb->data = (unsigned char *)data;
 +}
 +
@@ -496,7 +538,7 @@
 +	struct stat st;
 +	char *p;
 +	int fd;
-+	
++
 +	if (timezone0 == '\0' || strstr(timezone, "..") != NULL) {
 +		return NULL;
 +	}
@@ -514,7 +556,7 @@
 +	*length = st.st_size;
 +	p = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
 +	close(fd);
-+	
++
 +	return p != MAP_FAILED ? p : NULL;
 +}
 +
@@ -524,7 +566,7 @@
  {
  	int left = 0, right = tzdb->index_size - 1;
  
-@@ -603,9 +1043,48 @@ static int seek_to_tz_position(const uns
+@@ -603,9 +1081,49 @@ static int seek_to_tz_position(const uns
  	return 0;
  }
  
@@ -561,6 +603,7 @@
 +		tmp->version = "0.system";
 +		tmp->data = NULL;
 +		create_zone_index(tmp);
++		retrieve_zone_version(tmp);
 +		system_location_table = create_location_table();
 +		fake_data_segment(tmp, system_location_table);
 +		timezonedb_system = tmp;
@@ -573,7 +616,7 @@
  }
  
  const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count)
-@@ -617,7 +1096,30 @@ const timelib_tzdb_index_entry *timelib_
+@@ -617,7 +1135,30 @@ const timelib_tzdb_index_entry *timelib_
  int timelib_timezone_id_is_valid(const char *timezone, const timelib_tzdb *tzdb)
  {
  	const unsigned char *tzf;
@@ -605,7 +648,7 @@
  }
  
  static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
-@@ -662,6 +1164,8 @@ static timelib_tzinfo* timelib_tzinfo_ct
+@@ -662,6 +1203,8 @@ static timelib_tzinfo* timelib_tzinfo_ct
  timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *tzdb, int *error_code)
  {
  	const unsigned char *tzf;
@@ -614,7 +657,7 @@
  	timelib_tzinfo *tmp;
  	int version;
  	int transitions_result, types_result;
-@@ -669,7 +1173,7 @@ timelib_tzinfo *timelib_parse_tzfile(con
+@@ -669,7 +1212,7 @@ timelib_tzinfo *timelib_parse_tzfile(con
  
  	*error_code = TIMELIB_ERROR_NO_ERROR;
  
@@ -623,7 +666,7 @@
  		tmp = timelib_tzinfo_ctor(timezone);
  
  		version = read_preamble(&tzf, tmp, &type);
-@@ -712,11 +1216,36 @@ timelib_tzinfo *timelib_parse_tzfile(con
+@@ -712,11 +1255,36 @@ timelib_tzinfo *timelib_parse_tzfile(con
  			return NULL;
  		}
  
@@ -660,3 +703,19 @@
  	} else {
  		*error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE;
  		tmp = NULL;
+Index: php-8.1.19/ext/date/php_date.c
+===================================================================
+--- php-8.1.19.orig/ext/date/php_date.c
++++ php-8.1.19/ext/date/php_date.c
+@@ -457,7 +457,11 @@ PHP_MINFO_FUNCTION(date)
+ 	php_info_print_table_row(2, "date/time support", "enabled");
+ 	php_info_print_table_row(2, "timelib version", TIMELIB_ASCII_VERSION);
+ 	php_info_print_table_row(2, "\"Olson\" Timezone Database Version", tzdb->version);
++#ifdef HAVE_SYSTEM_TZDATA
++	php_info_print_table_row(2, "Timezone Database", "system");
++#else
+ 	php_info_print_table_row(2, "Timezone Database", php_date_global_timezone_db_enabled ? "external" : "internal");
++#endif
+ 	php_info_print_table_row(2, "Default timezone", guess_timezone(tzdb));
+ 	php_info_print_table_end();
+

php-unicode-allow-redistribution.patch Added

@@ -0,0 +1,600 @@
+diff --git a/ext/mbstring/tests/data/BIG5.txt b/ext/mbstring/tests/data/BIG5.txt
+index dd6cd9ec2283..652203e2ba08 100644
+--- a/ext/mbstring/tests/data/BIG5.txt
++++ b/ext/mbstring/tests/data/BIG5.txt
+@@ -1,35 +1,26 @@
++# BIG5.TXT
++# Date: 2015-12-02 23:52:00 GMT KW
++# © 2015 Unicode®, Inc.
++# For terms of use, see http://www.unicode.org/terms_of_use.html
+ #
+ #	Name: BIG5 to Unicode table (complete)
+ #	Unicode version: 1.1
+-#	Table version: 0.0d3
++#	Table version: 2.0
+ #	Table format: Format A
+-#	Date: 11 February 1994
+-#	Authors: Glenn Adams <glenn@metis.com>
+-# John H. Jenkins <John_Jenkins@taligent.com>
+-#
+-#	Copyright (c) 1991-1994 Unicode, Inc. All Rights reserved.
+-#
+-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+-#	No claims are made as to fitness for any particular purpose. No
+-#	warranties of any kind are expressed or implied. The recipient
+-#	agrees to determine applicability of information provided. If this
+-#	file has been provided on magnetic media by Unicode, Inc., the sole
+-#	remedy for any claim will be exchange of defective media within 90
+-#	days of receipt.
+-#
+-#	Recipient is granted the right to make copies in any form for
+-#	internal distribution and to freely use the information supplied
+-#	in the creation of products supporting Unicode. Unicode, Inc.
+-#	specifically excludes the right to re-distribute this file directly
+-#	to third parties or other organizations whether for profit or not.
++#	Date: 2011 October 14 (header updated: 2015 December 02)
+ #
+ #	General notes:
+ #
+-#	This table contains the data Metis and Taligent currently have on how
+-# BIG5 characters map into Unicode.
++#
++# This table contains one set of mappings from BIG5 into Unicode.
++# Note that these data are *possible* mappings only and may not be the
++# same as those used by actual products, nor may they be the best suited
++# for all uses. For more information on the mappings between various code
++# pages incorporating the repertoire of BIG5 and Unicode, consult the
++# VENDORS mapping data.
+ #
+ #	WARNING! It is currently impossible to provide round-trip compatibility
+-#		between BIG5 and Unicode.
++#		between BIG5 and Unicode. 
+ #
+ #	A number of characters are not currently mapped because
+ #		of conflicts with other mappings. They are as follows:
+@@ -46,173 +37,57 @@
+ #
+ #	We currently map all of these characters to U+FFFD REPLACEMENT CHARACTER.
+ #		It is also possible to map these characters to their duplicates, or to
+-#		the user zone.
+-#
++#		the user zone. 
++#	
+ #	Notes:
+ #
+ #	1. In addition to the above, there is some uncertainty about the
+ # mappings in the range C6A1 - C8FE, and F9DD - F9FE. The ETEN
+-#		version of BIG5 organizes the former range differently, and adds
+-#		additional characters in the latter range. The correct mappings
+-#		these ranges need to be determined.
++#	version of BIG5 organizes the former range differently, and adds
++#	additional characters in the latter range. The correct mappings
++#	these ranges need to be determined.
+ #
+ #	2. There is an uncertainty in the mapping of the Big Five character
+-#		0xA3BC. This character occurs within the Big Five block of tone marks
+-#		for bopomofo and is intended to be the tone mark for the first tone in
+-#		Mandarin Chinese. We have selected the mapping U+02C9 MODIFIER LETTER
+-#		MACRON (Mandarin Chinese first tone) to reflect this semantic.
+-#		However, because bopomofo uses the absense of a tone mark to indicate
+-#		the first Mandarin tone, most implementations of Big Five represent
+-#		this character with a blank space, and so a mapping such as U+2003 EM SPACE
+-#		might be preferred.
+-#
+-#
++#	0xA3BC. This character occurs within the Big Five block of tone marks
++#	for bopomofo and is intended to be the tone mark for the first tone in
++#	Mandarin Chinese. We have selected the mapping U+02C9 MODIFIER LETTER
++#	MACRON (Mandarin Chinese first tone) to reflect this semantic. 
++#	However, because bopomofo uses the absense of a tone mark to indicate
++#	the first Mandarin tone, most implementations of Big Five represent
++#	this character with a blank space, and so a mapping such as U+2003 EM
++#	SPACE might be preferred. 
+ #
+ #	Format: Three tab-separated columns
+ #		 Column #1 is the BIG5 code (in hex as 0xXXXX)
+ #		 Column #2 is the Unicode (in hex as 0xXXXX)
+ #		 Column #3 is the Unicode name (follows a comment sign, '#')
+-#					The official names for Unicode characters U+4E00
+-#					to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
+-#					where XXXX is the code point. Including all these
+-#					names in this file increases its size substantially
+-#					and needlessly. The token "<CJK>" is used for the
+-#					name of these characters. If necessary, it can be
+-#					expanded algorithmically by a parser or editor.
++#			The official names for Unicode characters U+4E00
++#			to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
++#			where XXXX is the code point. Including all these
++#			names in this file increases its size substantially
++#			and needlessly. The token "<CJK>" is used for the
++#			name of these characters. If necessary, it can be
++#			expanded algorithmically by a parser or editor.
+ #
+ #	The entries are in BIG5 order
+ #
+-#	Any comments or problems, contact <John_Jenkins@taligent.com>
++# Revision History:
++#
++# v2.0, 2015 December 02
++# updates to copyright notice and terms of use
++# no changes to character mappings
++#
++# v1.0, 2011 October 14
++# Updated terms of use to current wording.
++# Updated contact information.
++# No changes to the mapping data.
++#
++# v0.0d3, 11 February 1994
++# First release.
+ #
++# Use the Unicode reporting form <http://www.unicode.org/reporting.html>
++# for any questions or comments or to report errors in the data.
+ #
+-0x0	0x0
+-0x1	0x1
+-0x2	0x2
+-0x3	0x3
+-0x4	0x4
+-0x5	0x5
+-0x6	0x6
+-0x7	0x7
+-0x8	0x8
+-0x9	0x9
+-0xA	0xA
+-0xB	0xB
+-0xC	0xC
+-0xD	0xD
+-0xE	0xE
+-0xF	0xF
+-0x10	0x10
+-0x11	0x11
+-0x12	0x12
+-0x13	0x13
+-0x14	0x14
+-0x15	0x15
+-0x16	0x16
+-0x17	0x17
+-0x18	0x18
+-0x19	0x19
+-0x1A	0x1A
+-0x1B	0x1B
+-0x1C	0x1C
+-0x1D	0x1D
+-0x1E	0x1E
+-0x1F	0x1F
+-0x20	0x20
+-0x21	0x21
+-0x22	0x22
+-0x23	0x23
+-0x24	0x24
+-0x25	0x25
+-0x26	0x26
+-0x27	0x27
+-0x28	0x28
+-0x29	0x29
+-0x2A	0x2A
+-0x2B	0x2B
+-0x2C	0x2C
+-0x2D	0x2D
+-0x2E	0x2E
+-0x2F	0x2F
+-0x30	0x30
+-0x31	0x31
+-0x32	0x32
+-0x33	0x33
+-0x34	0x34
+-0x35	0x35
+-0x36	0x36
+-0x37	0x37
+-0x38	0x38
+-0x39	0x39
+-0x3A	0x3A
+-0x3B	0x3B
+-0x3C	0x3C
+-0x3D	0x3D
+-0x3E	0x3E
+-0x3F	0x3F
+-0x40	0x40
+-0x41	0x41
+-0x42	0x42
+-0x43	0x43
+-0x44	0x44
+-0x45	0x45
+-0x46	0x46
+-0x47	0x47
+-0x48	0x48
+-0x49	0x49
+-0x4A	0x4A
+-0x4B	0x4B
+-0x4C	0x4C
+-0x4D	0x4D
+-0x4E	0x4E
+-0x4F	0x4F
+-0x50	0x50
+-0x51	0x51
+-0x52	0x52
+-0x53	0x53
+-0x54	0x54
+-0x55	0x55
+-0x56	0x56
+-0x57	0x57
+-0x58	0x58
+-0x59	0x59
+-0x5A	0x5A
+-0x5B	0x5B
+-0x5C	0x5C
+-0x5D	0x5D
+-0x5E	0x5E
+-0x5F	0x5F
+-0x60	0x60
+-0x61	0x61
+-0x62	0x62
+-0x63	0x63
+-0x64	0x64
+-0x65	0x65
+-0x66	0x66
+-0x67	0x67
+-0x68	0x68
+-0x69	0x69
+-0x6A	0x6A
+-0x6B	0x6B
+-0x6C	0x6C
+-0x6D	0x6D
+-0x6E	0x6E
+-0x6F	0x6F
+-0x70	0x70
+-0x71	0x71
+-0x72	0x72
+-0x73	0x73
+-0x74	0x74
+-0x75	0x75
+-0x76	0x76
+-0x77	0x77
+-0x78	0x78
+-0x79	0x79
+-0x7A	0x7A
+-0x7B	0x7B
+-0x7C	0x7C
+-0x7D	0x7D
+-0x7E	0x7E
+-0x7F	0x7F
+ 0xA140	0x3000	# IDEOGRAPHIC SPACE
+ 0xA141	0xFF0C	# FULLWIDTH COMMA
+ 0xA142	0x3001	# IDEOGRAPHIC COMMA
+@@ -239,6 +114,7 @@
+ 0xA157	0xFE31	# PRESENTATION FORM FOR VERTICAL EM DASH
+ 0xA158	0x2014	# EM DASH
+ 0xA159	0xFE33	# PRESENTATION FORM FOR VERTICAL LOW LINE
++0xA15A	0xFFFD	# *** NO MAPPING ***
+ 0xA15B	0xFE34	# PRESENTATION FORM FOR VERTICAL WAVY LOW LINE
+ 0xA15C	0xFE4F	# WAVY LOW LINE
+ 0xA15D	0xFF08	# FULLWIDTH LEFT PARENTHESIS
+@@ -309,7 +185,9 @@
+ 0xA1C0	0x32A3	# CIRCLED IDEOGRAPH CORRECT
+ 0xA1C1	0x2105	# CARE OF
+ 0xA1C2	0x203E	# OVERLINE
++0xA1C3	0xFFFD	# *** NO MAPPING ***
+ 0xA1C4	0xFF3F	# FULLWIDTH LOW LINE
++0xA1C5	0xFFFD	# *** NO MAPPING ***
+ 0xA1C6	0xFE49	# DASHED OVERLINE
+ 0xA1C7	0xFE4A	# CENTRELINE OVERLINE
+ 0xA1C8	0xFE4D	# DASHED LOW LINE
+@@ -366,10 +244,12 @@
+ 0xA1FB	0x2198	# SOUTH EAST ARROW
+ 0xA1FC	0x2225	# PARALLEL TO
+ 0xA1FD	0x2223	# DIVIDES
++0xA1FE	0xFFFD	# *** NO MAPPING ***
++0xA240	0xFFFD	# *** NO MAPPING ***
+ 0xA241	0xFF0F	# FULLWIDTH SOLIDUS
+ 0xA242	0xFF3C	# FULLWIDTH REVERSE SOLIDUS
+ 0xA243	0xFF04	# FULLWIDTH DOLLAR SIGN
+-0xA244	0xFFE5	# YEN SIGN -- Edited by A. Dowad to match output from iconv; was previously 0x00A5
++0xA244	0x00A5	# YEN SIGN
+ 0xA245	0x3012	# POSTAL MARK
+ 0xA246	0x00A2	# CENT SIGN
+ 0xA247	0x00A3	# POUND SIGN
+@@ -471,7 +351,9 @@
+ 0xA2C9	0x3027	# HANGZHOU NUMERAL SEVEN
+ 0xA2CA	0x3028	# HANGZHOU NUMERAL EIGHT
+ 0xA2CB	0x3029	# HANGZHOU NUMERAL NINE
++0xA2CC	0xFFFD	# *** NO MAPPING ***
+ 0xA2CD	0x5344	# <CJK>
++0xA2CE	0xFFFD	# *** NO MAPPING ***
+ 0xA2CF	0xFF21	# FULLWIDTH LATIN CAPITAL LETTER A
+ 0xA2D0	0xFF22	# FULLWIDTH LATIN CAPITAL LETTER B
+ 0xA2D1	0xFF23	# FULLWIDTH LATIN CAPITAL LETTER C
+@@ -13916,45 +13798,3 @@
+ 0xF9D3	0x9F7E	# <CJK>
+ 0xF9D4	0x9F49	# <CJK>
+ 0xF9D5	0x9F98	# <CJK>
+-# The following ETEN extensions are copied from CP950.txt:
+-0xF9D6	0x7881	#CJK UNIFIED IDEOGRAPH
+-0xF9D7	0x92B9	#CJK UNIFIED IDEOGRAPH
+-0xF9D8	0x88CF	#CJK UNIFIED IDEOGRAPH
+-0xF9D9	0x58BB	#CJK UNIFIED IDEOGRAPH
+-0xF9DA	0x6052	#CJK UNIFIED IDEOGRAPH
+-0xF9DB	0x7CA7	#CJK UNIFIED IDEOGRAPH
+-0xF9DC	0x5AFA	#CJK UNIFIED IDEOGRAPH
+-0xF9DD	0x2554	#BOX DRAWINGS DOUBLE DOWN AND RIGHT
+-0xF9DE	0x2566	#BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
+-0xF9DF	0x2557	#BOX DRAWINGS DOUBLE DOWN AND LEFT
+-0xF9E0	0x2560	#BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
+-0xF9E1	0x256C	#BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL
+-0xF9E2	0x2563	#BOX DRAWINGS DOUBLE VERTICAL AND LEFT
+-0xF9E3	0x255A	#BOX DRAWINGS DOUBLE UP AND RIGHT
+-0xF9E4	0x2569	#BOX DRAWINGS DOUBLE UP AND HORIZONTAL
+-0xF9E5	0x255D	#BOX DRAWINGS DOUBLE UP AND LEFT
+-0xF9E6	0x2552	#BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE
+-0xF9E7	0x2564	#BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE
+-0xF9E8	0x2555	#BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE
+-0xF9E9	0x255E	#BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE
+-0xF9EA	0x256A	#BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE
+-0xF9EB	0x2561	#BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE
+-0xF9EC	0x2558	#BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE
+-0xF9ED	0x2567	#BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE
+-0xF9EE	0x255B	#BOX DRAWINGS UP SINGLE AND LEFT DOUBLE
+-0xF9EF	0x2553	#BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE
+-0xF9F0	0x2565	#BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE
+-0xF9F1	0x2556	#BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE
+-0xF9F2	0x255F	#BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE
+-0xF9F3	0x256B	#BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE
+-0xF9F4	0x2562	#BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE
+-0xF9F5	0x2559	#BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE
+-0xF9F6	0x2568	#BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE
+-0xF9F7	0x255C	#BOX DRAWINGS UP DOUBLE AND LEFT SINGLE
+-0xF9F8	0x2551	#BOX DRAWINGS DOUBLE VERTICAL
+-0xF9F9	0x2550	#BOX DRAWINGS DOUBLE HORIZONTAL
+-0xF9FA	0x256D	#BOX DRAWINGS LIGHT ARC DOWN AND RIGHT
+-0xF9FB	0x256E	#BOX DRAWINGS LIGHT ARC DOWN AND LEFT
+-0xF9FC	0x2570	#BOX DRAWINGS LIGHT ARC UP AND RIGHT
+-0xF9FD	0x256F	#BOX DRAWINGS LIGHT ARC UP AND LEFT
+-0xF9FE	0x2593	#DARK SHADE
+diff --git a/ext/mbstring/tests/data/JISX0201.txt b/ext/mbstring/tests/data/JISX0201.txt
+index 87e9e94192e2..d4293a5e483a 100644
+--- a/ext/mbstring/tests/data/JISX0201.txt
++++ b/ext/mbstring/tests/data/JISX0201.txt
+@@ -1,33 +1,24 @@
++# JIS0201.TXT
++# Date: 2015-12-02 23:49:00 GMT KW
++# © 2015 Unicode®, Inc.
++# For terms of use, see http://www.unicode.org/terms_of_use.html
+ #
+ #	Name: JIS X 0201 (1976) to Unicode 1.1 Table
+ #	Unicode version: 1.1
+-#	Table version: 0.9
++#	Table version: 2.0
+ #	Table format: Format A
+-#	Date: 8 March 1994
+-#	Authors: Glenn Adams <glenn@metis.com>
+-# John H. Jenkins <John_Jenkins@taligent.com>
++#	Date: 2011 October 14 (header updated: 2015 December 02)
+ #
+-#	Copyright (c) 1991-1994 Unicode, Inc. All Rights reserved.
+-#
+-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+-#	No claims are made as to fitness for any particular purpose. No
+-#	warranties of any kind are expressed or implied. The recipient
+-#	agrees to determine applicability of information provided. If this
+-#	file has been provided on magnetic media by Unicode, Inc., the sole
+-#	remedy for any claim will be exchange of defective media within 90
+-#	days of receipt.
++#	General notes:
+ #
+-#	Recipient is granted the right to make copies in any form for
+-#	internal distribution and to freely use the information supplied
+-#	in the creation of products supporting Unicode. Unicode, Inc.
+-#	specifically excludes the right to re-distribute this file directly
+-#	to third parties or other organizations whether for profit or not.
+ #
+-#	General notes:
++# This table contains one set of mappings from JIS X 0201 into Unicode.
++# Note that these data are *possible* mappings only and may not be the
++# same as those used by actual products, nor may they be the best suited
++# for all uses. For more information on the mappings between various code
++# pages incorporating the repertoire of JIS X 0201 and Unicode, consult the
++# VENDORS mapping data.
+ #
+-#	This table contains the data the Unicode Consortium has on how
+-#	single-byte JIS X 0201 characters map into Unicode 1.1
+-#	(ISO/IEC 10646:1-1993 UCS-2).
+ #
+ #	Format: Three tab-separated columns
+ #		Column #1 is the shift JIS code (in hex as 0xXX)
+@@ -36,11 +27,22 @@
+ #
+ #	The entries are in JIS order
+ #
+-# These mappings are provisional, pending definition of
+-# official mappings by Japanese standards bodies.
++# Revision History:
++#
++# v2.0, 2015 December 02
++# updates to copyright notice and terms of use
++# no changes to character mappings
++#
++# v1.0, 2011 October 14
++# Updated terms of use to current wording.
++# Updated contact information.
++# No changes to the mapping data.
+ #
+-#	Any comments or problems, contact <John_Jenkins@taligent.com>
++# v0.9, 8 March 1994
++# First release.
+ #
++# Use the Unicode reporting form <http://www.unicode.org/reporting.html>
++# for any questions or comments or to report errors in the data.
+ #
+ 0x20	0x0020	# SPACE
+ 0x21	0x0021	# EXCLAMATION MARK
+diff --git a/ext/mbstring/tests/data/JISX0212.txt b/ext/mbstring/tests/data/JISX0212.txt
+index 316d28e4d10f..ae35ecacdc2b 100644
+--- a/ext/mbstring/tests/data/JISX0212.txt
++++ b/ext/mbstring/tests/data/JISX0212.txt
+@@ -1,44 +1,36 @@
++# JIS0212.TXT
++# Date: 2015-12-02 23:51:00 GMT KW
++# © 2015 Unicode®, Inc.
++# For terms of use, see http://www.unicode.org/terms_of_use.html
+ #
+ #	Name: JIS X 0212 (1990) to Unicode
+ #	Unicode version: 1.1
+-#	Table version: 0.9
++#	Table version: 2.0
+ #	Table format: Format A
+-#	Date: 8 March 1994
+-#	Authors: Glenn Adams <glenn@metis.com>
+-# John H. Jenkins <John_Jenkins@taligent.com>
++#	Date: 2011 October 14 (header updated: 2015 December 02)
+ #
+-#	Copyright (c) 1991-1994 Unicode, Inc. All Rights reserved.
+-#
+-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+-#	No claims are made as to fitness for any particular purpose. No
+-#	warranties of any kind are expressed or implied. The recipient
+-#	agrees to determine applicability of information provided. If this
+-#	file has been provided on magnetic media by Unicode, Inc., the sole
+-#	remedy for any claim will be exchange of defective media within 90
+-#	days of receipt.
++#	General notes:
+ #
+-#	Recipient is granted the right to make copies in any form for
+-#	internal distribution and to freely use the information supplied
+-#	in the creation of products supporting Unicode. Unicode, Inc.
+-#	specifically excludes the right to re-distribute this file directly
+-#	to third parties or other organizations whether for profit or not.
+ #
+-#	General notes:
++# This table contains one set of mappings from JIS X 0212 into Unicode.
++# Note that these data are *possible* mappings only and may not be the
++# same as those used by actual products, nor may they be the best suited
++# for all uses. For more information on the mappings between various code
++# pages incorporating the repertoire of JIS X 0212 and Unicode, consult the
++# VENDORS mapping data.
+ #
+-#	This table contains the data the Unicode Consortium has on how
+-# JIS X 0212 (1983) characters map into Unicode.
+ #
+ #	Format: Three tab-separated columns
+ #		 Column #1 is the JIS X 0212 code (in hex as 0xXXXX)
+ #		 Column #2 is the Unicode (in hex as 0xXXXX)
+ #		 Column #3 the Unicode name (follows a comment sign, '#')
+-#					The official names for Unicode characters U+4E00
+-#					to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
+-#					where XXXX is the code point. Including all these
+-#					names in this file increases its size substantially
+-#					and needlessly. The token "<CJK>" is used for the
+-#					name of these characters. If necessary, it can be
+-#					expanded algorithmically by a parser or editor.
++#			The official names for Unicode characters U+4E00
++#			to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
++#			where XXXX is the code point. Including all these
++#			names in this file increases its size substantially
++#			and needlessly. The token "<CJK>" is used for the
++#			name of these characters. If necessary, it can be
++#			expanded algorithmically by a parser or editor.
+ #
+ #	The entries are in JIS X 0212 order
+ #
+@@ -51,17 +43,11 @@
+ #			the kuten form. For example, 0x2121 -> 0x0101 -> 0101;
+ #			0x6D63 -> 0x4D43 -> 7767
+ #
+-# The kanji mappings are a normative part of ISO/IEC 10646. The
+-# non-kanji mappings are provisional, pending definition of
+-# official mappings by Japanese standards bodies
+-#
+-#	Any comments or problems, contact <John_Jenkins@taligent.com>
+-#
+ #	Notes:
+ #
+ #	1. JIS X 0212 apparently unified the following two symbols
+ #	 into a single character at 0x2922:
+-#
++#	
+ #	 LATIN CAPITAL LETTER D WITH STROKE
+ #	 LATIN CAPITAL LETTER ETH
+ #
+@@ -72,6 +58,23 @@
+ #	 Consequently, in the Unicode mapping, 0x2922 is treated as
+ #	 LATIN CAPITAL LETTER D WITH STROKE.
+ #
++# Revision History:
++#
++# v2.0, 2015 December 02
++# updates to copyright notice and terms of use
++# no changes to character mappings
++#
++# v1.0, 2011 October 14
++# Updated terms of use to current wording.
++# Updated contact information.
++# No changes to the mapping data.
++#
++# v0.9, 8 March 1994
++# First release.
++#
++# Use the Unicode reporting form <http://www.unicode.org/reporting.html>
++# for any questions or comments or to report errors in the data.
++#	 
+ 0x222F	0x02D8	# BREVE
+ 0x2230	0x02C7	# CARON (Mandarin Chinese third tone)
+ 0x2231	0x00B8	# CEDILLA
+diff --git a/ext/mbstring/tests/data/KSX1001.txt b/ext/mbstring/tests/data/KSX1001.txt
+index 5bff605b4532..3ebd300b6341 100644
+--- a/ext/mbstring/tests/data/KSX1001.txt
++++ b/ext/mbstring/tests/data/KSX1001.txt
+@@ -1,11 +1,12 @@
+ #
+ # Name: Unified Hangul (KS X 1001) to Unicode table
+ # Unicode version: 2.0
+-# Table version: 1.0
++# Table version: 1.1
+ # Table format: Format A
+-# Date: 08/16/99
++# Date: 2011 October 14
+ # Authors: Jungshik Shin at jshin@pantheon.yale.edu
+-# General notes: none
++#
++#	Copyright (c) 1999-2011 Unicode, Inc. All Rights reserved.
+ #
+ # This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+ # No claims are made as to fitness for any particular purpose. No
+@@ -15,11 +16,13 @@
+ # remedy for any claim will be exchange of defective media within 90
+ # days of receipt.
+ #
+-# Recipient is granted the right to make copies in any form for
+-# internal distribution and to freely use the information supplied
+-# in the creation of products supporting Unicode. Unicode, Inc.
+-# specifically excludes the right to re-distribute this file directly
+-# to third parties or other organizations whether for profit or not.
++# Unicode, Inc. hereby grants the right to freely use the information
++# supplied in this file in the creation of products supporting the
++# Unicode Standard, and to make copies of this file in any form for
++# internal or external distribution as long as this notice remains
++# attached.
++#
++#	General notes:
+ #
+ # What is enclosed below is the mapping between KS X 1001(KS C 5601-1987
+ # and Unicode 2.0. It's automatically generated from KSC5601.TXT
+@@ -63,6 +66,19 @@
+ # first subtract 0x2020. Then
+ # the high and low bytes correspond to the row(Hang) and the column(Yol),
+ # respectively
++#
++# Revision History:
++#
++# v1.1, 2011 October 14
++# Updated terms of use to current wording.
++# Updated contact information.
++# No changes to the mapping data.
++#
++# v1.0, 08/16/99
++# First release.
++#
++# Use the Unicode reporting form <http://www.unicode.org/reporting.html>
++# for any questions or comments or to report errors in the data.
+ # 
+ 0x2121 0x3000 # IDEOGRAPHIC SPACE
+ 0x2122 0x3001 # IDEOGRAPHIC COMMA
+

_link Changed

mod_php8.conf Changed

php-8.1.13.tar.xz.asc Deleted

php-8.1.13.tar.xz/ext/dom/tests/DOMDocument_loadXML_error2.phpt Deleted

@@ -1,30 +0,0 @@
---TEST--
-Test DOMDocument::loadXML() detects not-well formed XML
---DESCRIPTION--
-This test verifies the method detects attributes values not closed between " or '
-Environment variables used in the test:
-- XML_FILE: the xml file to load
-- LOAD_OPTIONS: the second parameter to pass to the method
-- EXPECTED_RESULT: the expected result
---CREDITS--
-Antonio Diaz Ruiz <dejalatele@gmail.com>
---INI--
-assert.bail=true
---EXTENSIONS--
-dom
---ENV--
-XML_FILE=/not_well_formed2.xml
-LOAD_OPTIONS=0
-EXPECTED_RESULT=0
---FILE_EXTERNAL--
-domdocumentloadxml_test_method.inc
---EXPECTF--
-Warning: DOMDocument::load%r(XML){0,1}%r(): AttValue: " or ' expected %s
-
-Warning: DOMDocument::load%r(XML){0,1}%r(): attributes construct error %s
-
-Warning: DOMDocument::load%r(XML){0,1}%r(): Couldn't find end of Start Tag book %s
-
-Warning: DOMDocument::load%r(XML){0,1}%r(): Opening and ending tag mismatch: books %s
-
-Warning: DOMDocument::load%r(XML){0,1}%r(): Extra content at the end of the document %s

php-8.1.13.tar.xz/ext/dom/tests/DOMDocument_load_error2.phpt Deleted

@@ -1,30 +0,0 @@
---TEST--
-Test DOMDocument::load() detects not-well formed XML
---DESCRIPTION--
-This test verifies the method detects attributes values not closed between " or '
-Environment variables used in the test:
-- XML_FILE: the xml file to load
-- LOAD_OPTIONS: the second parameter to pass to the method
-- EXPECTED_RESULT: the expected result
---CREDITS--
-Antonio Diaz Ruiz <dejalatele@gmail.com>
---INI--
-assert.bail=true
---EXTENSIONS--
-dom
---ENV--
-XML_FILE=/not_well_formed2.xml
-LOAD_OPTIONS=0
-EXPECTED_RESULT=0
---FILE_EXTERNAL--
-domdocumentload_test_method.inc
---EXPECTF--
-Warning: DOMDocument::load%r(XML){0,1}%r(): AttValue: " or ' expected %s
-
-Warning: DOMDocument::load%r(XML){0,1}%r(): attributes construct error %s
-
-Warning: DOMDocument::load%r(XML){0,1}%r(): Couldn't find end of Start Tag book %s
-
-Warning: DOMDocument::load%r(XML){0,1}%r(): Opening and ending tag mismatch: books %s
-
-Warning: DOMDocument::load%r(XML){0,1}%r(): Extra content at the end of the document %s

php-8.1.13.tar.xz/ext/xml/tests/bug26614_libxml.phpt Deleted

@@ -1,94 +0,0 @@
---TEST--
-Bug #26614 (CDATA sections skipped on line count)
---EXTENSIONS--
-xml
---SKIPIF--
-<?php
-if (!defined("LIBXML_VERSION")) die('skip libxml2 test');
-?>
---FILE--
-<?php
-/*
-this test works fine with Expat but fails with libxml
-which we now use as default
-
-further investigation has shown that not only line count
-is skipped on CDATA sections but that libxml does also
-show different column numbers and byte positions depending
-on context and in opposition to what one would expect to
-see and what good old Expat reported just fine ...
-*/
-
-$xmls = array();
-
-// Case 1: CDATA Sections
-$xmls"CDATA" ='<?xml version="1.0" encoding="iso-8859-1" ?>
-<data>
-<!CDATA
-multi
-line
-CDATA
-block
->
-</data>';
-
-// Case 2: replace some characters so that we get comments instead
-$xmls"Comment" ='<?xml version="1.0" encoding="iso-8859-1" ?>
-<data>
-
-</data>';
-
-// Case 3: replace even more characters so that only textual data is left
-$xmls"Text" ='<?xml version="1.0" encoding="iso-8859-1" ?>
-<data>
--!-- ATA
-multi
-line
-CDATA
-block
----
-</data>';
-
-function startElement($parser, $name, $attrs) {
- printf("<$name> at line %d, col %d (byte %d)\n",
- xml_get_current_line_number($parser),
- xml_get_current_column_number($parser),
- xml_get_current_byte_index($parser));
-}
-
-function endElement($parser, $name) {
- printf("</$name> at line %d, col %d (byte %d)\n",
- xml_get_current_line_number($parser),
- xml_get_current_column_number($parser),
- xml_get_current_byte_index($parser));
-}
-
-function characterData($parser, $data) {
- // dummy
-}
-
-foreach ($xmls as $desc => $xml) {
- echo "$desc\n";
- $xml_parser = xml_parser_create();
- xml_set_element_handler($xml_parser, "startElement", "endElement");
- xml_set_character_data_handler($xml_parser, "characterData");
- if (!xml_parse($xml_parser, $xml, true))
- echo "Error: ".xml_error_string(xml_get_error_code($xml_parser))."\n";
- xml_parser_free($xml_parser);
-}
-?>
---EXPECTF--
-CDATA
-<DATA> at line 2, col %d (byte 9)
-</DATA> at line 9, col %d (byte 55)
-Comment
-<DATA> at line 2, col %d (byte 9)
-</DATA> at line 9, col %d (byte 55)
-Text
-<DATA> at line 2, col %d (byte 9)
-</DATA> at line 9, col %d (byte 55)

php-8.1.13.tar.xz/.cirrus.yml -> php-8.1.21.tar.xz/.cirrus.yml Changed

@@ -1,12 +1,12 @@
 env:
   CIRRUS_CLONE_DEPTH: 1
-  ARCH: amd64
 
-freebsd_instance:
-  image_family: freebsd-13-0
-
-task:
+freebsd_task:
   name: FREEBSD_DEBUG_NTS
+  freebsd_instance:
+    image_family: freebsd-13-0
+  env:
+    ARCH: amd64
   install_script:
     #- sed -i -e 's/quarterly/latest/g' /etc/pkg/FreeBSD.conf
     #- pkg upgrade -y
@@ -26,3 +26,198 @@
     - export SKIP_IO_CAPTURE_TESTS=1
     - export CI_NO_IPV6=1
     - sapi/cli/php run-tests.php -P -q -j2 -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP --offline --show-diff --show-slow 1000 --set-timeout 120 -d zend_extension=opcache.so
+
+arm_task:
+  name: ARM_DEBUG_NTS
+  arm_container:
+    image: gcc:10
+    additional_containers:
+      - name: mysql
+        image: mysql:8
+        port: 3306
+        cpu: 1.0
+        memory: 1G
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: true
+          MYSQL_ROOT_PASSWORD: ""
+          MYSQL_DATABASE: "test"
+      - name: postgres
+        image: postgres:latest
+        port: 5432
+        env:
+          POSTGRES_PASSWORD: "postgres"
+          POSTGRES_DB: "test"
+  install_script:
+    - export DEBIAN_FRONTEND=noninteractive
+    - apt-get update -y
+    - >-
+        apt-get install -y
+        bison
+        re2c
+        locales
+        locales-all
+        ldap-utils
+        openssl
+        slapd
+        libgmp-dev
+        libicu-dev
+        libtidy-dev
+        libenchant-2-dev
+        libaspell-dev
+        libpspell-dev
+        libsasl2-dev
+        libxpm-dev
+        libzip-dev
+        libsqlite3-dev
+        libwebp-dev
+        libonig-dev
+        libkrb5-dev
+        libgssapi-krb5-2
+        libcurl4-openssl-dev
+        libxml2-dev
+        libxslt1-dev
+        libpq-dev
+        libreadline-dev
+        libldap2-dev
+        libsodium-dev
+        libargon2-0-dev
+        libmm-dev
+        libsnmp-dev
+        snmpd
+        `#snmp-mibs-downloader`
+        freetds-dev
+        `#unixodbc-dev`
+        libc-client-dev
+        dovecot-core
+        dovecot-pop3d
+        dovecot-imapd
+        sendmail
+        firebird-dev
+        liblmdb-dev
+        libtokyocabinet-dev
+        libdb-dev
+        libqdbm-dev
+        libjpeg-dev
+        libpng-dev
+        libfreetype6-dev
+  build_script:
+    - ./buildconf -f
+    - >-
+        ./configure
+        --enable-debug
+        --enable-zts
+        --enable-option-checking=fatal
+        --prefix=/usr
+        --enable-phpdbg
+        --enable-fpm
+        --enable-opcache
+        --with-pdo-mysql=mysqlnd
+        --with-mysqli=mysqlnd
+        --with-pgsql
+        --with-pdo-pgsql
+        --with-pdo-sqlite
+        --enable-intl
+        --without-pear
+        --enable-gd
+        --with-jpeg
+        --with-webp
+        --with-freetype
+        --with-xpm
+        --enable-exif
+        --with-zip
+        --with-zlib
+        --with-zlib-dir=/usr
+        --enable-soap
+        --enable-xmlreader
+        --with-xsl
+        --with-tidy
+        --enable-sysvsem
+        --enable-sysvshm
+        --enable-shmop
+        --enable-pcntl
+        --with-readline
+        --enable-mbstring
+        --with-curl
+        --with-gettext
+        --enable-sockets
+        --with-bz2
+        --with-openssl
+        --with-gmp
+        --enable-bcmath
+        --enable-calendar
+        --enable-ftp
+        --with-pspell=/usr
+        --with-enchant=/usr
+        --with-kerberos
+        --enable-sysvmsg
+        --with-ffi
+        --enable-zend-test
+        --enable-dl-test=shared
+        --with-ldap
+        --with-ldap-sasl
+        --with-password-argon2
+        --with-mhash
+        --with-sodium
+        --enable-dba
+        --with-cdb
+        --enable-flatfile
+        --enable-inifile
+        --with-tcadb
+        --with-lmdb
+        --with-qdbm
+        --with-snmp
+        `#--with-unixODBC`
+        --with-imap
+        --with-kerberos
+        --with-imap-ssl
+        `#--with-pdo-odbc=unixODBC,/usr`
+        `#--with-pdo-oci=shared,instantclient,/opt/oracle/instantclient`
+        `#--with-oci8=shared,instantclient,/opt/oracle/instantclient`
+        --with-config-file-path=/etc
+        --with-config-file-scan-dir=/etc/php.d
+        --with-pdo-firebird
+        `#--with-pdo-dblib`
+        --disable-phpdbg
+        `#--enable-werror`
+    - make -j2 > /dev/null
+    - make install
+    - mkdir -p /etc/php.d
+    - echo opcache.enable_cli=1 > /etc/php.d/opcache.ini
+    - echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
+    # Specify opcache.preload_user as we're running as root.
+    - echo opcache.preload_user=root >> /etc/php.d/opcache.ini
+  tests_script:
+    - export SKIP_IO_CAPTURE_TESTS=1
+    - export CI_NO_IPV6=1
+    - export MYSQL_TEST_HOST=127.0.0.1
+    - export MYSQL_TEST_USER=root
+    - export MYSQL_TEST_PASSWD=
+    - export PDO_MYSQL_TEST_DSN="mysql:host=127.0.0.1;dbname=test"
+    - export PDO_MYSQL_TEST_USER=root
+    - export PDO_MYSQL_TEST_PASS=
+    - export PDO_PGSQL_TEST_DSN="pgsql:host=127.0.0.1 port=5432 dbname=test user=postgres password=postgres"
+    - >-
+        sapi/cli/php run-tests.php
+        -d zend_extension=opcache.so
+        -d opcache.enable_cli=1
+        -d opcache.jit_buffer_size=16M
+        -d opcache.jit=function
+        -P -q -x -j2
+        -g FAIL,BORK,LEAK,XLEAK
+        --offline
+        --show-diff
+        --show-slow 1000
+        --set-timeout 120
+    - >-
+        sapi/cli/php run-tests.php
+        -d zend_extension=opcache.so
+        -d opcache.enable_cli=1
+        -d opcache.jit_buffer_size=16M
+        -d opcache.jit=tracing
+        -P -q -x -j2
+        -g FAIL,BORK,LEAK,XLEAK
+        --offline
+        --show-diff
+        --show-slow 1000
+        --set-timeout 120
+        --repeat 2

php-8.1.13.tar.xz/.github/actions/apt-x32/action.yml -> php-8.1.21.tar.xz/.github/actions/apt-x32/action.yml Changed

php-8.1.13.tar.xz/.github/actions/brew/action.yml -> php-8.1.21.tar.xz/.github/actions/brew/action.yml Changed

php-8.1.13.tar.xz/.github/actions/configure-macos/action.yml -> php-8.1.21.tar.xz/.github/actions/configure-macos/action.yml Changed

php-8.1.21.tar.xz/.github/actions/notify-slack Added

php-8.1.21.tar.xz/.github/actions/notify-slack/action.yml Added

php-8.1.13.tar.xz/.github/actions/setup-x64/action.yml -> php-8.1.21.tar.xz/.github/actions/setup-x64/action.yml Changed

php-8.1.13.tar.xz/.github/nightly_matrix.php -> php-8.1.21.tar.xz/.github/nightly_matrix.php Changed

php-8.1.13.tar.xz/.github/scripts/windows/build.bat -> php-8.1.21.tar.xz/.github/scripts/windows/build.bat Changed

php-8.1.13.tar.xz/.github/scripts/windows/build_task.bat -> php-8.1.21.tar.xz/.github/scripts/windows/build_task.bat Changed

@@ -1,5 +1,10 @@
 @echo off
 
+if /i "%APPVEYOR%%GITHUB_ACTIONS%" neq "True" (
+    echo for CI only
+    exit /b 3
+)
+
 if "%APPVEYOR%" equ "True" rmdir /s /q C:\cygwin >NUL 2>NUL
 if %errorlevel% neq 0 exit /b 3
 if "%APPVEYOR%" equ "True" rmdir /s /q C:\cygwin64 >NUL 2>NUL
@@ -18,19 +23,12 @@
 if %errorlevel% neq 0 exit /b 3
 if "%APPVEYOR%" equ "True" rmdir /s /q c:\OpenSSL-v11-Win64 >NUL 2>NUL
 if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" del /f /q C:\Windows\System32\libcrypto-1_1-x64.dll >NUL 2>NUL
+del /f /q C:\Windows\System32\libcrypto-1_1-x64.dll >NUL 2>NUL
 if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" del /f /q C:\Windows\System32\libssl-1_1-x64.dll >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-
-cd /D %APPVEYOR_BUILD_FOLDER%
+del /f /q C:\Windows\System32\libssl-1_1-x64.dll >NUL 2>NUL
 if %errorlevel% neq 0 exit /b 3
 
-if /i "%APPVEYOR_REPO_BRANCH:~0,4%" equ "php-" (
-	set BRANCH=%APPVEYOR_REPO_BRANCH:~4,3%
-) else (
-	set BRANCH=master
-)
+call %~dp0find-target-branch.bat
 set STABILITY=staging
 set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%BRANCH%-%PHP_SDK_VS%-%PHP_SDK_ARCH%
 rem SDK is cached, deps info is cached as well
@@ -51,7 +49,12 @@
 if "%THREAD_SAFE%" equ "0" set ADD_CONF=%ADD_CONF% --disable-zts
 if "%INTRINSICS%" neq "" set ADD_CONF=%ADD_CONF% --enable-native-intrinsics=%INTRINSICS%
 
-set CFLAGS=/W1 /WX
+rem Some undefined behavior is reported on 32-bit, this should be fixed
+if "%PLATFORM%" == "x86" (
+	set CFLAGS=/W1
+) else (
+	set CFLAGS=/W1 /WX
+)
 
 cmd /c configure.bat ^
 	--enable-snapshot-build ^

php-8.1.21.tar.xz/.github/scripts/windows/find-target-branch.bat Added

php-8.1.13.tar.xz/.github/scripts/windows/test.bat -> php-8.1.21.tar.xz/.github/scripts/windows/test.bat Changed

php-8.1.13.tar.xz/.github/scripts/windows/test_task.bat -> php-8.1.21.tar.xz/.github/scripts/windows/test_task.bat Changed

@@ -1,14 +1,18 @@
 @echo off
 
+if /i "%APPVEYOR%%GITHUB_ACTIONS%" neq "True" (
+ echo for CI only
+ exit /b 3
+)
+
 set NO_INTERACTION=1
 set REPORT_EXIT_STATUS=1
 set SKIP_IO_CAPTURE_TESTS=1
 
-if /i "%APPVEYOR_REPO_BRANCH:~0,4%" equ "php-" (
-	set BRANCH=%APPVEYOR_REPO_BRANCH:~4,3%
+call %~dp0find-target-branch.bat
+if "%BRANCH%" neq "master" (
 	set STABILITY=stable
 ) else (
-	set BRANCH=master
 	set STABILITY=staging
 )
 set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%BRANCH%-%PHP_SDK_VS%-%PHP_SDK_ARCH%
@@ -28,7 +32,12 @@
 set PDO_MYSQL_TEST_HOST=%MYSQL_TEST_HOST%
 set PDO_MYSQL_TEST_PORT=%MYSQL_TEST_PORT%
 set PDO_MYSQL_TEST_DSN=mysql:host=%PDO_MYSQL_TEST_HOST%;port=%PDO_MYSQL_TEST_PORT%;dbname=test
-"C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe" --user=%MYSQL_TEST_USER% -e "CREATE DATABASE IF NOT EXISTS test"
+if /i "%APPVEYOR%" equ "True" (
+ set TMP_MYSQL_BIN=%ProgramFiles%\MySql\MySQL Server 5.7\bin
+) else (
+ set TMP_MYSQL_BIN=C:\mysql\bin
+)
+"%TMP_MYSQL_BIN%\mysql.exe" --host=%PDO_MYSQL_TEST_HOST% --port=%MYSQL_TEST_PORT% --user=%MYSQL_TEST_USER% --password=%MYSQL_TEST_PASSWD% -e "CREATE DATABASE IF NOT EXISTS test"
 if %errorlevel% neq 0 exit /b 3
 
 rem setup PostgreSQL related exts
@@ -37,23 +46,35 @@
 rem set PGSQL_TEST_CONNSTR=host=127.0.0.1 dbname=test port=5432 user=postgres password=Password12!
 echo ^<?php $conn_str = "host=127.0.0.1 dbname=test port=5432 user=%PGUSER% password=%PGPASSWORD%"; ?^> >> "./ext/pgsql/tests/config.inc"
 set PDO_PGSQL_TEST_DSN=pgsql:host=127.0.0.1 port=5432 dbname=test user=%PGUSER% password=%PGPASSWORD%
-"C:\Program Files\PostgreSQL\10\bin\createdb.exe" test
+if /i "%APPVEYOR%" equ "True" (
+ set TMP_POSTGRESQL_BIN=%ProgramFiles%\PostgreSQL\10\bin
+) else (
+ set TMP_POSTGRESQL_BIN=%PGBIN%
+)
+"%TMP_POSTGRESQL_BIN%\createdb.exe" test
 if %errorlevel% neq 0 exit /b 3
 
 rem setup ODBC related exts
 set ODBC_TEST_USER=sa
 set ODBC_TEST_PASS=Password12!
-set ODBC_TEST_DSN=Driver={ODBC Driver 13 for SQL Server};Server=(local)\SQL2017;Database=master;uid=%ODBC_TEST_USER%;pwd=%ODBC_TEST_PASS%
+if /i "%APPVEYOR%" equ "True" (
+ set ODBC_TEST_DSN=Driver={ODBC Driver 13 for SQL Server};Server=^(local^)\SQL2017;Database=master;uid=%ODBC_TEST_USER%;pwd=%ODBC_TEST_PASS%
+) else (
+ set ODBC_TEST_DSN=Driver={ODBC Driver 17 for SQL Server};Server=^(local^)\SQLEXPRESS;Database=master;uid=%ODBC_TEST_USER%;pwd=%ODBC_TEST_PASS%
+)
 set PDOTEST_DSN=odbc:%ODBC_TEST_DSN%
 
 rem prepare for ext/openssl
-if "%APPVEYOR%" equ "True" rmdir /s /q C:\OpenSSL-Win32 >NUL 2>NUL
-if "%APPVEYOR%" equ "True" rmdir /s /q C:\OpenSSL-Win64 >NUL 2>NUL
+rmdir /s /q C:\OpenSSL-Win32 >NUL 2>NUL
+rmdir /s /q C:\OpenSSL-Win64 >NUL 2>NUL
 if "%PLATFORM%" == "x64" (
 	set OPENSSLDIR="C:\Program Files\Common Files\SSL"
 ) else (
 	set OPENSSLDIR="C:\Program Files (x86)\Common Files\SSL"
 )
+if /i "%GITHUB_ACTIONS%" equ "True" (
+ rmdir /s /q %OPENSSLDIR% >nul 2>&1
+)
 mkdir %OPENSSLDIR%
 if %errorlevel% neq 0 exit /b 3
 copy %DEPS_DIR%\template\ssl\openssl.cnf %OPENSSLDIR%
@@ -68,28 +89,18 @@
 if "%OPCACHE%" equ "1" set OPCACHE_OPTS=%OPCACHE_OPTS% -d extension=mysqli
 
 rem prepare for enchant
-mkdir C:\usr\local\lib\enchant-2
+mkdir %~d0\usr\local\lib\enchant-2
 if %errorlevel% neq 0 exit /b 3
-copy %DEPS_DIR%\bin\libenchant2_hunspell.dll C:\usr\local\lib\enchant-2
+copy %DEPS_DIR%\bin\libenchant2_hunspell.dll %~d0\usr\local\lib\enchant-2
 if %errorlevel% neq 0 exit /b 3
-reg add HKEY_CURRENT_USER\SOFTWARE\Enchant\Config /v Module_Dir /t REG_SZ /d c:\enchant_plugins
+mkdir %~d0\usr\local\share\enchant\hunspell
 if %errorlevel% neq 0 exit /b 3
-set PHP_BUILD_CACHE_ENCHANT_DICT_DIR=%PHP_BUILD_CACHE_BASE_DIR%\enchant_dict
-if not exist "%PHP_BUILD_CACHE_ENCHANT_DICT_DIR%" (
-	echo Creating %PHP_BUILD_CACHE_ENCHANT_DICT_DIR%
-	mkdir "%PHP_BUILD_CACHE_ENCHANT_DICT_DIR%"
-)
-if not exist "%PHP_BUILD_CACHE_ENCHANT_DICT_DIR%\en_US.aff" (
-	echo Fetching enchant dicts
-	pushd %PHP_BUILD_CACHE_ENCHANT_DICT_DIR%
-	del /q *
-	powershell -Command wget http://windows.php.net/downloads/qa/appveyor/ext/enchant/dict.zip -OutFile dict.zip
-	unzip dict.zip
-	del /q dict.zip
-	popd
-)
-mkdir %LOCALAPPDATA%\enchant\hunspell
-copy %PHP_BUILD_CACHE_ENCHANT_DICT_DIR%\* %LOCALAPPDATA%\enchant\hunspell
+echo Fetching enchant dicts
+pushd %~d0\usr\local\share\enchant\hunspell
+powershell -Command wget http://windows.php.net/downloads/qa/appveyor/ext/enchant/dict.zip -OutFile dict.zip
+unzip dict.zip
+del /q dict.zip
+popd
 
 set PHP_BUILD_DIR=%PHP_BUILD_OBJ_DIR%\Release
 if "%THREAD_SAFE%" equ "1" set PHP_BUILD_DIR=%PHP_BUILD_DIR%_TS
@@ -113,17 +124,20 @@
 
 set TEST_PHP_JUNIT=c:\junit.out.xml
 
-cd "%APPVEYOR_BUILD_FOLDER%"
-nmake test TESTS="%OPCACHE_OPTS% -q --offline --show-diff --show-slow 1000 --set-timeout 120 --temp-source c:\tests_tmp --temp-target c:\tests_tmp --bless %PARALLEL%"
+nmake test TESTS="%OPCACHE_OPTS% -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP -q --offline --show-diff --show-slow 1000 --set-timeout 120 --temp-source c:\tests_tmp --temp-target c:\tests_tmp --bless %PARALLEL%"
 
 set EXIT_CODE=%errorlevel%
 
-appveyor PushArtifact %TEST_PHP_JUNIT%
-
 if %EXIT_CODE% GEQ 1 (
 	git checkout ext\pgsql\tests\config.inc
 	git diff > bless_tests.patch
-	appveyor PushArtifact bless_tests.patch
+)
+
+if /i "%APPVEYOR%" equ "True" (
+	appveyor PushArtifact %TEST_PHP_JUNIT%
+	if %EXIT_CODE% GEQ 1 (
+		appveyor PushArtifact bless_tests.patch
+	)
 )
 
 exit /b %EXIT_CODE%

php-8.1.13.tar.xz/.github/workflows/nightly.yml -> php-8.1.21.tar.xz/.github/workflows/nightly.yml Changed

@@ -30,6 +30,11 @@
 - name: Generate Matrix
 id: set-matrix
 run: php .github/nightly_matrix.php "${{ github.event_name }}" "${{ github.run_attempt }}"
+ - name: Notify Slack
+ if: failure()
+ uses: ./.github/actions/notify-slack
+ with:
+ token: ${{ secrets.ACTION_MONITORING_SLACK }}
 LINUX_X64:
 needs: GENERATE_MATRIX
 if: ${{ needs.GENERATE_MATRIX.outputs.branches != '' }}
@@ -41,12 +46,11 @@
 debug: true, false
 name: ''
 run_tests_parameters: ''
- timeout_minutes: 360
+ test_function_jit: true
 zts: true, false
 include: ${{ fromJson(needs.GENERATE_MATRIX.outputs.matrix-include) }}
 name: "${{ matrix.branch.name }}_LINUX_X64${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
 runs-on: ubuntu-20.04
- timeout-minutes: ${{ matrix.timeout_minutes }}
 steps:
 - name: git checkout
 uses: actions/checkout@v3
@@ -92,6 +96,9 @@
 -d zend_extension=opcache.so
 -d opcache.enable_cli=1
 - name: Test Function JIT
+ # ASAN frequently timeouts. Each test run takes ~90 minutes, we can
+ # avoid running into the 6 hour timeout by skipping the function JIT.
+ if: matrix.test_function_jit
 uses: ./.github/actions/test-linux
 with:
 runTestsParameters: >-
@@ -102,6 +109,11 @@
 -d opcache.jit=1205
 - name: Verify generated files are up to date
 uses: ./.github/actions/verify-generated-files
+ - name: Notify Slack
+ if: failure()
+ uses: ./.github/actions/notify-slack
+ with:
+ token: ${{ secrets.ACTION_MONITORING_SLACK }}
 LINUX_X32:
 needs: GENERATE_MATRIX
 if: ${{ needs.GENERATE_MATRIX.outputs.branches != '' }}
@@ -173,6 +185,11 @@
 -d opcache.enable_cli=1
 -d opcache.jit_buffer_size=16M
 -d opcache.jit=1205
+ - name: Notify Slack
+ if: failure()
+ uses: ./.github/actions/notify-slack
+ with:
+ token: ${{ secrets.ACTION_MONITORING_SLACK }}
 MACOS:
 needs: GENERATE_MATRIX
 if: ${{ needs.GENERATE_MATRIX.outputs.branches != '' }}
@@ -231,6 +248,11 @@
 -d opcache.jit=1205
 - name: Verify generated files are up to date
 uses: ./.github/actions/verify-generated-files
+ - name: Notify Slack
+ if: failure()
+ uses: ./.github/actions/notify-slack
+ with:
+ token: ${{ secrets.ACTION_MONITORING_SLACK }}
 COVERAGE_DEBUG_NTS:
 if: github.repository_owner == 'php' || github.event_name == 'workflow_dispatch'
 runs-on: ubuntu-20.04
@@ -265,6 +287,11 @@
 - name: Upload Test Coverage to Codecov.io
 if: always()
 run: bash <(curl -s https://codecov.io/bash)
+ - name: Notify Slack
+ if: failure()
+ uses: ./.github/actions/notify-slack
+ with:
+ token: ${{ secrets.ACTION_MONITORING_SLACK }}
 COMMUNITY:
 needs: GENERATE_MATRIX
 if: ${{ needs.GENERATE_MATRIX.outputs.branches != '' }}
@@ -364,6 +391,27 @@
 git rev-parse HEAD
 sed -i 's/PHP_SAPI/"cli-server"/g' var/cache/dev/App_KernelDevDebugContainer.preload.php
 php -d opcache.preload=var/cache/dev/App_KernelDevDebugContainer.preload.php public/index.php
+ - name: Test Wordpress
+ if: always()
+ run: |
+ git clone https://github.com/WordPress/wordpress-develop.git wordpress --depth=1
+ cd wordpress
+ git rev-parse HEAD
+ export ASAN_OPTIONS=exitcode=139
+ php /usr/bin/composer install --no-progress --ignore-platform-reqs
+ cp wp-tests-config-sample.php wp-tests-config.php
+ sed -i 's/youremptytestdbnamehere/test/g' wp-tests-config.php
+ sed -i 's/yourusernamehere/root/g' wp-tests-config.php
+ sed -i 's/yourpasswordhere/root/g' wp-tests-config.php
+ php vendor/bin/phpunit || EXIT_CODE=$?
+ if $EXIT_CODE -gt 128 ; then
+ exit 1
+ fi
+ - name: Notify Slack
+ if: failure()
+ uses: ./.github/actions/notify-slack
+ with:
+ token: ${{ secrets.ACTION_MONITORING_SLACK }}
 OPCACHE_VARIATION:
 needs: GENERATE_MATRIX
 if: ${{ needs.GENERATE_MATRIX.outputs.branches != '' }}
@@ -435,6 +483,11 @@
 -d opcache.file_cache_only=1
 - name: Verify generated files are up to date
 uses: ./.github/actions/verify-generated-files
+ - name: Notify Slack
+ if: failure()
+ uses: ./.github/actions/notify-slack
+ with:
+ token: ${{ secrets.ACTION_MONITORING_SLACK }}
 MSAN:
 needs: GENERATE_MATRIX
 if: ${{ needs.GENERATE_MATRIX.outputs.branches != '' }}
@@ -527,6 +580,11 @@
 -d opcache.enable_cli=1
 - name: Verify generated files are up to date
 uses: ./.github/actions/verify-generated-files
+ - name: Notify Slack
+ if: failure()
+ uses: ./.github/actions/notify-slack
+ with:
+ token: ${{ secrets.ACTION_MONITORING_SLACK }}
 LIBMYSQLCLIENT:
 needs: GENERATE_MATRIX
 if: ${{ needs.GENERATE_MATRIX.outputs.branches != '' }}
@@ -563,7 +621,7 @@
 - name: Build mysql-5.7
 uses: ./.github/actions/build-libmysqlclient
 with:
- libmysql: mysql-5.7.38-linux-glibc2.12-x86_64.tar.gz
+ libmysql: mysql-5.7.41-linux-glibc2.12-x86_64.tar.gz
 withMysqli: ${{ matrix.branch.ref == 'PHP-8.1' }}
 - name: Test mysql-5.7
 uses: ./.github/actions/test-libmysqlclient
@@ -574,7 +632,7 @@
 with:
 # FIXME: There are new warnings
 # configurationParameters: --enable-werror
- libmysql: mysql-8.0.30-linux-glibc2.12-x86_64.tar.xz
+ libmysql: mysql-8.0.33-linux-glibc2.12-x86_64.tar.xz
 withMysqli: ${{ matrix.branch.ref == 'PHP-8.1' }}
 - name: Test mysql-8.0
 uses: ./.github/actions/test-libmysqlclient
@@ -582,3 +640,8 @@
 withMysqli: ${{ matrix.branch.ref == 'PHP-8.1' }}
 - name: Verify generated files are up to date
 uses: ./.github/actions/verify-generated-files
+ - name: Notify Slack
+ if: failure()
+ uses: ./.github/actions/notify-slack
+ with:
+ token: ${{ secrets.ACTION_MONITORING_SLACK }}

php-8.1.13.tar.xz/.github/workflows/push.yml -> php-8.1.21.tar.xz/.github/workflows/push.yml Changed

@@ -17,6 +17,12 @@
   pull_request:
     branches:
       - '**'
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.url || github.run_id }}
+  cancel-in-progress: true
+env:
+  CC: ccache gcc
+  CXX: ccache g++
 jobs:
   LINUX_X64:
     strategy:
@@ -38,6 +44,14 @@
         uses: ./.github/actions/setup-oracle
       - name: apt
         uses: ./.github/actions/apt-x64
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          # This duplicates the "job.name" expression above because
+          # GitHub has no way to query the job name (github.job is the
+          # job id, not the job name)
+          key: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}-${{hashFiles('main/php_version.h')}}"
+          append-timestamp: false
       - name: ./configure
         uses: ./.github/actions/configure-x64
         with:
@@ -83,6 +97,11 @@
         uses: actions/checkout@v3
       - name: apt
         uses: ./.github/actions/apt-x32
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          key: "${{github.job}}-${{hashFiles('main/php_version.h')}}"
+          append-timestamp: false
       - name: ./configure
         uses: ./.github/actions/configure-x32
         with:
@@ -109,6 +128,11 @@
         uses: actions/checkout@v3
       - name: brew
         uses: ./.github/actions/brew
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          key: "${{github.job}}-${{hashFiles('main/php_version.h')}}"
+          append-timestamp: false
       - name: ./configure
         uses: ./.github/actions/configure-macos
         with:
@@ -131,3 +155,47 @@
             -d opcache.jit_buffer_size=16M
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
+  WINDOWS:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - x64: true
+            zts: false
+            opcache: true
+          - x64: false
+            zts: true
+            opcache: false
+    name: "WINDOWS_${{ matrix.x64 && 'X64' || 'X86' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
+    runs-on: windows-2019
+    env:
+      PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
+      PHP_BUILD_OBJ_DIR: C:\obj
+      PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk
+      PHP_BUILD_SDK_BRANCH: php-sdk-2.2.0
+      PHP_BUILD_CRT: vs16
+      PLATFORM: ${{ matrix.x64 && 'x64' || 'x86' }}
+      THREAD_SAFE: "${{ matrix.zts && '1' || '0' }}"
+      INTRINSICS: "${{ matrix.zts && 'AVX2' || '' }}"
+      PARALLEL: -j2
+      OPCACHE: "${{ matrix.opcache && '1' || '0' }}"
+    steps:
+      - name: git config
+        run: git config --global core.autocrlf false && git config --global core.eol lf
+      - name: git checkout
+        uses: actions/checkout@v3
+      - name: Setup MySQL
+        run: |
+          choco install mysql -y --no-progress --params="/port:3306"
+          mysql.exe --port=3306 --user=root --password="" -e "ALTER USER 'root'@'localhost' IDENTIFIED BY 'Password12!'; FLUSH PRIVILEGES;"
+      - name: Setup MSSQL
+        run: |
+          choco install sql-server-express -y --no-progress --install-arguments="/SECURITYMODE=SQL /SAPWD=Password12!"
+      - name: Setup PostgreSQL
+        run: |
+          Set-Service -Name "postgresql-x64-14" -StartupType manual -Status Running
+          pwsh -Command { $env:PGPASSWORD="root"; & "$env:PGBIN\psql" -U postgres -c "ALTER USER postgres WITH PASSWORD 'Password12!';" }
+      - name: Build
+        run: .github/scripts/windows/build.bat
+      - name: Test
+        run: .github/scripts/windows/test.bat

php-8.1.13.tar.xz/.gitignore -> php-8.1.21.tar.xz/.gitignore Changed

php-8.1.13.tar.xz/.travis.yml -> php-8.1.21.tar.xz/.travis.yml Changed

php-8.1.13.tar.xz/NEWS -> php-8.1.21.tar.xz/NEWS Changed

@@ -1,5 +1,489 @@
 PHP NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+06 Jun 2023, PHP 8.1.21
+
+- CLI:
+ . Fixed bug GH-11246 (cli/get_set_process_title fails on MacOS).
+ (James Lucas)
+
+- Core:
+ . Fixed build for the riscv64 architecture/GCC 12. (Daniil Gentili)
+
+- Curl:
+ . Fixed bug GH-11433 (Unable to set CURLOPT_ACCEPT_ENCODING to NULL).
+ (nielsdos)
+
+- DOM:
+ . Fixed bugs GH-11288 and GH-11289 and GH-11290 and GH-9142 (DOMExceptions
+ and segfaults with replaceWith). (nielsdos)
+ . Fixed bug GH-10234 (Setting DOMAttr::textContent results in an empty
+ attribute value). (nielsdos)
+ . Fix return value in stub file for DOMNodeList::item. (divinity76)
+ . Fix spec compliance error with '*' namespace for
+ DOMDocument::getElementsByTagNameNS. (nielsdos)
+ . Fix DOMElement::append() and DOMElement::prepend() hierarchy checks.
+ (nielsdos)
+ . Fixed bug GH-11347 (Memory leak when calling a static method inside an
+ xpath query). (nielsdos)
+ . Fixed bug #67440 (append_node of a DOMDocumentFragment does not reconcile
+ namespaces). (nielsdos)
+ . Fixed bug #81642 (DOMChildNode::replaceWith() bug when replacing a node
+ with itself). (nielsdos)
+ . Fixed bug #77686 (Removed elements are still returned by getElementById).
+ (nielsdos)
+ . Fixed bug #70359 (print_r() on DOMAttr causes Segfault in
+ php_libxml_node_free_list()). (nielsdos)
+ . Fixed bug #78577 (Crash in DOMNameSpace debug info handlers). (nielsdos)
+ . Fix lifetime issue with getAttributeNodeNS(). (nielsdos)
+ . Fix "invalid state error" with cloned namespace declarations. (nielsdos)
+ . Fixed bug #55294 and #47530 and #47847 (various namespace reconciliation
+ issues). (nielsdos)
+ . Fixed bug #80332 (Completely broken array access functionality with
+ DOMNamedNodeMap). (nielsdos)
+
+- Opcache:
+ . Fix allocation loop in zend_shared_alloc_startup(). (nielsdos)
+ . Access violation on smm_shared_globals with ALLOC_FALLBACK. (KoudelkaB)
+ . Fixed bug GH-11336 (php still tries to unlock the shared memory ZendSem
+ with opcache.file_cache_only=1 but it was never locked). (nielsdos)
+
+- OpenSSL:
+ . Fixed bug GH-9356 Incomplete validation of IPv6 Address fields in
+ subjectAltNames (James Lucas, Jakub Zelenka).
+
+- PGSQL:
+ . Fixed intermittent segfault with pg_trace. (David Carlier)
+
+- Phar:
+ . Fix cross-compilation check in phar generation for FreeBSD. (peter279k)
+
+- SPL:
+ . Fixed bug GH-11338 (SplFileInfo empty getBasename with more than one
+ slash). (nielsdos)
+
+- Standard:
+ . Fix access on NULL pointer in array_merge_recursive(). (ilutov)
+ . Fix exception handling in array_multisort(). (ilutov)
+
+08 Jun 2023, PHP 8.1.20
+
+- Core:
+ . Fixed bug GH-9068 (Conditional jump or move depends on uninitialised
+ value(s)). (nielsdos)
+ . Fixed bug GH-11189 (Exceeding memory limit in zend_hash_do_resize leaves
+ the array in an invalid state). (Bob)
+ . Fixed bug GH-11222 (foreach by-ref may jump over keys during a rehash).
+ (Bob)
+
+- Date:
+ . Fixed bug GH-11281 (DateTimeZone::getName() does not include seconds in
+ offset). (nielsdos)
+
+- Exif:
+ . Fixed bug GH-10834 (exif_read_data() cannot read smaller stream wrapper
+ chunk sizes). (nielsdos)
+
+- FPM:
+ . Fixed bug GH-10461 (PHP-FPM segfault due to after free usage of
+ child->ev_std(out|err)). (Jakub Zelenka)
+ . Fixed bug #64539 (FPM status page: query_string not properly JSON encoded).
+ (Jakub Zelenka)
+ . Fixed memory leak for invalid primary script file handle. (Jakub Zelenka)
+
+- Hash:
+ . Fixed bug GH-11180 (hash_file() appears to be restricted to 3 arguments).
+ (nielsdos)
+
+- LibXML:
+ . Fixed bug GH-11160 (Few tests failed building with new libxml 2.11.0).
+ (nielsdos)
+
+- Opcache:
+ . Fixed bug GH-11134 (Incorrect match default branch optimization). (ilutov)
+ . Fixed too wide OR and AND range inference. (nielsdos)
+ . Fixed bug GH-11245 (In some specific cases SWITCH with one default
+ statement will cause segfault). (nielsdos)
+
+- PGSQL:
+ . Fixed parameter parsing of pg_lo_export(). (kocsismate)
+
+- Phar:
+ . Fixed bug GH-11099 (Generating phar.php during cross-compile can't be
+ done). (peter279k)
+
+- Soap:
+ . Fixed bug GHSA-76gg-c692-v2mw (Missing error check and insufficient random
+ bytes in HTTP Digest authentication for SOAP). (nielsdos, timwolla)
+ . Fixed bug GH-8426 (make test fail while soap extension build). (nielsdos)
+
+- SPL:
+ . Fixed bug GH-11178 (Segmentation fault in spl_array_it_get_current_data
+ (PHP 8.1.18)). (nielsdos)
+
+- Standard:
+ . Fixed bug GH-11138 (move_uploaded_file() emits open_basedir warning for
+ source file). (ilutov)
+ . Fixed bug GH-11274 (POST/PATCH request switches to GET after a HTTP 308
+ redirect). (nielsdos)
+
+- Streams:
+ . Fixed bug GH-10031 (Stream STREAM_NOTIFY_PROGRESS over HTTP emitted
+ irregularly for last chunk of data). (nielsdos)
+ . Fixed bug GH-11175 (Stream Socket Timeout). (nielsdos)
+ . Fixed bug GH-11177 (ASAN UndefinedBehaviorSanitizer when timeout = -1
+ passed to stream_socket_accept/stream_socket_client). (nielsdos)
+
+11 May 2023, PHP 8.1.19
+
+- Core:
+ . Fix inconsistent float negation in constant expressions. (ilutov)
+ . Fixed bug GH-8841 (php-cli core dump calling a badly formed function).
+ (nielsdos)
+ . Fixed bug GH-10737 (PHP 8.1.16 segfaults on line 597 of
+ sapi/apache2handler/sapi_apache2.c). (nielsdos, ElliotNB)
+ . Fixed bug GH-11028 (Heap Buffer Overflow in zval_undefined_cv.). (nielsdos)
+ . Fixed bug GH-11108 (Incorrect CG(memoize_mode) state after bailout in ??=).
+ (ilutov)
+
+- DOM:
+ . Fixed bug #80602 (Segfault when using DOMChildNode::before()).
+ (Nathan Freeman)
+ . Fixed incorrect error handling in dom_zvals_to_fragment(). (nielsdos)
+
+- Exif:
+ . Fixed bug GH-9397 (exif read : warnings and errors : Potentially invalid
+ endianess, Illegal IFD size and Undefined index). (nielsdos)
+
+- Intl:
+ . Fixed bug GH-11071 (TZData version not displayed anymore). (Remi)
+
+- PCRE:
+ . Fixed bug GH-10968 (Segfault in preg_replace_callback_array()). (ilutov)
+
+- Standard:
+ . Fixed bug GH-10990 (mail() throws TypeError after iterating over
+ $additional_headers array by reference). (nielsdos)
+ . Fixed bug GH-9775 (Duplicates returned by array_unique when using enums).
+ (ilutov)
+
+13 Apr 2023, PHP 8.1.18
+
+- Core:
+ . Added optional support for max_execution_time in ZTS/Linux builds
+ (Kévin Dunglas)
+ . Fixed use-after-free in recursive AST evaluation. (ilutov)
+ . Fixed bug GH-8646 (Memory leak PHP FPM 8.1). (nielsdos)
+ . Fixed bug GH-10801 (Named arguments in CTE functions cause a segfault).
+ (nielsdos)
+ . Fixed bug GH-8789 (PHP 8.0.20 (ZTS) zend_signal_handler_defer crashes on
+ apache). (nielsdos)
+ . Fixed bug GH-10015 (zend_signal_handler_defer crashes on apache shutdown).
+ (nielsdos)
+ . Fixed bug GH-10810 (Fix NUL byte terminating Exception::__toString()).
+ (ilutov)
+ . Fix potential memory corruption when mixing __callStatic() and FFI. (ilutov)
+
+- Date:
+ . Fixed bug GH-10583 (DateTime modify with tz pattern should not update
+ linked timezone). (Derick)
+
+- FPM:
+ . Fixed bug GH-10611 (fpm_env_init_main leaks environ). (nielsdos)
+ . Destroy file_handle in fpm_main. (Jakub Zelenka, nielsdos)
+ . Fixed bug #74129 (Incorrect SCRIPT_NAME with apache ProxyPassMatch when
+ spaces are in path). (Jakub Zelenka)
+
+- FTP:
+ . Propagate success status of ftp_close(). (nielsdos)
+ . Fixed bug GH-10521 (ftp_get/ftp_nb_get resumepos offset is maximum 10GB).
+ (nielsdos)
+
+- IMAP:
+ . Fix build failure with Clang 16. (orlitzky)
+
+- MySQLnd:
+ . Fixed bug GH-8979 (Possible Memory Leak with SSL-enabled MySQL
+ connections). (nielsdos)
+
+- Opcache:
+ . Fixed build for macOS to cater with pkg-config settings. (David Carlier)
+ . Fixed bug GH-8065 (opcache.consistency_checks > 0 causes segfaults in
+ PHP >= 8.1.5 in fpm context). (nielsdos)
+
+- OpenSSL:
+ . Add missing error checks on file writing functions. (nielsdos)
+
+- PDO Firebird:
+ . Fixed bug GH-10908 (Bus error with PDO Firebird on RPI with 64 bit kernel
+ and 32 bit userland). (nielsdos)
+
+- PDO ODBC:
+ . Fixed missing and inconsistent error checks on SQLAllocHandle. (nielsdos)
+
+- Phar:
+ . Fixed bug GH-10766 (PharData archive created with Phar::Zip format does
+ not keep files metadata (datetime)). (nielsdos)
+ . Add missing error checks on EVP_MD_CTX_create() and EVP_VerifyInit().
+ (nielsdos)
+
+- PGSQL:
+ . Fixed typo in the array returned from pg_meta_data (extended mode).
+ (David Carlier)
+
+- SPL:
+ . Fixed bug GH-10519 (Array Data Address Reference Issue). (Nathan Freeman)
+ . Fixed bug GH-10844 (ArrayIterator allows modification of readonly props).
+ (ilutov)
+
+- Standard:
+ . Fixed bug GH-10885 (stream_socket_server context leaks). (ilutov)
+ . Fixed bug GH-10052 (Browscap crashes PHP 8.1.12 on request shutdown
+ (apache2)). (nielsdos)
+ . Fixed oss-fuzz #57392 (Buffer-overflow in php_fgetcsv() with \0 delimiter
+ and enclosure). (ilutov)
+ . Fixed undefined behaviour in unpack(). (nielsdos)
+
+16 Mar 2023, PHP 8.1.17
+
+- Core:
+ . Fixed incorrect check condition in ZEND_YIELD. (nielsdos)
+ . Fixed incorrect check condition in type inference. (nielsdos)
+ . Fixed overflow check in OnUpdateMemoryConsumption. (nielsdos)
+ . Fixed bug GH-9916 (Entering shutdown sequence with a fiber suspended in a
+ Generator emits an unavoidable fatal error or crashes). (Arnaud)
+ . Fixed bug GH-10437 (Segfault/assertion when using fibers in shutdown
+ function after bailout). (trowski)
+ . Fixed SSA object type update for compound assignment opcodes. (nielsdos)
+ . Fixed language scanner generation build. (Daniel Black)
+ . Fixed zend_update_static_property() calling zend_update_static_property_ex()
+ misleadingly with the wrong return type. (nielsdos)
+ . Fix bug GH-10570 (Fixed unknown string hash on property fetch with integer
+ constant name). (nielsdos)
+ . Fixed php_fopen_primary_script() call resulted on zend_destroy_file_handle()
+ freeing dangling pointers on the handle as it was uninitialized. (nielsdos)
+
+- Curl:
+ . Fixed deprecation warning at compile time. (Max Kellermann)
+ . Fixed bug GH-10270 (Unable to return CURL_READFUNC_PAUSE in readfunc
+ callback). (Pierrick Charron)
+
+- Date:
+ . Fix GH-10447 ('p' format specifier does not yield 'Z' for 00:00). (Derick)
+
+- FFI:
+ . Fixed incorrect bitshifting and masking in ffi bitfield. (nielsdos)
+
+- Fiber:
+ . Fixed assembly on alpine x86. (nielsdos)
+ . Fixed bug GH-10496 (segfault when garbage collector is invoked inside of
+ fiber). (Bob, Arnaud)
+
+- FPM:
+ . Fixed bug GH-10315 (FPM unknown child alert not valid). (Jakub Zelenka)
+ . Fixed bug GH-10385 (FPM successful config test early exit). (nielsdos)
+
+- Intl:
+ . Fixed bug GH-10647 (Spoolchecker isSuspicious/areConfusable methods
+ error code's argument always returning NULL0. (Nathan Freeman)
+
+- JSON:
+ . Fixed JSON scanner and parser generation build.
+ (Daniel Black, Jakub Zelenka)
+
+- MBString:
+ . ext/mbstring: fix new_value length check. (Max Kellermann)
+ . Fix bug GH-10627 (mb_convert_encoding crashes PHP on Windows). (nielsdos)
+
+- Opcache:
+ . Fix incorrect page_size check. (nielsdos)
+ . Fix readonly modification check when using inc/dec operators on readonly
+ property with JIT. (ilutov)
+
+- OpenSSL:
+ . Fixed php_openssl_set_server_dh_param() DH params errors handling. (nielsdos)
+
+- PDO OCI:
+ . Fixed bug #60994 (Reading a multibyte CLOB caps at 8192 chars).
+ (Michael Voříšek)
+
+- PHPDBG:
+ . Fixed bug GH-10715 (heap buffer overflow on --run option misuse). (nielsdos)
+
+- PGSQL:
+ . Fix GH-10672 (pg_lo_open segfaults in the strict_types mode). (girgias)
+
+- Phar:
+ . Fix incorrect check in phar tar parsing. (nielsdos)
+
+- Reflection:
+ . Fixed bug GH-10623 (Reflection::getClosureUsedVariables opcode fix with
+ variadic arguments). (nielsdos)
+ . Fix Segfault when using ReflectionFiber suspended by an internal function.
+ (danog)
+
+- Session:
+ . Fixed ps_files_cleanup_dir() on failure code paths with -1 instead of 0 as
+ the latter was considered success by callers. (nielsdos).
+
+- Standard:
+ . Fixed bug GH-10292 (Made the default value of the first param of srand() and
+ mt_srand() unknown). (kocsismate)
+ . Fix incorrect check in cs_8559_5 in map_from_unicode(). (nielsdos)
+ . Fix bug GH-9697 for reset/end/next/prev() attempting to move pointer of
+ properties table for certain internal classes such as FFI classes
+ . Fix incorrect error check in browsecap for pcre2_match(). (nielsdos)
+
+- Tidy:
+ . Fix memory leaks when attempting to open a non-existing file or a file over
+ 4GB. (Girgias)
+ . Add missing error check on tidyLoadConfig. (nielsdos)
+
+- Zlib:
+ . Fixed output_handler directive value's length which counted the string
+ terminator. (nieldos)
+
+14 Feb 2023, PHP 8.1.16
+
+- Core:
+ . Fixed bug #81744 (Password_verify() always return true with some hash).
+ (CVE-2023-0567). (Tim Düsterhus)
+ . Fixed bug #81746 (1-byte array overrun in common path resolve code).
+ (CVE-2023-0568). (Niels Dossche)
+
+- SAPI:
+ . Fixed bug GHSA-54hq-v5wp-fqgv (DOS vulnerability when parsing multipart
+ request body). (CVE-2023-0662) (Jakub Zelenka)
+
+02 Feb 2023, PHP 8.1.15
+
+- Apache:
+ . Fixed bug GH-9949 (Partial content on incomplete POST request). (cmb)
+
+- Core:
+ . Fixed bug GH-10072 (PHP crashes when execute_ex is overridden and a __call
+ trampoline is used from internal code). (Derick)
+ . Fix GH-10251 (Assertion `(flag & (1<<3)) == 0' failed). (nielsdos)
+ . Fix wrong comparison in block optimisation pass after opcode update. (nieldsdos)
+ . Fix GH-10248 (Assertion `!(zval_get_type(&(*(property))) == 10)' failed).
+ (nielsdos)
+
+- Date:
+ . Fixed bug GH-9891 (DateTime modify with unixtimestamp (@) must work like
+ setTimestamp). (Derick)
+ . Fixed bug GH-10218 (DateTimeZone fails to parse time zones that contain the
+ "+" character). (Derick)
+
+- Fiber:
+ . Fix assertion on stack allocation size. (nielsdos)
+
+- FPM:
+ . Fixed bug GH-9981 (FPM does not reset fastcgi.error_header).
+ (Jakub Zelenka)
+ . Fixed bug #67244 (Wrong owner:group for listening unix socket).
+ (Jakub Zelenka)
+
+- Hash:
+ . Handle exceptions from __toString in XXH3's initialization (nielsdos)
+
+- LDAP:
+ . Fixed bug GH-10112 (LDAP\Connection::__construct() refers to ldap_create()).
+ (cmb)
+
+- MBString:
+ . Fixed: mb_strlen (and a couple of other mbstring functions) would wrongly treat 0x80, 0xFD, 0xFE, 0xFF, and certain other byte values as the first byte of a 2-byte SJIS character. (Alex Dowad)
+
+- Opcache:
+ . Fix inverted bailout value in zend_runtime_jit() (Max Kellermann).
+ . Fix access to uninitialized variable in accel_preload(). (nielsdos)
+ . Fix zend_jit_find_trace() crashes. (Max Kellermann)
+ . Added missing lock for EXIT_INVALIDATE in zend_jit_trace_exit. (Max Kellermann)
+
+- Phar:
+ . Fix wrong flags check for compression method in phar_object.c (nielsdos)
+
+- PHPDBG:
+ . Fix undefined behaviour in phpdbg_load_module_or_extension(). (nielsdos)
+ . Fix NULL pointer dereference in phpdbg_create_conditional_breal(). (nielsdos)
+ . Fix GH-9710: phpdbg memory leaks by option "-h" (nielsdos)
+ . Fix phpdbg segmentation fault in case of malformed input (nielsdos)
+
+- Posix:
+ . Fix memory leak in posix_ttyname() (girgias)
+
+- Standard:
+ . Fix GH-10187 (Segfault in stripslashes() with arm64). (nielsdos)
+ . Fix substr_replace with slots in repl_ht being UNDEF. (nielsdos)
+
+- TSRM:
+ . Fixed Windows shmget() wrt. IPC_PRIVATE. (Tyson Andre)
+
+- XMLWriter
+ . Fix missing check for xmlTextWriterEndElement (nielsdos)
+
+05 Jan 2023, PHP 8.1.14
+
+- Core:
+ . Fixed bug GH-9905 (constant() behaves inconsistent when class is undefined).
+ (cmb)
+ . Fixed bug GH-9918 (License information for xxHash is not included in
+ README.REDIST.BINS file). (Akama Hitoshi)
+ . Fixed bug GH-9650 (Can't initialize heap: 0x000001e7). (Michael Voříšek)
+ . Fixed potentially undefined behavior in Windows ftok(3) emulation. (cmb)
+
+- Date:
+ . Fixed bug GH-9699 (DateTimeImmutable::diff differences in 8.1.10 onwards -
+ timezone related). (Derick)
+ . Fixed bug GH-9700 (DateTime::createFromFormat: Parsing TZID string is too
+ greedy). (Derick)
+ . Fixed bug GH-9866 (Time zone bug with \DateTimeInterface::diff()). (Derick)
+ . Fixed bug GH-9880 (DateTime diff returns wrong sign on day count when using
+ a timezone). (Derick)
+
+- FPM:
+ . Fixed bug GH-9959 (Solaris port event mechanism is still broken after bug
+ #66694). (Petr Sumbera)
+ . Fixed bug #68207 (Setting fastcgi.error_header can result in a WARNING).
+ (Jakub Zelenka)
+ . Fixed bug GH-8517 (Random crash of FPM master process in
+ fpm_stdio_child_said). (Jakub Zelenka)
+
+- MBString:
+ . Fixed bug GH-9535 (The behavior of mb_strcut in mbstring has been changed in
+ PHP8.1). (Nathan Freeman)
+
+- Opcache:
+ . Fixed bug GH-9968 (Segmentation Fault during OPCache Preload).
+ (Arnaud, michdingpayc)
+
+- OpenSSL:
+ . Fixed bug GH-9064 (PHP fails to build if openssl was built with --no-ec).
+ (Jakub Zelenka)
+ . Fixed bug GH-10000 (OpenSSL test failures when OpenSSL compiled with
+ no-dsa). (Jakub Zelenka)
+
+- Pcntl:
+ . Fixed bug GH-9298 (Signal handler called after rshutdown leads to crash).
+ (Erki Aring)
+
+- PDO_Firebird:
+ . Fixed bug GH-9971 (Incorrect NUMERIC value returned from PDO_Firebird).
+ (cmb)
+
+- PDO/SQLite:
+ . Fixed bug #81740 (PDO::quote() may return unquoted string). (CVE-2022-31631)
+ (cmb)
+
+- Session:
+ . Fixed GH-9932 (session name silently fails with . and ). (David Carlier)
+
+- SPL:
+ . Fixed GH-9883 (SplFileObject::__toString() reads next line). (Girgias)
+ . Fixed GH-10011 (Trampoline autoloader will get reregistered and cannot be
+ unregistered). (Girgias)
+
+- SQLite3:
+ . Fixed bug #81742 (open_basedir bypass in SQLite3 by using file URI). (cmb)
+
 24 Nov 2022, PHP 8.1.13
 
 - CLI:

php-8.1.13.tar.xz/README.REDIST.BINS -> php-8.1.21.tar.xz/README.REDIST.BINS Changed

@@ -15,6 +15,7 @@
 15. ext/phar/zip.c portion extracted from libzip
 16. libbcmath (ext/bcmath) see ext/bcmath/libbcmath/LICENSE
 17. ext/mbstring/ucgendat portions based on the ucgendat.c from the OpenLDAP
+18. xxHash (ext/hash/xxhash)
 
 
 3. pcre2lib (ext/pcre)
@@ -640,3 +641,39 @@
 Copyright 1999-2003 The OpenLDAP Foundation, Redwood City,
 California, USA.  All Rights Reserved.  Permission to copy and
 distribute verbatim copies of this document is granted.
+
+
+18. xxHash
+
+xxHash - Extremely Fast Hash algorithm
+Header File
+Copyright (C) 2012-2020 Yann Collet
+
+BSD 2-Clause License (https://www.opensource.org/licenses/bsd-license.php)
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+     copyright notice, this list of conditions and the following disclaimer
+     in the documentation and/or other materials provided with the
+     distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+You can contact the author at:
+  - xxHash homepage: https://www.xxhash.com
+  - xxHash source repository: https://github.com/Cyan4973/xxHash

php-8.1.13.tar.xz/TSRM/TSRM.c -> php-8.1.21.tar.xz/TSRM/TSRM.c Changed

@@ -161,6 +161,23 @@
 	return 1;
 }/*}}}*/
 
+static void ts_free_resources(tsrm_tls_entry *thread_resources)
+{
+	/* Need to destroy in reverse order to respect dependencies. */
+	for (int i = thread_resources->count - 1; i >= 0; i--) {
+		if (!resource_types_tablei.done) {
+			if (resource_types_tablei.dtor) {
+				resource_types_tablei.dtor(thread_resources->storagei);
+			}
+
+			if (!resource_types_tablei.fast_offset) {
+				free(thread_resources->storagei);
+			}
+		}
+	}
+
+	free(thread_resources->storage);
+}
 
 /* Shutdown TSRM (call once for the entire process) */
 TSRM_API void tsrm_shutdown(void)
@@ -183,25 +200,13 @@
 		tsrm_tls_entry *p = tsrm_tls_tablei, *next_p;
 
 		while (p) {
-			int j;
-
 			next_p = p->next;
-			for (j=0; j<p->count; j++) {
-				if (p->storagej) {
-					if (resource_types_table) {
-						if (!resource_types_tablej.done) {
-							if (resource_types_tablej.dtor) {
-								resource_types_tablej.dtor(p->storagej);
-							}
-
-							if (!resource_types_tablej.fast_offset) {
-								free(p->storagej);
-							}
-						}
-					}
-				}
+			if (resource_types_table) {
+				/* This call will already free p->storage for us */
+				ts_free_resources(p);
+			} else {
+				free(p->storage);
 			}
-			free(p->storage);
 			free(p);
 			p = next_p;
 		}
@@ -367,7 +372,13 @@
 	return *rsrc_id;
 }/*}}}*/
 
+static void set_thread_local_storage_resource_to(tsrm_tls_entry *thread_resource)
+{
+	tsrm_tls_set(thread_resource);
+	TSRMLS_CACHE = thread_resource;
+}
 
+/* Must be called with tsmm_mutex held */
 static void allocate_new_resource(tsrm_tls_entry **thread_resources_ptr, THREAD_T thread_id)
 {/*{{{*/
 	int i;
@@ -383,8 +394,7 @@
 	(*thread_resources_ptr)->next = NULL;
 
 	/* Set thread local storage to this new thread resources structure */
-	tsrm_tls_set(*thread_resources_ptr);
-	TSRMLS_CACHE = *thread_resources_ptr;
+	set_thread_local_storage_resource_to(*thread_resources_ptr);
 
 	if (tsrm_new_thread_begin_handler) {
 		tsrm_new_thread_begin_handler(thread_id);
@@ -407,17 +417,14 @@
 	if (tsrm_new_thread_end_handler) {
 		tsrm_new_thread_end_handler(thread_id);
 	}
-
-	tsrm_mutex_unlock(tsmm_mutex);
 }/*}}}*/
 
-
 /* fetches the requested resource for the current thread */
 TSRM_API void *ts_resource_ex(ts_rsrc_id id, THREAD_T *th_id)
 {/*{{{*/
 	THREAD_T thread_id;
 	int hash_value;
-	tsrm_tls_entry *thread_resources;
+	tsrm_tls_entry *thread_resources, **last_thread_resources;
 
 	if (!th_id) {
 		/* Fast path for looking up the resources for the current
@@ -448,25 +455,55 @@
 
 	if (!thread_resources) {
 		allocate_new_resource(&tsrm_tls_tablehash_value, thread_id);
+		tsrm_mutex_unlock(tsmm_mutex);
 		return ts_resource_ex(id, &thread_id);
 	} else {
-		 do {
-			if (thread_resources->thread_id == thread_id) {
-				break;
-			}
+		 last_thread_resources = &tsrm_tls_tablehash_value;
+		 while (thread_resources->thread_id != thread_id) {
+			last_thread_resources = &thread_resources->next;
 			if (thread_resources->next) {
 				thread_resources = thread_resources->next;
 			} else {
 				allocate_new_resource(&thread_resources->next, thread_id);
+				tsrm_mutex_unlock(tsmm_mutex);
 				return ts_resource_ex(id, &thread_id);
-				/*
-				 * thread_resources = thread_resources->next;
-				 * break;
-				 */
 			}
-		 } while (thread_resources);
+		 }
+	}
+
+	/* It's possible that the current thread resources are requested, and that we get here.
+	 * This means that the TSRM key pointer and cached pointer are NULL, but there is still
+	 * a thread resource associated with this ID in the hashtable. This can occur if a thread
+	 * goes away, but its resources are never cleaned up, and then that thread ID is reused.
+	 * Since we don't always have a way to know when a thread goes away, we can't clean up
+	 * the thread's resources before the new thread spawns.
+	 * To solve this issue, we'll free up the old thread resources gracefully (gracefully
+	 * because there might still be resources open like database connection which need to
+	 * be shut down cleanly). After freeing up, we'll create the new resources for this thread
+	 * as if the stale resources never existed in the first place. From that point forward,
+	 * it is as if that situation never occurred.
+	 * The fact that this situation happens isn't that bad because a child process containing
+	 * threads will eventually be respawned anyway by the SAPI, so the stale threads won't last
+	 * forever. */
+	TSRM_ASSERT(thread_resources->thread_id == thread_id);
+	if (thread_id == tsrm_thread_id() && !tsrm_tls_get()) {
+		tsrm_tls_entry *next = thread_resources->next;
+		/* In case that extensions don't use the pointer passed from the dtor, but incorrectly
+		 * use the global pointer, we need to setup the global pointer temporarily here. */
+		set_thread_local_storage_resource_to(thread_resources);
+		/* Free up the old resource from the old thread instance */
+		ts_free_resources(thread_resources);
+		free(thread_resources);
+		/* Allocate a new resource at the same point in the linked list, and relink the next pointer */
+		allocate_new_resource(last_thread_resources, thread_id);
+		thread_resources = *last_thread_resources;
+		thread_resources->next = next;
+		/* We don't have to tail-call ts_resource_ex, we can take the fast path to the return
+		 * because we already have the correct pointer. */
 	}
+
 	tsrm_mutex_unlock(tsmm_mutex);
+
 	/* Read a specific resource from the thread's resources.
 	 * This is called outside of a mutex, so have to be aware about external
 	 * changes to the structure as we read it.
@@ -479,7 +516,6 @@
 void ts_free_thread(void)
 {/*{{{*/
 	tsrm_tls_entry *thread_resources;
-	int i;
 	THREAD_T thread_id = tsrm_thread_id();
 	int hash_value;
 	tsrm_tls_entry *last=NULL;
@@ -492,17 +528,7 @@
 
 	while (thread_resources) {
 		if (thread_resources->thread_id == thread_id) {
-			for (i=0; i<thread_resources->count; i++) {
-				if (resource_types_tablei.dtor) {
-					resource_types_tablei.dtor(thread_resources->storagei);
-				}
-			}
-			for (i=0; i<thread_resources->count; i++) {
-				if (!resource_types_tablei.fast_offset) {
-					free(thread_resources->storagei);
-				}
-			}
-			free(thread_resources->storage);
+			ts_free_resources(thread_resources);
 			if (last) {
 				last->next = thread_resources->next;
 			} else {

php-8.1.13.tar.xz/TSRM/tsrm_win32.c -> php-8.1.21.tar.xz/TSRM/tsrm_win32.c Changed

@@ -30,6 +30,7 @@
 #include "tsrm_win32.h"
 #include "zend_virtual_cwd.h"
 #include "win32/ioutil.h"
+#include "win32/winutil.h"
 
 #ifdef ZTS
 static ts_rsrc_id win32_globals_id;
@@ -90,7 +91,7 @@
 TSRM_API void tsrm_win32_startup(void)
 {/*{{{*/
 #ifdef ZTS
-	ts_allocate_id(&win32_globals_id, sizeof(tsrm_win32_globals), (ts_allocate_ctor)tsrm_win32_ctor, (ts_allocate_ctor)tsrm_win32_dtor);
+	ts_allocate_id(&win32_globals_id, sizeof(tsrm_win32_globals), (ts_allocate_ctor)tsrm_win32_ctor, (ts_allocate_dtor)tsrm_win32_dtor);
 #else
 	tsrm_win32_ctor(&win32_globals);
 #endif
@@ -613,6 +614,22 @@
 #define DESCRIPTOR_PREFIX "TSRM_SHM_DESCRIPTOR:"
 #define INT_MIN_AS_STRING "-2147483648"
 
+
+#define TSRM_BASE_SHM_KEY_ADDRESS 0x20000000
+/* Returns a number between 0x2000_0000 and 0x3fff_ffff. On Windows, key_t is int. */
+static key_t tsrm_choose_random_shm_key(key_t prev_key) {
+	unsigned char buf4;
+	if (php_win32_get_random_bytes(buf, 4) != SUCCESS) {
+		return prev_key + 2;
+	}
+	uint32_t n =
+		((uint32_t)(buf0) << 24) |
+	 (((uint32_t)buf1) << 16) |
+	 (((uint32_t)buf2) << 8) |
+	 (((uint32_t)buf3));
+	return (n & 0x1fffffff) + TSRM_BASE_SHM_KEY_ADDRESS;
+}
+
 TSRM_API int shmget(key_t key, size_t size, int flags)
 {/*{{{*/
 	shm_pair *shm;
@@ -626,6 +643,9 @@
 
 		shm_handle = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_segment);
 		info_handle = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, shm_info);
+	} else {
+		/* IPC_PRIVATE always creates a new segment even if IPC_CREAT flag isn't passed. */
+		flags |= IPC_CREAT;
 	}
 
 	if (!shm_handle && !info_handle) {
@@ -662,6 +682,19 @@
 		}
 	}
 
+	if (key == IPC_PRIVATE) {
+		/* This should call shm_get with a brand new key id that isn't used yet. See https://man7.org/linux/man-pages/man2/shmget.2.html
+		 * Because extensions such as shmop/sysvshm can be used in userland to attach to shared memory segments, use unpredictable high positive numbers to avoid accidentally conflicting with userland. */
+		key = tsrm_choose_random_shm_key(TSRM_BASE_SHM_KEY_ADDRESS);
+		for (shm_pair *ptr = TWG(shm); ptr < (TWG(shm) + TWG(shm_size)); ptr++) {
+			if (ptr->descriptor && ptr->descriptor->shm_perm.key == key) {
+				key = tsrm_choose_random_shm_key(key);
+				ptr = TWG(shm);
+				continue;
+			}
+		}
+	}
+
 	shm = shm_get(key, NULL);
 	if (!shm) {
 		CloseHandle(shm_handle);

php-8.1.13.tar.xz/UPGRADING -> php-8.1.21.tar.xz/UPGRADING Changed

php-8.1.13.tar.xz/Zend/Makefile.frag -> php-8.1.21.tar.xz/Zend/Makefile.frag Changed

php-8.1.13.tar.xz/Zend/Optimizer/block_pass.c -> php-8.1.21.tar.xz/Zend/Optimizer/block_pass.c Changed

@@ -257,6 +257,10 @@
 				break;
 
 			case ZEND_FREE:
+				/* Note: Only remove the source if the source is local to this block.
+				 * If it's not local, then the other blocks successors must also eventually either FREE or consume the temporary,
+				 * hence removing the temporary is not safe in the general case, especially when other consumers are not FREE.
+				 * A FREE may not be removed without also removing the source's result, because otherwise that would cause a memory leak. */
 				if (opline->op1_type == IS_TMP_VAR) {
 					src = VAR_SOURCE(opline->op1);
 					if (src) {
@@ -265,6 +269,7 @@
 							case ZEND_BOOL_NOT:
 								/* T = BOOL(X), FREE(T) => T = BOOL(X) */
 								/* The remaining BOOL is removed by a separate optimization */
+								/* The source is a bool, no source removals take place, so this may be done non-locally. */
 								VAR_SOURCE(opline->op1) = NULL;
 								MAKE_NOP(opline);
 								++(*opt_count);
@@ -283,6 +288,9 @@
 							case ZEND_PRE_DEC_OBJ:
 							case ZEND_PRE_INC_STATIC_PROP:
 							case ZEND_PRE_DEC_STATIC_PROP:
+								if (src < op_array->opcodes + block->start) {
+									break;
+								}
 								src->result_type = IS_UNUSED;
 								VAR_SOURCE(opline->op1) = NULL;
 								MAKE_NOP(opline);
@@ -295,7 +303,7 @@
 				} else if (opline->op1_type == IS_VAR) {
 					src = VAR_SOURCE(opline->op1);
 					/* V = OP, FREE(V) => OP. NOP */
-					if (src &&
+					if (src >= op_array->opcodes + block->start &&
 					 src->opcode != ZEND_FETCH_R &&
 					 src->opcode != ZEND_FETCH_STATIC_PROP_R &&
 					 src->opcode != ZEND_FETCH_DIM_R &&
@@ -671,13 +679,13 @@
 			case ZEND_JMPNZ_EX:
 				while (1) {
 					if (opline->op1_type == IS_CONST) {
-						if (zend_is_true(&ZEND_OP1_LITERAL(opline)) ==
-						 (opline->opcode == ZEND_JMPZ_EX)) {
+						bool is_jmpz_ex = opline->opcode == ZEND_JMPZ_EX;
+						if (zend_is_true(&ZEND_OP1_LITERAL(opline)) == is_jmpz_ex) {
 
 							++(*opt_count);
 							opline->opcode = ZEND_QM_ASSIGN;
 							zval_ptr_dtor_nogc(&ZEND_OP1_LITERAL(opline));
-							ZVAL_BOOL(&ZEND_OP1_LITERAL(opline), opline->opcode == ZEND_JMPZ_EX);
+							ZVAL_BOOL(&ZEND_OP1_LITERAL(opline), is_jmpz_ex);
 							opline->op2.num = 0;
 							block->successors_count = 1;
 							block->successors0 = block->successors1;

php-8.1.13.tar.xz/Zend/Optimizer/dfa_pass.c -> php-8.1.21.tar.xz/Zend/Optimizer/dfa_pass.c Changed

@@ -1000,32 +1000,41 @@
 							|| (opline->opcode == ZEND_SWITCH_STRING && type == IS_STRING)
 							|| (opline->opcode == ZEND_MATCH && (type == IS_LONG || type == IS_STRING));
 
-						if (!correct_type) {
+						/* Switch statements have a fallback chain for loose comparison. In those
+						 * cases the SWITCH_* instruction is a NOP. Match does strict comparison and
+						 * thus jumps to the default branch on mismatched types, so we need to
+						 * convert MATCH to a jmp. */
+						if (!correct_type && opline->opcode != ZEND_MATCH) {
 							removed_ops++;
 							MAKE_NOP(opline);
 							opline->extended_value = 0;
 							take_successor_ex(ssa, block_num, block, block->successorsblock->successors_count - 1);
 							goto optimize_nop;
-						} else {
+						}
+
+						uint32_t target;
+						if (correct_type) {
 							HashTable *jmptable = Z_ARRVAL_P(CT_CONSTANT_EX(op_array, opline->op2.constant));
 							zval *jmp_zv = type == IS_LONG
 								? zend_hash_index_find(jmptable, Z_LVAL_P(zv))
 								: zend_hash_find(jmptable, Z_STR_P(zv));
 
-							uint32_t target;
 							if (jmp_zv) {
 								target = ZEND_OFFSET_TO_OPLINE_NUM(op_array, opline, Z_LVAL_P(jmp_zv));
 							} else {
 								target = ZEND_OFFSET_TO_OPLINE_NUM(op_array, opline, opline->extended_value);
 							}
-							opline->opcode = ZEND_JMP;
-							opline->extended_value = 0;
-							SET_UNUSED(opline->op1);
-							ZEND_SET_OP_JMP_ADDR(opline, opline->op1, op_array->opcodes + target);
-							SET_UNUSED(opline->op2);
-							take_successor_ex(ssa, block_num, block, ssa->cfg.maptarget);
-							goto optimize_jmp;
+						} else {
+							ZEND_ASSERT(opline->opcode == ZEND_MATCH);
+							target = ZEND_OFFSET_TO_OPLINE_NUM(op_array, opline, opline->extended_value);
 						}
+						opline->opcode = ZEND_JMP;
+						opline->extended_value = 0;
+						SET_UNUSED(opline->op1);
+						ZEND_SET_OP_JMP_ADDR(opline, opline->op1, op_array->opcodes + target);
+						SET_UNUSED(opline->op2);
+						take_successor_ex(ssa, block_num, block, ssa->cfg.maptarget);
+						goto optimize_jmp;
 					}
 					break;
 				case ZEND_NOP:
@@ -1687,7 +1696,7 @@
 			 && Z_TYPE_P(CT_CONSTANT_EX(op_array, opline->op2.constant)) == IS_LONG
 			 && Z_LVAL_P(CT_CONSTANT_EX(op_array, opline->op2.constant)) == 1
 			 && ssa->opsop_1.op1_use >= 0
-			 && !(ssa->var_infossa->opsop_1.op1_use.type & (MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE|MAY_BE_REF))) {
+			 && !(ssa->var_infossa->opsop_1.op1_use.type & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_STRING|MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_RESOURCE|MAY_BE_REF))) {
 
 // op_1: ASSIGN_SUB #?.CV undef,null,int,foat -> #v.CV, int(1) => PRE_DEC #?.CV ->#v.CV

php-8.1.13.tar.xz/Zend/Optimizer/sccp.c -> php-8.1.21.tar.xz/Zend/Optimizer/sccp.c Changed

php-8.1.13.tar.xz/Zend/Optimizer/zend_inference.c -> php-8.1.21.tar.xz/Zend/Optimizer/zend_inference.c Changed

@@ -436,7 +436,7 @@
 	int x = ((a < 0) ? 8 : 0) |
 	 ((b < 0) ? 4 : 0) |
 	 ((c < 0) ? 2 : 0) |
-	 ((d < 0) ? 2 : 0);
+	 ((d < 0) ? 1 : 0);
 	switch (x) {
 		case 0x0:
 		case 0x3:
@@ -484,7 +484,7 @@
 	int x = ((a < 0) ? 8 : 0) |
 	 ((b < 0) ? 4 : 0) |
 	 ((c < 0) ? 2 : 0) |
-	 ((d < 0) ? 2 : 0);
+	 ((d < 0) ? 1 : 0);
 	switch (x) {
 		case 0x0:
 		case 0x3:
@@ -2464,7 +2464,7 @@
 			if (opline->opcode == ZEND_ASSIGN_OBJ_OP) {
 				prop_info = zend_fetch_prop_info(op_array, ssa, opline, ssa_op);
 				orig = t1;
-				t1 = zend_fetch_prop_type(script, prop_info, &ce);
+				t1 = zend_fetch_prop_type(script, prop_info, NULL);
 				t2 = OP1_DATA_INFO();
 			} else if (opline->opcode == ZEND_ASSIGN_DIM_OP) {
 				if (t1 & MAY_BE_ARRAY_OF_REF) {
@@ -2475,7 +2475,7 @@
 				t2 = OP1_DATA_INFO();
 			} else if (opline->opcode == ZEND_ASSIGN_STATIC_PROP_OP) {
 				prop_info = zend_fetch_static_prop_info(script, op_array, ssa, opline);
-				t1 = zend_fetch_prop_type(script, prop_info, &ce);
+				t1 = zend_fetch_prop_type(script, prop_info, NULL);
 				t2 = OP1_DATA_INFO();
 			} else {
 				if (t1 & MAY_BE_REF) {
@@ -2505,7 +2505,7 @@
 					UPDATE_SSA_TYPE(orig, ssa_op->op1_def);
 					COPY_SSA_OBJ_TYPE(ssa_op->op1_use, ssa_op->op1_def);
 				}
-			} else if (opline->opcode == ZEND_ASSIGN_STATIC_PROP) {
+			} else if (opline->opcode == ZEND_ASSIGN_STATIC_PROP_OP) {
 				/* Nothing to do */
 			} else {
 				if (opline->opcode == ZEND_ASSIGN_OP && ssa_op->result_def >= 0 && (tmp & MAY_BE_RC1)) {
@@ -2537,12 +2537,26 @@
 				} else if (opline->opcode == ZEND_ASSIGN_OBJ_OP) {
 					/* The return value must also satisfy the property type */
 					if (prop_info) {
-						tmp &= zend_fetch_prop_type(script, prop_info, NULL);
+						t1 = zend_fetch_prop_type(script, prop_info, &ce);
+						if ((t1 & (MAY_BE_LONG|MAY_BE_DOUBLE)) == MAY_BE_LONG
+						 && (tmp & (MAY_BE_LONG|MAY_BE_DOUBLE)) == MAY_BE_DOUBLE) {
+							/* DOUBLE may be auto-converted to LONG */
+							tmp |= MAY_BE_LONG;
+							tmp &= ~MAY_BE_DOUBLE;
+						}
+						tmp &= t1;
 					}
 				} else if (opline->opcode == ZEND_ASSIGN_STATIC_PROP_OP) {
 					/* The return value must also satisfy the property type */
 					if (prop_info) {
-						tmp &= zend_fetch_prop_type(script, prop_info, NULL);
+						t1 = zend_fetch_prop_type(script, prop_info, &ce);
+						if ((t1 & (MAY_BE_LONG|MAY_BE_DOUBLE)) == MAY_BE_LONG
+						 && (tmp & (MAY_BE_LONG|MAY_BE_DOUBLE)) == MAY_BE_DOUBLE) {
+							/* DOUBLE may be auto-converted to LONG */
+							tmp |= MAY_BE_LONG;
+							tmp &= ~MAY_BE_DOUBLE;
+						}
+						tmp &= t1;
 					}
 				} else {
 					if (tmp & MAY_BE_REF) {
@@ -3422,6 +3436,9 @@
 					tmp |= zend_fetch_prop_type(script, prop_info, &ce);
 					if (opline->result_type == IS_VAR) {
 						tmp |= MAY_BE_REF | MAY_BE_INDIRECT;
+						if ((opline->extended_value & ZEND_FETCH_OBJ_FLAGS) == ZEND_FETCH_DIM_WRITE) {
+							tmp |= MAY_BE_UNDEF;
+						}
 					} else if (!(opline->op1_type & (IS_VAR|IS_TMP_VAR)) || !(t1 & MAY_BE_RC1)) {
 						zend_class_entry *ce = NULL;
 
@@ -3430,16 +3447,12 @@
 						} else if (ssa_op->op1_use >= 0 && !ssa->var_infossa_op->op1_use.is_instanceof) {
 							ce = ssa->var_infossa_op->op1_use.ce;
 						}
-						if (prop_info) {
-							/* FETCH_OBJ_R/IS for plain property increments reference counter,
-							 so it can't be 1 */
-							if (ce && !ce->create_object && !result_may_be_separated(ssa, ssa_op)) {
-								tmp &= ~MAY_BE_RC1;
-							}
-						} else {
-							if (ce && !ce->create_object && !ce->__get && !result_may_be_separated(ssa, ssa_op)) {
-								tmp &= ~MAY_BE_RC1;
-							}
+						/* Unset properties will resort back to __get/__set */
+						if (ce
+						 && !ce->create_object
+						 && !ce->__get
+						 && !result_may_be_separated(ssa, ssa_op)) {
+							tmp &= ~MAY_BE_RC1;
 						}
 						if (opline->opcode == ZEND_FETCH_OBJ_IS) {
 							/* IS check may return null for uninitialized typed property. */
@@ -3463,6 +3476,9 @@
 				zend_fetch_static_prop_info(script, op_array, ssa, opline), &ce);
 			if (opline->result_type == IS_VAR) {
 				tmp |= MAY_BE_REF | MAY_BE_INDIRECT;
+				if ((opline->extended_value & ZEND_FETCH_OBJ_FLAGS) == ZEND_FETCH_DIM_WRITE) {
+					tmp |= MAY_BE_UNDEF;
+				}
 			} else {
 				if (!result_may_be_separated(ssa, ssa_op)) {
 					tmp &= ~MAY_BE_RC1;

php-8.1.13.tar.xz/Zend/Zend.m4 -> php-8.1.21.tar.xz/Zend/Zend.m4 Changed

php-8.1.13.tar.xz/Zend/asm/jump_i386_sysv_elf_gas.S -> php-8.1.21.tar.xz/Zend/asm/jump_i386_sysv_elf_gas.S Changed

@@ -12,14 +12,14 @@
  *  ----------------------------------------------------------------------------------  *
  *  |   0x0   |   0x4   |   0x8   |   0xc   |   0x10   |   0x14  |   0x18  |   0x1c  |  *
  *  ----------------------------------------------------------------------------------  *
- *  | fc_mxcsr|fc_x87_cw|   EDI   |   ESI   |   EBX    |   EBP   |   EIP   |  hidden |  *
+ *  | fc_mxcsr|fc_x87_cw|  guard  |   EDI   |   ESI    |   EBX   |   EBP   |   EIP   |  *
  *  ----------------------------------------------------------------------------------  *
  *  ----------------------------------------------------------------------------------  *
  *  |    8    |    9    |    10   |    11   |    12    |    13   |    14   |    15   |  *
  *  ----------------------------------------------------------------------------------  *
- *  |   0x20  |   0x24  |                                                            |  *
+ *  |   0x20  |   0x24  |   0x28  |                                                  |  *
  *  ----------------------------------------------------------------------------------  *
- *  |    to   |   data  |                                                            |  *
+ *  |  hidden |    to   |   data  |                                                  |  *
  *  ----------------------------------------------------------------------------------  *
  *                                                                                      *
  ****************************************************************************************/
@@ -30,50 +30,60 @@
 .align 2
 .type jump_fcontext,@function
 jump_fcontext:
-    leal  -0x18(%esp), %esp  /* prepare stack */
+    leal  -0x1c(%esp), %esp  /* prepare stack */
 
 #if !defined(BOOST_USE_TSX)
     stmxcsr  (%esp)     /* save MMX control- and status-word */
     fnstcw   0x4(%esp)  /* save x87 control-word */
 #endif
 
-    movl  %edi, 0x8(%esp)  /* save EDI */
-    movl  %esi, 0xc(%esp)  /* save ESI */
-    movl  %ebx, 0x10(%esp)  /* save EBX */
-    movl  %ebp, 0x14(%esp)  /* save EBP */
+#if defined(BOOST_CONTEXT_TLS_STACK_PROTECTOR)
+    movl  %gs:0x14, %ecx    /* read stack guard from TLS record */
+    movl  %ecx, 0x8(%esp)   /* save stack guard */
+#endif
+
+    movl  %edi, 0xc(%esp)   /* save EDI */
+    movl  %esi, 0x10(%esp)  /* save ESI */
+    movl  %ebx, 0x14(%esp)  /* save EBX */
+    movl  %ebp, 0x18(%esp)  /* save EBP */
 
     /* store ESP (pointing to context-data) in ECX */
     movl  %esp, %ecx
 
     /* first arg of jump_fcontext() == fcontext to jump to */
-    movl  0x20(%esp), %eax
+    movl  0x24(%esp), %eax
 
     /* second arg of jump_fcontext() == data to be transferred */
-    movl  0x24(%esp), %edx
+    movl  0x28(%esp), %edx
 
     /* restore ESP (pointing to context-data) from EAX */
     movl  %eax, %esp
 
     /* address of returned transport_t */
-    movl 0x1c(%esp), %eax
+    movl 0x20(%esp), %eax
     /* return parent fcontext_t */
     movl  %ecx, (%eax)
     /* return data */
     movl %edx, 0x4(%eax)
 
-    movl  0x18(%esp), %ecx  /* restore EIP */
+    movl  0x1c(%esp), %ecx  /* restore EIP */
 
 #if !defined(BOOST_USE_TSX)
     ldmxcsr  (%esp)     /* restore MMX control- and status-word */
     fldcw    0x4(%esp)  /* restore x87 control-word */
 #endif
 
-    movl  0x8(%esp), %edi  /* restore EDI */
-    movl  0xc(%esp), %esi  /* restore ESI */
-    movl  0x10(%esp), %ebx  /* restore EBX */
-    movl  0x14(%esp), %ebp  /* restore EBP */
+#if defined(BOOST_CONTEXT_TLS_STACK_PROTECTOR)
+    movl  0x8(%esp), %edx  /* load stack guard */
+    movl  %edx, %gs:0x14   /* restore stack guard to TLS record */
+#endif
+
+    movl  0xc(%esp), %edi  /* restore EDI */
+    movl  0x10(%esp), %esi  /* restore ESI */
+    movl  0x14(%esp), %ebx  /* restore EBX */
+    movl  0x18(%esp), %ebp  /* restore EBP */
 
-    leal  0x20(%esp), %esp  /* prepare stack */
+    leal  0x24(%esp), %esp  /* prepare stack */
 
     /* jump to context */
     jmp *%ecx

php-8.1.13.tar.xz/Zend/asm/jump_ppc32_sysv_macho_gas.S -> php-8.1.21.tar.xz/Zend/asm/jump_ppc32_sysv_macho_gas.S Changed

@@ -80,122 +80,122 @@
     ; reserve space on stack
     subi  r1, r1, 244
 
-    stfd  f14, 0(r1)  # save F14
-    stfd  f15, 8(r1)  # save F15
-    stfd  f16, 16(r1)  # save F16
-    stfd  f17, 24(r1)  # save F17
-    stfd  f18, 32(r1)  # save F18
-    stfd  f19, 40(r1)  # save F19
-    stfd  f20, 48(r1)  # save F20
-    stfd  f21, 56(r1)  # save F21
-    stfd  f22, 64(r1)  # save F22
-    stfd  f23, 72(r1)  # save F23
-    stfd  f24, 80(r1)  # save F24
-    stfd  f25, 88(r1)  # save F25
-    stfd  f26, 96(r1)  # save F26
-    stfd  f27, 104(r1)  # save F27
-    stfd  f28, 112(r1)  # save F28
-    stfd  f29, 120(r1)  # save F29
-    stfd  f30, 128(r1)  # save F30
-    stfd  f31, 136(r1)  # save F31
-    mffs  f0  # load FPSCR
-    stfd  f0, 144(r1)  # save FPSCR
+    stfd  f14, 0(r1)  ; save F14
+    stfd  f15, 8(r1)  ; save F15
+    stfd  f16, 16(r1)  ; save F16
+    stfd  f17, 24(r1)  ; save F17
+    stfd  f18, 32(r1)  ; save F18
+    stfd  f19, 40(r1)  ; save F19
+    stfd  f20, 48(r1)  ; save F20
+    stfd  f21, 56(r1)  ; save F21
+    stfd  f22, 64(r1)  ; save F22
+    stfd  f23, 72(r1)  ; save F23
+    stfd  f24, 80(r1)  ; save F24
+    stfd  f25, 88(r1)  ; save F25
+    stfd  f26, 96(r1)  ; save F26
+    stfd  f27, 104(r1)  ; save F27
+    stfd  f28, 112(r1)  ; save F28
+    stfd  f29, 120(r1)  ; save F29
+    stfd  f30, 128(r1)  ; save F30
+    stfd  f31, 136(r1)  ; save F31
+    mffs  f0  ; load FPSCR
+    stfd  f0, 144(r1)  ; save FPSCR
 
-    stw  r13, 152(r1)  # save R13
-    stw  r14, 156(r1)  # save R14
-    stw  r15, 160(r1)  # save R15
-    stw  r16, 164(r1)  # save R16
-    stw  r17, 168(r1)  # save R17
-    stw  r18, 172(r1)  # save R18
-    stw  r19, 176(r1)  # save R19
-    stw  r20, 180(r1)  # save R20
-    stw  r21, 184(r1)  # save R21
-    stw  r22, 188(r1)  # save R22
-    stw  r23, 192(r1)  # save R23
-    stw  r24, 196(r1)  # save R24
-    stw  r25, 200(r1)  # save R25
-    stw  r26, 204(r1)  # save R26
-    stw  r27, 208(r1)  # save R27
-    stw  r28, 212(r1)  # save R28
-    stw  r29, 216(r1)  # save R29
-    stw  r30, 220(r1)  # save R30
-    stw  r31, 224(r1)  # save R31
-    stw  r3,  228(r1)  # save hidden
+    stw  r13, 152(r1)  ; save R13
+    stw  r14, 156(r1)  ; save R14
+    stw  r15, 160(r1)  ; save R15
+    stw  r16, 164(r1)  ; save R16
+    stw  r17, 168(r1)  ; save R17
+    stw  r18, 172(r1)  ; save R18
+    stw  r19, 176(r1)  ; save R19
+    stw  r20, 180(r1)  ; save R20
+    stw  r21, 184(r1)  ; save R21
+    stw  r22, 188(r1)  ; save R22
+    stw  r23, 192(r1)  ; save R23
+    stw  r24, 196(r1)  ; save R24
+    stw  r25, 200(r1)  ; save R25
+    stw  r26, 204(r1)  ; save R26
+    stw  r27, 208(r1)  ; save R27
+    stw  r28, 212(r1)  ; save R28
+    stw  r29, 216(r1)  ; save R29
+    stw  r30, 220(r1)  ; save R30
+    stw  r31, 224(r1)  ; save R31
+    stw  r3,  228(r1)  ; save hidden
 
-    # save CR
+    ; save CR
     mfcr  r0
     stw   r0, 232(r1)
-    # save LR
+    ; save LR
     mflr  r0
     stw   r0, 236(r1)
-    # save LR as PC
+    ; save LR as PC
     stw   r0, 240(r1)
 
-    # store RSP (pointing to context-data) in R6
+    ; store RSP (pointing to context-data) in R6
     mr  r6, r1
 
-    # restore RSP (pointing to context-data) from R4
+    ; restore RSP (pointing to context-data) from R4
     mr  r1, r4
 
-    lfd  f14, 0(r1)  # restore F14
-    lfd  f15, 8(r1)  # restore F15
-    lfd  f16, 16(r1)  # restore F16
-    lfd  f17, 24(r1)  # restore F17
-    lfd  f18, 32(r1)  # restore F18
-    lfd  f19, 40(r1)  # restore F19
-    lfd  f20, 48(r1)  # restore F20
-    lfd  f21, 56(r1)  # restore F21
-    lfd  f22, 64(r1)  # restore F22
-    lfd  f23, 72(r1)  # restore F23
-    lfd  f24, 80(r1)  # restore F24
-    lfd  f25, 88(r1)  # restore F25
-    lfd  f26, 96(r1)  # restore F26
-    lfd  f27, 104(r1)  # restore F27
-    lfd  f28, 112(r1)  # restore F28
-    lfd  f29, 120(r1)  # restore F29
-    lfd  f30, 128(r1)  # restore F30
-    lfd  f31, 136(r1)  # restore F31
-    lfd  f0,  144(r1)  # load FPSCR
-    mtfsf  0xff, f0  # restore FPSCR
+    lfd  f14, 0(r1)  ; restore F14
+    lfd  f15, 8(r1)  ; restore F15
+    lfd  f16, 16(r1)  ; restore F16
+    lfd  f17, 24(r1)  ; restore F17
+    lfd  f18, 32(r1)  ; restore F18
+    lfd  f19, 40(r1)  ; restore F19
+    lfd  f20, 48(r1)  ; restore F20
+    lfd  f21, 56(r1)  ; restore F21
+    lfd  f22, 64(r1)  ; restore F22
+    lfd  f23, 72(r1)  ; restore F23
+    lfd  f24, 80(r1)  ; restore F24
+    lfd  f25, 88(r1)  ; restore F25
+    lfd  f26, 96(r1)  ; restore F26
+    lfd  f27, 104(r1)  ; restore F27
+    lfd  f28, 112(r1)  ; restore F28
+    lfd  f29, 120(r1)  ; restore F29
+    lfd  f30, 128(r1)  ; restore F30
+    lfd  f31, 136(r1)  ; restore F31
+    lfd  f0,  144(r1)  ; load FPSCR
+    mtfsf  0xff, f0  ; restore FPSCR
 
-    lwz  r13, 152(r1)  # restore R13
-    lwz  r14, 156(r1)  # restore R14
-    lwz  r15, 160(r1)  # restore R15
-    lwz  r16, 164(r1)  # restore R16
-    lwz  r17, 168(r1)  # restore R17
-    lwz  r18, 172(r1)  # restore R18
-    lwz  r19, 176(r1)  # restore R19
-    lwz  r20, 180(r1)  # restore R20
-    lwz  r21, 184(r1)  # restore R21
-    lwz  r22, 188(r1)  # restore R22
-    lwz  r23, 192(r1)  # restore R23
-    lwz  r24, 196(r1)  # restore R24
-    lwz  r25, 200(r1)  # restore R25
-    lwz  r26, 204(r1)  # restore R26
-    lwz  r27, 208(r1)  # restore R27
-    lwz  r28, 212(r1)  # restore R28
-    lwz  r29, 216(r1)  # restore R29
-    lwz  r30, 220(r1)  # restore R30
-    lwz  r31, 224(r1)  # restore R31
-    lwz  r3,  228(r1)  # restore hidden
+    lwz  r13, 152(r1)  ; restore R13
+    lwz  r14, 156(r1)  ; restore R14
+    lwz  r15, 160(r1)  ; restore R15
+    lwz  r16, 164(r1)  ; restore R16
+    lwz  r17, 168(r1)  ; restore R17
+    lwz  r18, 172(r1)  ; restore R18
+    lwz  r19, 176(r1)  ; restore R19
+    lwz  r20, 180(r1)  ; restore R20
+    lwz  r21, 184(r1)  ; restore R21
+    lwz  r22, 188(r1)  ; restore R22
+    lwz  r23, 192(r1)  ; restore R23
+    lwz  r24, 196(r1)  ; restore R24
+    lwz  r25, 200(r1)  ; restore R25
+    lwz  r26, 204(r1)  ; restore R26
+    lwz  r27, 208(r1)  ; restore R27
+    lwz  r28, 212(r1)  ; restore R28
+    lwz  r29, 216(r1)  ; restore R29
+    lwz  r30, 220(r1)  ; restore R30
+    lwz  r31, 224(r1)  ; restore R31
+    lwz  r3,  228(r1)  ; restore hidden
 
-    # restore CR
+    ; restore CR
     lwz   r0, 232(r1)
     mtcr  r0
-    # restore LR
+    ; restore LR
     lwz   r0, 236(r1)
     mtlr  r0
-    # load PC
+    ; load PC
     lwz   r0, 240(r1)
-    # restore CTR
+    ; restore CTR
     mtctr r0
 
-    # adjust stack
+    ; adjust stack
     addi  r1, r1, 244
 
-    # return transfer_t 
+    ; return transfer_t 
     stw  r6, 0(r3)
     stw  r5, 4(r3)
 
-    # jump to context
+    ; jump to context
     bctr

php-8.1.13.tar.xz/Zend/asm/jump_ppc64_sysv_macho_gas.S -> php-8.1.21.tar.xz/Zend/asm/jump_ppc64_sysv_macho_gas.S Changed

@@ -12,7 +12,7 @@
  *  -------------------------------------------------  *
  *  |  0  |  4  |  8  |  12 |  16 |  20 |  24 |  28 |  *
  *  -------------------------------------------------  *
- *  |    TOC    |    R14    |    R15    |    R16    |  *
+ *  |    R13    |    R14    |    R15    |    R16    |  *
  *  -------------------------------------------------  *
  *  -------------------------------------------------  *
  *  |  8  |  9  |  10 |  11 |  12 |  13 |  14 |  15 |  *
@@ -61,7 +61,7 @@
  *  -------------------------------------------------  *
  *  | 224 | 228 | 232 | 236 | 240 | 244 | 248 | 252 |  *
  *  -------------------------------------------------  *
- *  | TOC saved |    FCTX   |    DATA   |           |  *
+ *  |    FCTX   |    DATA   |           |           |  *
  *  -------------------------------------------------  *
  *                                                     *
  *******************************************************/
@@ -138,27 +138,27 @@
 
     ; load PC
     ld  r12, 176(r1)
-    # restore CTR
+    ; restore CTR
     mtctr  r12
 
-    # adjust stack
+    ; adjust stack
     addi  r1, r1, 184
 
-    # zero in r3 indicates first jump to context-function
+    ; zero in r3 indicates first jump to context-function
     cmpdi r3, 0
     beq use_entry_arg
 
-    # return transfer_t
+    ; return transfer_t
     std  r6, 0(r3)
     std  r5, 8(r3)
 
-    # jump to context
+    ; jump to context
     bctr
 
 use_entry_arg:
-    # copy transfer_t into transfer_fn arg registers
+    ; copy transfer_t into transfer_fn arg registers
     mr  r3, r6
     mr  r4, r5
 
-    # jump to context
+    ; jump to context
     bctr

php-8.1.13.tar.xz/Zend/asm/jump_x86_64_sysv_elf_gas.S -> php-8.1.21.tar.xz/Zend/asm/jump_x86_64_sysv_elf_gas.S Changed

@@ -12,20 +12,29 @@
 * ---------------------------------------------------------------------------------- *
 * | 0x0 | 0x4 | 0x8 | 0xc | 0x10 | 0x14 | 0x18 | 0x1c | *
 * ---------------------------------------------------------------------------------- *
- * | fc_mxcsr|fc_x87_cw| R12 | R13 | R14 | *
+ * | fc_mxcsr|fc_x87_cw| guard | R12 | R13 | *
 * ---------------------------------------------------------------------------------- *
 * ---------------------------------------------------------------------------------- *
 * | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | *
 * ---------------------------------------------------------------------------------- *
 * | 0x20 | 0x24 | 0x28 | 0x2c | 0x30 | 0x34 | 0x38 | 0x3c | *
 * ---------------------------------------------------------------------------------- *
- * | R15 | RBX | RBP | RIP | *
+ * | R14 | R15 | RBX | RBP | *
+ * ---------------------------------------------------------------------------------- *
+ * ---------------------------------------------------------------------------------- *
+ * | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | *
+ * ---------------------------------------------------------------------------------- *
+ * | 0x40 | 0x44 | | *
+ * ---------------------------------------------------------------------------------- *
+ * | RIP | | *
 * ---------------------------------------------------------------------------------- *
 * *
 ****************************************************************************************/
 
 # if defined __CET__
 # include <cet.h>
+# define SHSTK_ENABLED (__CET__ & 0x2)
+# define BOOST_CONTEXT_SHADOW_STACK (SHSTK_ENABLED && SHADOW_STACK_SYSCALL)
 # else
 # define _CET_ENDBR
 # endif
@@ -36,19 +45,32 @@
 .align 16
 jump_fcontext:
 _CET_ENDBR
- leaq -0x38(%rsp), %rsp /* prepare stack */
+ leaq -0x40(%rsp), %rsp /* prepare stack */
 
 #if !defined(BOOST_USE_TSX)
 stmxcsr (%rsp) /* save MMX control- and status-word */
 fnstcw 0x4(%rsp) /* save x87 control-word */
 #endif
 
- movq %r12, 0x8(%rsp) /* save R12 */
- movq %r13, 0x10(%rsp) /* save R13 */
- movq %r14, 0x18(%rsp) /* save R14 */
- movq %r15, 0x20(%rsp) /* save R15 */
- movq %rbx, 0x28(%rsp) /* save RBX */
- movq %rbp, 0x30(%rsp) /* save RBP */
+#if defined(BOOST_CONTEXT_TLS_STACK_PROTECTOR)
+ movq %fs:0x28, %rcx /* read stack guard from TLS record */
+ movq %rcx, 0x8(%rsp) /* save stack guard */
+#endif
+
+ movq %r12, 0x10(%rsp) /* save R12 */
+ movq %r13, 0x18(%rsp) /* save R13 */
+ movq %r14, 0x20(%rsp) /* save R14 */
+ movq %r15, 0x28(%rsp) /* save R15 */
+ movq %rbx, 0x30(%rsp) /* save RBX */
+ movq %rbp, 0x38(%rsp) /* save RBP */
+
+#if BOOST_CONTEXT_SHADOW_STACK
+ /* grow the stack to reserve space for shadow stack pointer(SSP) */
+ leaq -0x8(%rsp), %rsp
+ /* read the current SSP and store it */
+ rdsspq %rcx
+ movq %rcx, (%rsp)
+#endif
 
 /* store RSP (pointing to context-data) in RAX */
 movq %rsp, %rax
@@ -56,21 +78,44 @@
 /* restore RSP (pointing to context-data) from RDI */
 movq %rdi, %rsp
 
- movq 0x38(%rsp), %r8 /* restore return-address */
+#if BOOST_CONTEXT_SHADOW_STACK
+ /* first 8 bytes are SSP */
+ movq (%rsp), %rcx
+ leaq 0x8(%rsp), %rsp
+
+ /* Restore target(new) shadow stack */
+ rstorssp -8(%rcx)
+ /* restore token for previous shadow stack is pushed */
+ /* on previous shadow stack after saveprevssp */
+ saveprevssp
+
+ /* when return, jump_fcontext jump to restored return address */
+ /* (r8) instead of RET. This miss of RET implies us to unwind */
+ /* shadow stack accordingly. Otherwise mismatch occur */
+ movq $1, %rcx
+ incsspq %rcx
+#endif
+
+ movq 0x40(%rsp), %r8 /* restore return-address */
 
 #if !defined(BOOST_USE_TSX)
 ldmxcsr (%rsp) /* restore MMX control- and status-word */
 fldcw 0x4(%rsp) /* restore x87 control-word */
 #endif
 
- movq 0x8(%rsp), %r12 /* restore R12 */
- movq 0x10(%rsp), %r13 /* restore R13 */
- movq 0x18(%rsp), %r14 /* restore R14 */
- movq 0x20(%rsp), %r15 /* restore R15 */
- movq 0x28(%rsp), %rbx /* restore RBX */
- movq 0x30(%rsp), %rbp /* restore RBP */
+#if defined(BOOST_CONTEXT_TLS_STACK_PROTECTOR)
+ movq 0x8(%rsp), %rdx /* load stack guard */
+ movq %rdx, %fs:0x28 /* restore stack guard to TLS record */
+#endif
+
+ movq 0x10(%rsp), %r12 /* restore R12 */
+ movq 0x18(%rsp), %r13 /* restore R13 */
+ movq 0x20(%rsp), %r14 /* restore R14 */
+ movq 0x28(%rsp), %r15 /* restore R15 */
+ movq 0x30(%rsp), %rbx /* restore RBX */
+ movq 0x38(%rsp), %rbp /* restore RBP */
 
- leaq 0x40(%rsp), %rsp /* prepare stack */
+ leaq 0x48(%rsp), %rsp /* prepare stack */
 
 /* return transfer_t from jump */
 #if !defined(_ILP32)

php-8.1.13.tar.xz/Zend/asm/make_i386_sysv_elf_gas.S -> php-8.1.21.tar.xz/Zend/asm/make_i386_sysv_elf_gas.S Changed

@@ -12,14 +12,14 @@
  *  ----------------------------------------------------------------------------------  *
  *  |   0x0   |   0x4   |   0x8   |   0xc   |   0x10   |   0x14  |   0x18  |   0x1c  |  *
  *  ----------------------------------------------------------------------------------  *
- *  | fc_mxcsr|fc_x87_cw|   EDI   |   ESI   |   EBX    |   EBP   |   EIP   |  hidden |  *
+ *  | fc_mxcsr|fc_x87_cw|  guard  |   EDI   |   ESI    |   EBX   |   EBP   |   EIP   |  *
  *  ----------------------------------------------------------------------------------  *
  *  ----------------------------------------------------------------------------------  *
  *  |    8    |    9    |    10   |    11   |    12    |    13   |    14   |    15   |  *
  *  ----------------------------------------------------------------------------------  *
- *  |   0x20  |   0x24  |                                                            |  *
+ *  |   0x20  |   0x24  |   0x28  |                                                  |  *
  *  ----------------------------------------------------------------------------------  *
- *  |    to   |   data  |                                                            |  *
+ *  |  hidden |    to   |   data  |                                                  |  *
  *  ----------------------------------------------------------------------------------  *
  *                                                                                      *
  ****************************************************************************************/
@@ -40,23 +40,29 @@
     /* shift address in EAX to lower 16 byte boundary */
     andl  $-16, %eax
 
-    /* reserve space for context-data on context-stack */
-    leal  -0x28(%eax), %eax
+    /* reserve space for context-data on context-stack, and align the stack */
+    leal  -0x34(%eax), %eax
 
     /* third arg of make_fcontext() == address of context-function */
     /* stored in EBX */
     movl  0xc(%esp), %ecx
-    movl  %ecx, 0x10(%eax)
+    movl  %ecx, 0x14(%eax)
 
     /* save MMX control- and status-word */
     stmxcsr (%eax)
     /* save x87 control-word */
     fnstcw  0x4(%eax)
 
+#if defined(BOOST_CONTEXT_TLS_STACK_PROTECTOR)
+    /* save stack guard */
+    movl  %gs:0x14, %ecx    /* read stack guard from TLS record */
+    movl  %ecx, 0x8(%eax)   /* save stack guard */
+#endif
+
     /* return transport_t */
     /* FCTX == EDI, DATA == ESI */
-    leal  0x8(%eax), %ecx
-    movl  %ecx, 0x1c(%eax)
+    leal  0xc(%eax), %ecx
+    movl  %ecx, 0x20(%eax)
 
     /* compute abs address of label trampoline */
     call  1f
@@ -66,7 +72,7 @@
     addl  $trampoline-1b, %ecx
     /* save address of trampoline as return address */
     /* will be entered after calling jump_fcontext() first time */
-    movl  %ecx, 0x18(%eax)
+    movl  %ecx, 0x1c(%eax)
 
     /* compute abs address of label finish */
     call  2f
@@ -76,7 +82,7 @@
     addl  $finish-2b, %ecx
     /* save address of finish as return-address for context-function */
     /* will be entered after context-function returns */
-    movl  %ecx, 0x14(%eax) 
+    movl  %ecx, 0x18(%eax)
 
     ret /* return pointer to context-data */

php-8.1.13.tar.xz/Zend/asm/make_i386_sysv_macho_gas.S -> php-8.1.21.tar.xz/Zend/asm/make_i386_sysv_macho_gas.S Changed

php-8.1.13.tar.xz/Zend/asm/make_ppc32_sysv_macho_gas.S -> php-8.1.21.tar.xz/Zend/asm/make_ppc32_sysv_macho_gas.S Changed

@@ -77,61 +77,78 @@
 .globl _make_fcontext
 .align 2
 _make_fcontext:
-    # save return address into R6
+    ; save return address into R6
     mflr  r6
 
-    # first arg of make_fcontext() == top address of context-function
-    # shift address in R3 to lower 16 byte boundary
+    ; first arg of make_fcontext() == top address of context-function
+    ; shift address in R3 to lower 16 byte boundary
     clrrwi  r3, r3, 4
 
-    # reserve space for context-data on context-stack
-    # including 64 byte of linkage + parameter area (R1  16 == 0)
+    ; reserve space for context-data on context-stack
+    ; including 64 byte of linkage + parameter area (R1 % 16 == 0)
     subi  r3, r3, 336
 
-    # third arg of make_fcontext() == address of context-function
-    stw  r5, 240(r3)
+    ; third arg of make_fcontext() == address of context-function
+    ; store as trampoline's R31
+    stw  r5, 224(r3)
 
-    # set back-chain to zero
+    ; set back-chain to zero
     li   r0, 0
     stw  r0, 244(r3)
 
-    mffs  f0  # load FPSCR
-    stfd  f0, 144(r3)  # save FPSCR
+    mffs  f0  ; load FPSCR
+    stfd  f0, 144(r3)  ; save FPSCR
 
-    # compute address of returned transfer_t
+    ; compute address of returned transfer_t
     addi  r0, r3, 252
     mr    r4, r0 
     stw   r4, 228(r3) 
 
-    # load LR
+    ; load LR
     mflr  r0
-    # jump to label 1
-    bl  1f
-1:
-    # load LR into R4
+    ; jump to label 1
+    bcl  20, 31, L1
+L1:
+    ; load LR into R4
     mflr  r4
-    # compute abs address of label finish
-    addi  r4, r4, finish - 1b
-    # restore LR
+    ; compute abs address of trampoline, use as PC
+    addi  r5, r4, lo16(Ltrampoline - L1)
+    stw  r5, 240(r3)
+    ; compute abs address of label finish
+    addi  r4, r4, lo16(Lfinish - L1)
+    ; restore LR
     mtlr  r0
-    # save address of finish as return-address for context-function
-    # will be entered after context-function returns
+    ; save address of finish as return-address for context-function
+    ; will be entered after context-function returns
     stw  r4, 236(r3)
 
-    # restore return address from R6
+    ; restore return address from R6
     mtlr  r6
 
-    blr  # return pointer to context-data
+    blr  ; return pointer to context-data
 
-finish:
-    # save return address into R0
-    mflr  r0
-    # save return address on stack, set up stack frame
-    stw  r0, 4(r1)
-    # allocate stack space, R1  16 == 0
-    stwu  r1, -16(r1)
+Ltrampoline:
+    ; We get R31 = context-function, R3 = address of transfer_t,
+    ; but we need to pass R3:R4 = transfer_t.
+    mtctr  r31
+    lwz  r4, 4(r3)
+    lwz  r3, 0(r3)
+    bctr
 
-    # exit code is zero
+Lfinish:
+    ; load address of _exit into CTR
+    bcl  20, 31, L2
+L2:
+    mflr  r4
+    addis  r4, r4, ha16(Lexitp - L2)
+    lwz  r4, lo16(Lexitp - L2)(r4)
+    mtctr  r4
+    ; exit code is zero
     li  r3, 0
-    # exit application
-    bl  _exit@plt
+    ; exit application
+    bctr
+
+.const_data
+.align 2
+Lexitp:
+    .long  __exit

php-8.1.13.tar.xz/Zend/asm/make_ppc64_sysv_macho_gas.S -> php-8.1.21.tar.xz/Zend/asm/make_ppc64_sysv_macho_gas.S Changed

@@ -12,7 +12,7 @@
  *  -------------------------------------------------  *
  *  |  0  |  4  |  8  |  12 |  16 |  20 |  24 |  28 |  *
  *  -------------------------------------------------  *
- *  |    TOC    |    R14    |    R15    |    R16    |  *
+ *  |    R13    |    R14    |    R15    |    R16    |  *
  *  -------------------------------------------------  *
  *  -------------------------------------------------  *
  *  |  8  |  9  |  10 |  11 |  12 |  13 |  14 |  15 |  *
@@ -61,7 +61,7 @@
  *  -------------------------------------------------  *
  *  | 224 | 228 | 232 | 236 | 240 | 244 | 248 | 252 |  *
  *  -------------------------------------------------  *
- *  | TOC saved |    FCTX   |    DATA   |           |  *
+ *  |    FCTX   |    DATA   |           |           |  *
  *  -------------------------------------------------  *
  *                                                     *
 
@@ -77,19 +77,19 @@
 
     ; reserve space for context-data on context-stack
     ; including 64 byte of linkage + parameter area (R1  16 == 0)
-    subi  r3, r3, 248
+    subi  r3, r3, 240
 
     ; third arg of make_fcontext() == address of context-function
     stw  r5, 176(r3)
 
     ; set back-chain to zero
-    li   %r0, 0
-    std  %r0, 184(%r3)
+    li   r0, 0
+    std  r0, 184(r3)
 
     ; compute address of returned transfer_t
-    addi %r0, %r3, 232
-    mr   %r4, %r0
-    std  %r4, 152(%r3)
+    addi r0, r3, 224
+    mr   r4, r0
+    std  r4, 152(r3)
 
     ; load LR
     mflr  r0

php-8.1.13.tar.xz/Zend/asm/make_x86_64_sysv_elf_gas.S -> php-8.1.21.tar.xz/Zend/asm/make_x86_64_sysv_elf_gas.S Changed

@@ -12,20 +12,29 @@
 * ---------------------------------------------------------------------------------- *
 * | 0x0 | 0x4 | 0x8 | 0xc | 0x10 | 0x14 | 0x18 | 0x1c | *
 * ---------------------------------------------------------------------------------- *
- * | fc_mxcsr|fc_x87_cw| R12 | R13 | R14 | *
+ * | fc_mxcsr|fc_x87_cw| guard | R12 | R13 | *
 * ---------------------------------------------------------------------------------- *
 * ---------------------------------------------------------------------------------- *
 * | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | *
 * ---------------------------------------------------------------------------------- *
 * | 0x20 | 0x24 | 0x28 | 0x2c | 0x30 | 0x34 | 0x38 | 0x3c | *
 * ---------------------------------------------------------------------------------- *
- * | R15 | RBX | RBP | RIP | *
+ * | R14 | R15 | RBX | RBP | *
+ * ---------------------------------------------------------------------------------- *
+ * ---------------------------------------------------------------------------------- *
+ * | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | *
+ * ---------------------------------------------------------------------------------- *
+ * | 0x40 | 0x44 | | *
+ * ---------------------------------------------------------------------------------- *
+ * | RIP | | *
 * ---------------------------------------------------------------------------------- *
 * *
 ****************************************************************************************/
 
 # if defined __CET__
 # include <cet.h>
+# define SHSTK_ENABLED (__CET__ & 0x2)
+# define BOOST_CONTEXT_SHADOW_STACK (SHSTK_ENABLED && SHADOW_STACK_SYSCALL)
 # else
 # define _CET_ENDBR
 # endif
@@ -36,6 +45,11 @@
 .align 16
 make_fcontext:
 _CET_ENDBR
+#if BOOST_CONTEXT_SHADOW_STACK
+ /* the new shadow stack pointer (SSP) */
+ movq -0x8(%rdi), %r9
+#endif
+
 /* first arg of make_fcontext() == top of context-stack */
 movq %rdi, %rax
 
@@ -44,36 +58,79 @@
 
 /* reserve space for context-data on context-stack */
 /* on context-function entry: (RSP -0x8) % 16 == 0 */
- leaq -0x40(%rax), %rax
+ leaq -0x48(%rax), %rax
 
 /* third arg of make_fcontext() == address of context-function */
 /* stored in RBX */
- movq %rdx, 0x28(%rax)
+ movq %rdx, 0x30(%rax)
 
 /* save MMX control- and status-word */
 stmxcsr (%rax)
 /* save x87 control-word */
 fnstcw 0x4(%rax)
 
+#if defined(BOOST_CONTEXT_TLS_STACK_PROTECTOR)
+ /* save stack guard */
+ movq %fs:0x28, %rcx /* read stack guard from TLS record */
+ movq %rcx, 0x8(%rsp) /* save stack guard */
+#endif
+
 /* compute abs address of label trampoline */
 leaq trampoline(%rip), %rcx
 /* save address of trampoline as return-address for context-function */
 /* will be entered after calling jump_fcontext() first time */
- movq %rcx, 0x38(%rax)
+ movq %rcx, 0x40(%rax)
 
 /* compute abs address of label finish */
 leaq finish(%rip), %rcx
 /* save address of finish as return-address for context-function */
 /* will be entered after context-function returns */
- movq %rcx, 0x30(%rax)
+ movq %rcx, 0x38(%rax)
+
+#if BOOST_CONTEXT_SHADOW_STACK
+ /* Populate the shadow stack and normal stack */
+ /* get original SSP */
+ rdsspq %r8
+ /* restore new shadow stack */
+ rstorssp -0x8(%r9)
+ /* save the restore token on the original shadow stack */
+ saveprevssp
+ /* push the address of "jmp trampoline" to the new shadow stack */
+ /* as well as the stack */
+ call 1f
+ jmp trampoline
+1:
+ /* save address of "jmp trampoline" as return-address */
+ /* for context-function */
+ pop 0x38(%rax)
+ /* Get the new SSP. */
+ rdsspq %r9
+ /* restore original shadow stack */
+ rstorssp -0x8(%r8)
+ /* save the restore token on the new shadow stack. */
+ saveprevssp
+
+ /* reserve space for the new SSP */
+ leaq -0x8(%rax), %rax
+ /* save the new SSP to this fcontext */
+ movq %r9, (%rax)
+#endif
 
 ret /* return pointer to context-data */
 
 trampoline:
+ _CET_ENDBR
 /* store return address on stack */
 /* fix stack alignment */
- _CET_ENDBR
+#if BOOST_CONTEXT_SHADOW_STACK
+ /* save address of "jmp *%rbp" as return-address */
+ /* on stack and shadow stack */
+ call 2f
+ jmp *%rbp
+2:
+#else
 push %rbp
+#endif
 /* jump to context-function */
 jmp *%rbx

php-8.1.13.tar.xz/Zend/tests/arginfo_zpp_mismatch.inc -> php-8.1.21.tar.xz/Zend/tests/arginfo_zpp_mismatch.inc Changed

php-8.1.21.tar.xz/Zend/tests/array_merge_recursive_next_key_overflow.phpt Added

php-8.1.21.tar.xz/Zend/tests/array_multisort_exception.phpt Added

php-8.1.21.tar.xz/Zend/tests/array_unpack/gh9769.phpt Added

php-8.1.13.tar.xz/Zend/tests/bug39542.phpt -> php-8.1.21.tar.xz/Zend/tests/bug39542.phpt Changed

php-8.1.13.tar.xz/Zend/tests/bug79919.phpt -> php-8.1.21.tar.xz/Zend/tests/bug79919.phpt Changed

php-8.1.21.tar.xz/Zend/tests/class_constants_007.phpt Added

php-8.1.13.tar.xz/Zend/tests/fibers/get-return-after-bailout.phpt -> php-8.1.21.tar.xz/Zend/tests/fibers/get-return-after-bailout.phpt Changed

php-8.1.21.tar.xz/Zend/tests/fibers/gh10249.phpt Added

php-8.1.21.tar.xz/Zend/tests/fibers/gh10340-001.phpt Added

php-8.1.21.tar.xz/Zend/tests/fibers/gh10340-002.phpt Added

php-8.1.21.tar.xz/Zend/tests/fibers/gh10340-003.phpt Added

php-8.1.21.tar.xz/Zend/tests/fibers/gh10437.phpt Added

php-8.1.21.tar.xz/Zend/tests/fibers/gh10496-001.phpt Added

php-8.1.21.tar.xz/Zend/tests/fibers/gh10496-002.phpt Added

php-8.1.21.tar.xz/Zend/tests/fibers/gh9735-001.phpt Added

php-8.1.21.tar.xz/Zend/tests/fibers/gh9735-002.phpt Added

php-8.1.21.tar.xz/Zend/tests/fibers/gh9735-003.phpt Added

php-8.1.21.tar.xz/Zend/tests/fibers/gh9735-004.phpt Added

php-8.1.21.tar.xz/Zend/tests/fibers/gh9735-005.phpt Added

php-8.1.21.tar.xz/Zend/tests/fibers/gh9735-006.phpt Added

php-8.1.21.tar.xz/Zend/tests/fibers/gh9735-007.phpt Added

php-8.1.21.tar.xz/Zend/tests/fibers/gh9735-008.phpt Added

php-8.1.21.tar.xz/Zend/tests/fibers/gh9735-009.phpt Added

php-8.1.21.tar.xz/Zend/tests/generators/gh11028_1.phpt Added

php-8.1.21.tar.xz/Zend/tests/generators/gh11028_2.phpt Added

php-8.1.21.tar.xz/Zend/tests/generators/gh11028_3.phpt Added

php-8.1.13.tar.xz/Zend/tests/generators/gh9801.phpt -> php-8.1.21.tar.xz/Zend/tests/generators/gh9801.phpt Changed

php-8.1.21.tar.xz/Zend/tests/gh10072-2.phpt Added

php-8.1.21.tar.xz/Zend/tests/gh10072.phpt Added

@@ -0,0 +1,106 @@
+--TEST--
+GH-10072 (PHP crashes when execute_ex is overridden and a trampoline is used from internal code)
+--EXTENSIONS--
+zend_test
+--INI--
+zend_test.replace_zend_execute_ex=1
+opcache.jit=disable
+--FILE--
+<?php
+class DummyStreamWrapper
+{
+ /** @var resource|null */
+ public $context;
+
+ /** @var resource|null */
+ public $handle;
+
+
+ public function stream_cast(int $castAs)
+ {
+ return $this->handle;
+ }
+
+
+ public function stream_close(): void
+ {
+ }
+
+ public function stream_open(string $path, string $mode, int $options = 0, ?string &$openedPath = null): bool
+ {
+ return true;
+ }
+
+
+ public function stream_read(int $count)
+ {
+ return 0;
+ }
+
+
+ public function stream_seek(int $offset, int $whence = SEEK_SET): bool
+ {
+ return true;
+ }
+
+
+ public function stream_set_option(int $option, int $arg1, ?int $arg2): bool
+ {
+ return false;
+ }
+
+
+ public function stream_stat()
+ {
+ return ;
+ }
+
+
+ public function stream_tell()
+ {
+ return ;
+ }
+
+
+ public function stream_truncate(int $newSize): bool
+ {
+ return true;
+ }
+
+
+ public function stream_write(string $data)
+ {
+ }
+
+
+ public function unlink(string $path): bool
+ {
+ return false;
+ }
+}
+
+class TrampolineTest {
+ /** @var resource|null */
+ public $context;
+
+ /** @var object|null */
+ private $wrapper;
+
+ public function __call(string $name, array $arguments) {
+ if (!$this->wrapper) {
+ $this->wrapper = new DummyStreamWrapper();
+ }
+ echo 'Trampoline for ', $name, PHP_EOL;
+ return $this->wrapper->$name(...$arguments);
+	}
+
+}
+
+stream_wrapper_register('custom', TrampolineTest::class);
+
+
+$fp = fopen("custom://myvar", "r+");
+?>
+--EXPECT--
+Trampoline for stream_open
+Trampoline for stream_close

php-8.1.21.tar.xz/Zend/tests/gh10251.phpt Added

php-8.1.21.tar.xz/Zend/tests/gh10570.phpt Added

php-8.1.21.tar.xz/Zend/tests/gh10709.phpt Added

php-8.1.21.tar.xz/Zend/tests/gh10709_2.phpt Added

php-8.1.21.tar.xz/Zend/tests/gh10709_3.phpt Added

php-8.1.21.tar.xz/Zend/tests/gh10810.phpt Added

php-8.1.21.tar.xz/Zend/tests/gh11108.phpt Added

php-8.1.21.tar.xz/Zend/tests/gh11108_shutdown.inc Added

php-8.1.21.tar.xz/Zend/tests/gh11108_test.inc Added

php-8.1.21.tar.xz/Zend/tests/gh11138.phpt Added

php-8.1.21.tar.xz/Zend/tests/gh11171.phpt Added

php-8.1.21.tar.xz/Zend/tests/gh11189.phpt Added

php-8.1.21.tar.xz/Zend/tests/gh11189_1.phpt Added

php-8.1.21.tar.xz/Zend/tests/gh11222.phpt Added

php-8.1.21.tar.xz/Zend/tests/gh8841.phpt Added

php-8.1.21.tar.xz/Zend/tests/gh9775_1.phpt Added

@@ -0,0 +1,56 @@
+--TEST--
+GH-9775: Backed enum in array_unique()
+--FILE--
+<?php
+
+enum Test: string
+{
+ case AUTHENTICATED = 'authenticated';
+ case COURSES_ADMIN = 'courses.admin';
+ case BUNDLES_ADMIN = 'bundles.admin';
+ case COURSES_REPORTING_ACCESS = 'courses-reporting.access';
+ case B2B_DASHBOARD_ACCESS = 'b2b-dashboard.access';
+ case INSTRUCTORS_ADMIN = 'instructors.admin';
+ case USERS_ADMIN = 'users.admin';
+ case COUPONS_ADMIN = 'coupons.admin';
+}
+
+$instructorsAdmin = Test::INSTRUCTORS_ADMIN;
+
+$data = 
+ Test::COURSES_ADMIN,
+ Test::COURSES_REPORTING_ACCESS,
+ Test::BUNDLES_ADMIN,
+ Test::USERS_ADMIN,
+ Test::B2B_DASHBOARD_ACCESS,
+ Test::B2B_DASHBOARD_ACCESS,
+ Test::INSTRUCTORS_ADMIN,
+ &$instructorsAdmin,
+ Test::COUPONS_ADMIN,
+ Test::AUTHENTICATED,
+;
+
+$data = array_unique($data, flags: SORT_REGULAR);
+
+var_dump($data);
+
+?>
+--EXPECT--
+array(8) {
+ 0=>
+ enum(Test::COURSES_ADMIN)
+ 1=>
+ enum(Test::COURSES_REPORTING_ACCESS)
+ 2=>
+ enum(Test::BUNDLES_ADMIN)
+ 3=>
+ enum(Test::USERS_ADMIN)
+ 4=>
+ enum(Test::B2B_DASHBOARD_ACCESS)
+ 6=>
+ enum(Test::INSTRUCTORS_ADMIN)
+ 8=>
+ enum(Test::COUPONS_ADMIN)
+ 9=>
+ enum(Test::AUTHENTICATED)
+}

php-8.1.21.tar.xz/Zend/tests/gh9775_2.phpt Added

@@ -0,0 +1,56 @@
+--TEST--
+GH-9775: Pure enum in array_unique()
+--FILE--
+<?php
+
+enum Test
+{
+ case AUTHENTICATED;
+ case COURSES_ADMIN;
+ case BUNDLES_ADMIN;
+ case COURSES_REPORTING_ACCESS;
+ case B2B_DASHBOARD_ACCESS;
+ case INSTRUCTORS_ADMIN;
+ case USERS_ADMIN;
+ case COUPONS_ADMIN;
+}
+
+$instructorsAdmin = Test::INSTRUCTORS_ADMIN;
+
+$data = 
+ Test::COURSES_ADMIN,
+ Test::COURSES_REPORTING_ACCESS,
+ Test::BUNDLES_ADMIN,
+ Test::USERS_ADMIN,
+ Test::B2B_DASHBOARD_ACCESS,
+ Test::B2B_DASHBOARD_ACCESS,
+ Test::INSTRUCTORS_ADMIN,
+ &$instructorsAdmin,
+ Test::COUPONS_ADMIN,
+ Test::AUTHENTICATED,
+;
+
+$data = array_unique($data, flags: SORT_REGULAR);
+
+var_dump($data);
+
+?>
+--EXPECT--
+array(8) {
+ 0=>
+ enum(Test::COURSES_ADMIN)
+ 1=>
+ enum(Test::COURSES_REPORTING_ACCESS)
+ 2=>
+ enum(Test::BUNDLES_ADMIN)
+ 3=>
+ enum(Test::USERS_ADMIN)
+ 4=>
+ enum(Test::B2B_DASHBOARD_ACCESS)
+ 6=>
+ enum(Test::INSTRUCTORS_ADMIN)
+ 8=>
+ enum(Test::COUPONS_ADMIN)
+ 9=>
+ enum(Test::AUTHENTICATED)
+}

php-8.1.21.tar.xz/Zend/tests/gh9916-001.phpt Added

php-8.1.21.tar.xz/Zend/tests/gh9916-002.phpt Added

php-8.1.21.tar.xz/Zend/tests/gh9916-003.phpt Added

php-8.1.21.tar.xz/Zend/tests/gh9916-004.phpt Added

php-8.1.21.tar.xz/Zend/tests/gh9916-005.phpt Added

php-8.1.21.tar.xz/Zend/tests/gh9916-006.phpt Added

php-8.1.21.tar.xz/Zend/tests/gh9916-007.phpt Added

@@ -0,0 +1,57 @@
+--TEST--
+Bug GH-9916 007 (Entering shutdown sequence with a fiber suspended in a Generator emits an unavoidable fatal error or crashes)
+--FILE--
+<?php
+$it = new class implements Iterator
+{
+ public function current(): mixed
+ {
+ return null;
+ }
+
+ public function key(): mixed
+ {
+ return 0;
+ }
+
+ public function next(): void
+ {
+ }
+
+ public function rewind(): void
+ {
+ try {
+ print "Before suspend\n";
+ Fiber::suspend();
+ print "Not executed\n";
+ } finally {
+ print "Finally (iterator)\n";
+ }
+ }
+
+ public function valid(): bool
+ {
+ return true;
+ }
+};
+
+$gen = (function() use ($it) {
+ try {
+ yield from $it;
+ print "Not executed\n";
+ } finally {
+ print "Finally\n";
+ }
+})();
+$fiber = new Fiber(function() use ($gen, &$fiber) {
+ $gen->current();
+ print "Not executed";
+});
+$fiber->start();
+?>
+==DONE==
+--EXPECT--
+Before suspend
+==DONE==
+Finally (iterator)
+Finally

php-8.1.21.tar.xz/Zend/tests/gh9916-008.phpt Added

php-8.1.21.tar.xz/Zend/tests/gh9916-009.phpt Added

php-8.1.21.tar.xz/Zend/tests/gh9916-010.phpt Added

php-8.1.21.tar.xz/Zend/tests/gh9916-011.phpt Added

php-8.1.21.tar.xz/Zend/tests/gh9916-012.phpt Added

php-8.1.21.tar.xz/Zend/tests/match/gh11134.phpt Added

php-8.1.21.tar.xz/Zend/tests/oss_fuzz_58181.phpt Added

php-8.1.13.tar.xz/Zend/tests/type_declarations/internal_function_strict_mode.phpt -> php-8.1.21.tar.xz/Zend/tests/type_declarations/internal_function_strict_mode.phpt Changed

php-8.1.21.tar.xz/Zend/tests/type_declarations/typed_properties_113.phpt Added

php-8.1.21.tar.xz/Zend/tests/type_declarations/typed_properties_114.phpt Added

php-8.1.21.tar.xz/Zend/tests/type_declarations/typed_properties_115.phpt Added

php-8.1.21.tar.xz/Zend/tests/unary_minus_const_expr_consistency.phpt Added

php-8.1.13.tar.xz/Zend/zend.c -> php-8.1.21.tar.xz/Zend/zend.c Changed

@@ -35,6 +35,7 @@
 #include "zend_attributes.h"
 #include "zend_observer.h"
 #include "zend_fibers.h"
+#include "zend_max_execution_timer.h"
 #include "Optimizer/zend_optimizer.h"
 
 static size_t global_map_ptr_last = 0;
@@ -800,6 +801,10 @@
 	executor_globals->record_errors = false;
 	executor_globals->num_errors = 0;
 	executor_globals->errors = NULL;
+#ifdef ZEND_MAX_EXECUTION_TIMERS
+	executor_globals->pid = 0;
+	executor_globals->oldact = (struct sigaction){0};
+#endif
 }
 /* }}} */
 
@@ -821,6 +826,7 @@
 {
 	zend_copy_ini_directives();
 	zend_ini_refresh_caches(ZEND_INI_STAGE_STARTUP);
+	zend_max_execution_timer_init();
 }
 /* }}} */
 #endif
@@ -1186,6 +1192,7 @@
 	CG(unclean_shutdown) = 1;
 	CG(active_class_entry) = NULL;
 	CG(in_compilation) = 0;
+	CG(memoize_mode) = 0;
 	EG(current_execute_data) = NULL;
 	LONGJMP(*EG(bailout), FAILURE);
 }
@@ -1280,6 +1287,34 @@
 
 	zend_destroy_rsrc_list(&EG(regular_list));
 
+	/* See GH-8646: https://github.com/php/php-src/issues/8646
+	 *
+	 * Interned strings that hold class entries can get a corresponding slot in map_ptr for the CE cache.
+	 * map_ptr works like a bump allocator: there is a counter which increases to allocate the next slot in the map.
+	 *
+	 * For class name strings in non-opcache we have:
+	 *   - on startup: permanent + interned
+	 *   - on request: interned
+	 * For class name strings in opcache we have:
+	 *   - on startup: permanent + interned
+	 *   - on request: either not interned at all, which we can ignore because they won't get a CE cache entry
+	 *                 or they were already permanent + interned
+	 *                 or we get a new permanent + interned string in the opcache persistence code
+	 *
+	 * Notice that the map_ptr layout always has the permanent strings first, and the request strings after.
+	 * In non-opcache, a request string may get a slot in map_ptr, and that interned request string
+	 * gets destroyed at the end of the request. The corresponding map_ptr slot can thereafter never be used again.
+	 * This causes map_ptr to keep reallocating to larger and larger sizes.
+	 *
+	 * We solve it as follows:
+	 * We can check whether we had any interned request strings, which only happens in non-opcache.
+	 * If we have any, we reset map_ptr to the last permanent string.
+	 * We can't lose any permanent strings because of map_ptr's layout.
+	 */
+	if (zend_hash_num_elements(&CG(interned_strings)) > 0) {
+		zend_map_ptr_reset();
+	}
+
 #if GC_BENCH
 	fprintf(stderr, "GC Statistics\n");
 	fprintf(stderr, "-------------\n");
@@ -1612,6 +1647,18 @@
 	abort();
 }
 
+ZEND_API ZEND_COLD ZEND_NORETURN void zend_strerror_noreturn(int type, int errn, const char *message)
+{
+#ifdef HAVE_STR_ERROR_R
+	char buf1024;
+	strerror_r(errn, buf, sizeof(buf));
+#else
+	char *buf = strerror(errn);
+#endif
+
+	zend_error_noreturn(type, "%s: %s (%d)", message, buf, errn);
+}
+
 ZEND_API ZEND_COLD void zend_error_zstr(int type, zend_string *message) {
 	zend_string *filename;
 	uint32_t lineno;

php-8.1.13.tar.xz/Zend/zend.h -> php-8.1.21.tar.xz/Zend/zend.h Changed

php-8.1.13.tar.xz/Zend/zend_API.c -> php-8.1.21.tar.xz/Zend/zend_API.c Changed

php-8.1.13.tar.xz/Zend/zend_API.h -> php-8.1.21.tar.xz/Zend/zend_API.h Changed

@@ -117,6 +117,7 @@
 	{ #name, ZEND_TYPE_INIT_NONE(_ZEND_ARG_INFO_FLAGS(pass_by_ref, 0, 0)), default_value },
 #define ZEND_ARG_VARIADIC_INFO(pass_by_ref, name) \
 	{ #name, ZEND_TYPE_INIT_NONE(_ZEND_ARG_INFO_FLAGS(pass_by_ref, 1, 0)), NULL },
+
 /* Arginfo structures with simple type information */
 #define ZEND_ARG_TYPE_INFO(pass_by_ref, name, type_hint, allow_null) \
 	{ #name, ZEND_TYPE_INIT_CODE(type_hint, allow_null, _ZEND_ARG_INFO_FLAGS(pass_by_ref, 0, 0)), NULL },
@@ -124,18 +125,23 @@
 	{ #name, ZEND_TYPE_INIT_CODE(type_hint, allow_null, _ZEND_ARG_INFO_FLAGS(pass_by_ref, 0, 0)), default_value },
 #define ZEND_ARG_VARIADIC_TYPE_INFO(pass_by_ref, name, type_hint, allow_null) \
 	{ #name, ZEND_TYPE_INIT_CODE(type_hint, allow_null, _ZEND_ARG_INFO_FLAGS(pass_by_ref, 1, 0)), NULL },
+
 /* Arginfo structures with complex type information */
 #define ZEND_ARG_TYPE_MASK(pass_by_ref, name, type_mask, default_value) \
 	{ #name, ZEND_TYPE_INIT_MASK(type_mask | _ZEND_ARG_INFO_FLAGS(pass_by_ref, 0, 0)), default_value },
 #define ZEND_ARG_OBJ_TYPE_MASK(pass_by_ref, name, class_name, type_mask, default_value) \
 	{ #name, ZEND_TYPE_INIT_CLASS_CONST_MASK(#class_name, type_mask | _ZEND_ARG_INFO_FLAGS(pass_by_ref, 0, 0)), default_value },
+#define ZEND_ARG_VARIADIC_OBJ_TYPE_MASK(pass_by_ref, name, class_name, type_mask) \
+	{ #name, ZEND_TYPE_INIT_CLASS_CONST_MASK(#class_name, type_mask | _ZEND_ARG_INFO_FLAGS(pass_by_ref, 1, 0)), NULL },
+
 /* Arginfo structures with object type information */
-#define ZEND_ARG_OBJ_INFO(pass_by_ref, name, classname, allow_null) \
-	{ #name, ZEND_TYPE_INIT_CLASS_CONST(#classname, allow_null, _ZEND_ARG_INFO_FLAGS(pass_by_ref, 0, 0)), NULL },
-#define ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(pass_by_ref, name, classname, allow_null, default_value) \
-	{ #name, ZEND_TYPE_INIT_CLASS_CONST(#classname, allow_null, _ZEND_ARG_INFO_FLAGS(pass_by_ref, 0, 0)), default_value },
-#define ZEND_ARG_VARIADIC_OBJ_INFO(pass_by_ref, name, classname, allow_null) \
-	{ #name, ZEND_TYPE_INIT_CLASS_CONST(#classname, allow_null, _ZEND_ARG_INFO_FLAGS(pass_by_ref, 1, 0)), NULL },
+#define ZEND_ARG_OBJ_INFO(pass_by_ref, name, class_name, allow_null) \
+	{ #name, ZEND_TYPE_INIT_CLASS_CONST(#class_name, allow_null, _ZEND_ARG_INFO_FLAGS(pass_by_ref, 0, 0)), NULL },
+#define ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(pass_by_ref, name, class_name, allow_null, default_value) \
+	{ #name, ZEND_TYPE_INIT_CLASS_CONST(#class_name, allow_null, _ZEND_ARG_INFO_FLAGS(pass_by_ref, 0, 0)), default_value },
+#define ZEND_ARG_VARIADIC_OBJ_INFO(pass_by_ref, name, class_name, allow_null) \
+	{ #name, ZEND_TYPE_INIT_CLASS_CONST(#class_name, allow_null, _ZEND_ARG_INFO_FLAGS(pass_by_ref, 1, 0)), NULL },
+
 /* Legacy arginfo structures */
 #define ZEND_ARG_ARRAY_INFO(pass_by_ref, name, allow_null) \
 	{ #name, ZEND_TYPE_INIT_CODE(IS_ARRAY, allow_null, _ZEND_ARG_INFO_FLAGS(pass_by_ref, 0, 0)), NULL },

php-8.1.13.tar.xz/Zend/zend_alloc.c -> php-8.1.21.tar.xz/Zend/zend_alloc.c Changed

@@ -416,11 +416,61 @@
 /* OS Allocation */
 /*****************/
 
+static void zend_mm_munmap(void *addr, size_t size)
+{
+#ifdef _WIN32
+	if (VirtualFree(addr, 0, MEM_RELEASE) == 0) {
+		/** ERROR_INVALID_ADDRESS is expected when addr is not range start address */
+		if (GetLastError() != ERROR_INVALID_ADDRESS) {
+#if ZEND_MM_ERROR
+			stderr_last_error("VirtualFree() failed");
+#endif
+			return;
+		}
+		SetLastError(0);
+
+		MEMORY_BASIC_INFORMATION mbi;
+		if (VirtualQuery(addr, &mbi, sizeof(mbi)) == 0) {
+#if ZEND_MM_ERROR
+			stderr_last_error("VirtualQuery() failed");
+#endif
+			return;
+		}
+		addr = mbi.AllocationBase;
+
+		if (VirtualFree(addr, 0, MEM_RELEASE) == 0) {
+#if ZEND_MM_ERROR
+			stderr_last_error("VirtualFree() failed");
+#endif
+		}
+	}
+#else
+	if (munmap(addr, size) != 0) {
+#if ZEND_MM_ERROR
+		fprintf(stderr, "\nmunmap() failed: %d %s\n", errno, strerror(errno));
+#endif
+	}
+#endif
+}
+
 #ifndef HAVE_MREMAP
 static void *zend_mm_mmap_fixed(void *addr, size_t size)
 {
 #ifdef _WIN32
-	return VirtualAlloc(addr, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
+	void *ptr = VirtualAlloc(addr, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
+
+	if (ptr == NULL) {
+		/** ERROR_INVALID_ADDRESS is expected when fixed addr range is not free */
+		if (GetLastError() != ERROR_INVALID_ADDRESS) {
+#if ZEND_MM_ERROR
+			stderr_last_error("VirtualAlloc() fixed failed");
+#endif
+		}
+		SetLastError(0);
+		return NULL;
+	}
+	ZEND_ASSERT(ptr == addr);
+	return ptr;
 #else
 	int flags = MAP_PRIVATE | MAP_ANON;
 #if defined(MAP_EXCL)
@@ -431,15 +481,11 @@
 
 	if (ptr == MAP_FAILED) {
 #if ZEND_MM_ERROR && !defined(MAP_EXCL)
-		fprintf(stderr, "\nmmap() failed: %d %s\n", errno, strerror(errno));
+		fprintf(stderr, "\nmmap() fixed failed: %d %s\n", errno, strerror(errno));
 #endif
 		return NULL;
 	} else if (ptr != addr) {
-		if (munmap(ptr, size) != 0) {
-#if ZEND_MM_ERROR
-			fprintf(stderr, "\nmunmap() failed: %d %s\n", errno, strerror(errno));
-#endif
-		}
+		zend_mm_munmap(ptr, size);
 		return NULL;
 	}
 	return ptr;
@@ -483,23 +529,6 @@
 #endif
 }
 
-static void zend_mm_munmap(void *addr, size_t size)
-{
-#ifdef _WIN32
-	if (VirtualFree(addr, 0, MEM_RELEASE) == 0) {
-#if ZEND_MM_ERROR
-		stderr_last_error("VirtualFree() failed");
-#endif
-	}
-#else
-	if (munmap(addr, size) != 0) {
-#if ZEND_MM_ERROR
-		fprintf(stderr, "\nmunmap() failed: %d %s\n", errno, strerror(errno));
-#endif
-	}
-#endif
-}
-
 /***********/
 /* Bitmask */
 /***********/
@@ -683,12 +712,20 @@
 		ptr = zend_mm_mmap(size + alignment - REAL_PAGE_SIZE);
 #ifdef _WIN32
 		offset = ZEND_MM_ALIGNED_OFFSET(ptr, alignment);
-		zend_mm_munmap(ptr, size + alignment - REAL_PAGE_SIZE);
-		ptr = zend_mm_mmap_fixed((void*)((char*)ptr + (alignment - offset)), size);
-		offset = ZEND_MM_ALIGNED_OFFSET(ptr, alignment);
 		if (offset != 0) {
-			zend_mm_munmap(ptr, size);
-			return NULL;
+			offset = alignment - offset;
+		}
+		zend_mm_munmap(ptr, size + alignment - REAL_PAGE_SIZE);
+		ptr = zend_mm_mmap_fixed((void*)((char*)ptr + offset), size);
+		if (ptr == NULL) { // fix GH-9650, fixed addr range is not free
+			ptr = zend_mm_mmap(size + alignment - REAL_PAGE_SIZE);
+			if (ptr == NULL) {
+				return NULL;
+			}
+			offset = ZEND_MM_ALIGNED_OFFSET(ptr, alignment);
+			if (offset != 0) {
+				ptr = (void*)((char*)ptr + alignment - offset);
+			}
 		}
 		return ptr;
 #else
@@ -1847,11 +1884,7 @@
 
 	if (UNEXPECTED(chunk == NULL)) {
 #if ZEND_MM_ERROR
-#ifdef _WIN32
-		stderr_last_error("Can't initialize heap");
-#else
-		fprintf(stderr, "\nCan't initialize heap: %d %s\n", errno, strerror(errno));
-#endif
+		fprintf(stderr, "Can't initialize heap\n");
 #endif
 		return NULL;
 	}
@@ -2978,11 +3011,7 @@
 	chunk = (zend_mm_chunk*)handlers->chunk_alloc(&tmp_storage, ZEND_MM_CHUNK_SIZE, ZEND_MM_CHUNK_SIZE);
 	if (UNEXPECTED(chunk == NULL)) {
 #if ZEND_MM_ERROR
-#ifdef _WIN32
-		stderr_last_error("Can't initialize heap");
-#else
-		fprintf(stderr, "\nCan't initialize heap: %d %s\n", errno, strerror(errno));
-#endif
+		fprintf(stderr, "Can't initialize heap\n");
 #endif
 		return NULL;
 	}
@@ -3025,11 +3054,7 @@
 	if (!storage) {
 		handlers->chunk_free(&tmp_storage, chunk, ZEND_MM_CHUNK_SIZE);
 #if ZEND_MM_ERROR
-#ifdef _WIN32
-		stderr_last_error("Can't initialize heap");
-#else
-		fprintf(stderr, "\nCan't initialize heap: %d %s\n", errno, strerror(errno));
-#endif
+		fprintf(stderr, "Can't initialize heap\n");
 #endif
 		return NULL;
 	}

php-8.1.13.tar.xz/Zend/zend_ast.c -> php-8.1.21.tar.xz/Zend/zend_ast.c Changed

php-8.1.13.tar.xz/Zend/zend_compile.c -> php-8.1.21.tar.xz/Zend/zend_compile.c Changed

@@ -2924,6 +2924,7 @@
 	opline = zend_delayed_emit_op(result, ZEND_FETCH_OBJ_R, &obj_node, &prop_node);
 	if (opline->op2_type == IS_CONST) {
 		convert_to_string(CT_CONSTANT(opline->op2));
+		zend_string_hash_val(Z_STR_P(CT_CONSTANT(opline->op2)));
 		opline->extended_value = zend_alloc_cache_slots(3);
 	}
 
@@ -7125,7 +7126,7 @@
 	return def_offset;
 }
 
-static void zend_begin_func_decl(znode *result, zend_op_array *op_array, zend_ast_decl *decl, bool toplevel) /* {{{ */
+static zend_string *zend_begin_func_decl(znode *result, zend_op_array *op_array, zend_ast_decl *decl, bool toplevel) /* {{{ */
 {
 	zend_string *unqualified_name, *name, *lcname;
 	zend_op *opline;
@@ -7156,11 +7157,7 @@
 
 	zend_register_seen_symbol(lcname, ZEND_SYMBOL_FUNCTION);
 	if (toplevel) {
-		if (UNEXPECTED(zend_hash_add_ptr(CG(function_table), lcname, op_array) == NULL)) {
-			do_bind_function_error(lcname, op_array, 1);
-		}
-		zend_string_release_ex(lcname, 0);
-		return;
+		return lcname;
 	}
 
 	uint32_t func_ref = zend_add_dynamic_func_def(op_array);
@@ -7174,7 +7171,8 @@
 		LITERAL_STR(opline->op1, zend_string_copy(lcname));
 		opline->op2.num = func_ref;
 	}
-	zend_string_release_ex(lcname, 0);
+
+	return lcname;
 }
 /* }}} */
 
@@ -7186,7 +7184,7 @@
 	zend_ast *stmt_ast = decl->child2;
 	zend_ast *return_type_ast = decl->child3;
 	bool is_method = decl->kind == ZEND_AST_METHOD;
-	zend_string *method_lcname = NULL;
+	zend_string *lcname;
 
 	zend_class_entry *orig_class_entry = CG(active_class_entry);
 	zend_op_array *orig_op_array = CG(active_op_array);
@@ -7218,9 +7216,9 @@
 
 	if (is_method) {
 		bool has_body = stmt_ast != NULL;
-		method_lcname = zend_begin_method_decl(op_array, decl->name, has_body);
+		lcname = zend_begin_method_decl(op_array, decl->name, has_body);
 	} else {
-		zend_begin_func_decl(result, op_array, decl, toplevel);
+		lcname = zend_begin_func_decl(result, op_array, decl, toplevel);
 		if (decl->kind == ZEND_AST_ARROW_FUNC) {
 			find_implicit_binds(&info, params_ast, stmt_ast);
 			compile_implicit_lexical_binds(&info, result, op_array);
@@ -7263,7 +7261,7 @@
 	}
 
 	zend_compile_params(params_ast, return_type_ast,
-		is_method && zend_string_equals_literal(method_lcname, ZEND_TOSTRING_FUNC_NAME) ? IS_STRING : 0);
+		is_method && zend_string_equals_literal(lcname, ZEND_TOSTRING_FUNC_NAME) ? IS_STRING : 0);
 	if (CG(active_op_array)->fn_flags & ZEND_ACC_GENERATOR) {
 		zend_mark_function_as_generator();
 		zend_emit_op(NULL, ZEND_GENERATOR_CREATE, NULL, NULL);
@@ -7279,9 +7277,14 @@
 	if (is_method) {
 		CG(zend_lineno) = decl->start_lineno;
 		zend_check_magic_method_implementation(
-			CG(active_class_entry), (zend_function *) op_array, method_lcname, E_COMPILE_ERROR);
-		zend_string_release_ex(method_lcname, 0);
+			CG(active_class_entry), (zend_function *) op_array, lcname, E_COMPILE_ERROR);
+	} else if (toplevel) {
+		/* Only register the function after a successful compile */
+		if (UNEXPECTED(zend_hash_add_ptr(CG(function_table), lcname, op_array) == NULL)) {
+			do_bind_function_error(lcname, op_array, true);
+		}
 	}
+	zend_string_release_ex(lcname, 0);
 
 	/* put the implicit return on the really last line */
 	CG(zend_lineno) = decl->end_lineno;

php-8.1.13.tar.xz/Zend/zend_cpuinfo.h -> php-8.1.21.tar.xz/Zend/zend_cpuinfo.h Changed

php-8.1.13.tar.xz/Zend/zend_exceptions.c -> php-8.1.21.tar.xz/Zend/zend_exceptions.c Changed

@@ -680,24 +680,36 @@
 		}
 
 		if ((Z_OBJCE_P(exception) == zend_ce_type_error || Z_OBJCE_P(exception) == zend_ce_argument_count_error) && strstr(ZSTR_VAL(message), ", called in ")) {
-			zend_string *real_message = zend_strpprintf(0, "%s and defined", ZSTR_VAL(message));
+			zval message_zv;
+			ZVAL_STR(&message_zv, message);
+			zend_string *real_message = zend_strpprintf_unchecked(0, "%Z and defined", &message_zv);
 			zend_string_release_ex(message, 0);
 			message = real_message;
 		}
 
+		zend_string *tmp_trace = (Z_TYPE(trace) == IS_STRING && Z_STRLEN(trace))
+			? zend_string_copy(Z_STR(trace))
+			: ZSTR_INIT_LITERAL("#0 {main}\n", false);
+
+		zval name_zv, trace_zv, file_zv, prev_str_zv;
+		ZVAL_STR(&name_zv, Z_OBJCE_P(exception)->name);
+		ZVAL_STR(&trace_zv, tmp_trace);
+		ZVAL_STR(&file_zv, file);
+		ZVAL_STR(&prev_str_zv, prev_str);
+
 		if (ZSTR_LEN(message) > 0) {
-			str = zend_strpprintf(0, "%s: %s in %s:" ZEND_LONG_FMT
-					"\nStack trace:\n%s%s%s",
-					ZSTR_VAL(Z_OBJCE_P(exception)->name), ZSTR_VAL(message), ZSTR_VAL(file), line,
-					(Z_TYPE(trace) == IS_STRING && Z_STRLEN(trace)) ? Z_STRVAL(trace) : "#0 {main}\n",
-					ZSTR_LEN(prev_str) ? "\n\nNext " : "", ZSTR_VAL(prev_str));
+			zval message_zv;
+			ZVAL_STR(&message_zv, message);
+
+			str = zend_strpprintf_unchecked(0, "%Z: %Z in %Z:" ZEND_LONG_FMT "\nStack trace:\n%Z%s%Z",
+				&name_zv, &message_zv, &file_zv, line,
+				&trace_zv, ZSTR_LEN(prev_str) ? "\n\nNext " : "", &prev_str_zv);
 		} else {
-			str = zend_strpprintf(0, "%s in %s:" ZEND_LONG_FMT
-					"\nStack trace:\n%s%s%s",
-					ZSTR_VAL(Z_OBJCE_P(exception)->name), ZSTR_VAL(file), line,
-					(Z_TYPE(trace) == IS_STRING && Z_STRLEN(trace)) ? Z_STRVAL(trace) : "#0 {main}\n",
-					ZSTR_LEN(prev_str) ? "\n\nNext " : "", ZSTR_VAL(prev_str));
+			str = zend_strpprintf_unchecked(0, "%Z in %Z:" ZEND_LONG_FMT "\nStack trace:\n%Z%s%Z",
+				&name_zv, &file_zv, line,
+				&trace_zv, ZSTR_LEN(prev_str) ? "\n\nNext " : "", &prev_str_zv);
 		}
+		zend_string_release_ex(tmp_trace, false);
 
 		zend_string_release_ex(prev_str, 0);
 		zend_string_release_ex(message, 0);

php-8.1.13.tar.xz/Zend/zend_execute.c -> php-8.1.21.tar.xz/Zend/zend_execute.c Changed

@@ -1207,6 +1207,7 @@
 	zend_property_info *prop_info =
 		zend_get_property_info(obj->ce, name, /* silent */ true);
 	if (prop_info && prop_info != ZEND_WRONG_PROPERTY_INFO && ZEND_TYPE_IS_SET(prop_info->type)) {
+		ZVAL_OPT_DEREF(val);
 		zend_verify_property_type(prop_info, val, /* strict */ true);
 	}
 }
@@ -2230,7 +2231,7 @@
 	zend_throw_error(NULL, "Cannot use a scalar value as an array");
 }
 
-static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_cannot_add_element(void)
+ZEND_API zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_cannot_add_element(void)
 {
 	zend_throw_error(NULL, "Cannot add element to the array as the next element is already occupied");
 }
@@ -3086,7 +3087,7 @@
 	return 1;
 }
 
-static zend_always_inline void zend_fetch_property_address(zval *result, zval *container, uint32_t container_op_type, zval *prop_ptr, uint32_t prop_op_type, void **cache_slot, int type, uint32_t flags, bool init_undef OPLINE_DC EXECUTE_DATA_DC)
+static zend_always_inline void zend_fetch_property_address(zval *result, zval *container, uint32_t container_op_type, zval *prop_ptr, uint32_t prop_op_type, void **cache_slot, int type, uint32_t flags OPLINE_DC EXECUTE_DATA_DC)
 {
 	zval *ptr;
 	zend_object *zobj;
@@ -3202,9 +3203,6 @@
 			}
 		}
 	}
-	if (init_undef && UNEXPECTED(Z_TYPE_P(ptr) == IS_UNDEF)) {
-		ZVAL_NULL(ptr);
-	}
 
 end:
 	if (prop_op_type != IS_CONST) {
@@ -3218,7 +3216,7 @@
 	void **cache_addr = (prop_op_type == IS_CONST) ? CACHE_ADDR(opline->extended_value & ~ZEND_RETURNS_FUNCTION) : NULL;
 
 	zend_fetch_property_address(variable_ptr, container, container_op_type, prop_ptr, prop_op_type,
-		cache_addr, BP_VAR_W, 0, 0 OPLINE_CC EXECUTE_DATA_CC);
+		cache_addr, BP_VAR_W, 0 OPLINE_CC EXECUTE_DATA_CC);
 
 	if (EXPECTED(Z_TYPE_P(variable_ptr) == IS_INDIRECT)) {
 		variable_ptr = Z_INDIRECT_P(variable_ptr);
@@ -4450,6 +4448,95 @@
 	cleanup_live_vars(execute_data, op_num, catch_op_num);
 }
 
+ZEND_API ZEND_ATTRIBUTE_DEPRECATED HashTable *zend_unfinished_execution_gc(zend_execute_data *execute_data, zend_execute_data *call, zend_get_gc_buffer *gc_buffer)
+{
+	bool suspended_by_yield = false;
+
+	if (Z_TYPE_INFO(EX(This)) & ZEND_CALL_GENERATOR) {
+		ZEND_ASSERT(EX(return_value));
+
+		/* The generator object is stored in EX(return_value) */
+		zend_generator *generator = (zend_generator*) EX(return_value);
+		ZEND_ASSERT(execute_data == generator->execute_data);
+
+		suspended_by_yield = !(generator->flags & ZEND_GENERATOR_CURRENTLY_RUNNING);
+	}
+
+	return zend_unfinished_execution_gc_ex(execute_data, call, gc_buffer, suspended_by_yield);
+}
+
+ZEND_API HashTable *zend_unfinished_execution_gc_ex(zend_execute_data *execute_data, zend_execute_data *call, zend_get_gc_buffer *gc_buffer, bool suspended_by_yield)
+{
+	if (!EX(func) || !ZEND_USER_CODE(EX(func)->common.type)) {
+		return NULL;
+	}
+
+	zend_op_array *op_array = &EX(func)->op_array;
+
+	if (!(EX_CALL_INFO() & ZEND_CALL_HAS_SYMBOL_TABLE)) {
+		uint32_t i, num_cvs = EX(func)->op_array.last_var;
+		for (i = 0; i < num_cvs; i++) {
+			zend_get_gc_buffer_add_zval(gc_buffer, EX_VAR_NUM(i));
+		}
+	}
+
+	if (EX_CALL_INFO() & ZEND_CALL_FREE_EXTRA_ARGS) {
+		zval *zv = EX_VAR_NUM(op_array->last_var + op_array->T);
+		zval *end = zv + (EX_NUM_ARGS() - op_array->num_args);
+		while (zv != end) {
+			zend_get_gc_buffer_add_zval(gc_buffer, zv++);
+		}
+	}
+
+	if (EX_CALL_INFO() & ZEND_CALL_RELEASE_THIS) {
+		zend_get_gc_buffer_add_obj(gc_buffer, Z_OBJ(execute_data->This));
+	}
+	if (EX_CALL_INFO() & ZEND_CALL_CLOSURE) {
+		zend_get_gc_buffer_add_obj(gc_buffer, ZEND_CLOSURE_OBJECT(EX(func)));
+	}
+	if (EX_CALL_INFO() & ZEND_CALL_HAS_EXTRA_NAMED_PARAMS) {
+		zval extra_named_params;
+		ZVAL_ARR(&extra_named_params, EX(extra_named_params));
+		zend_get_gc_buffer_add_zval(gc_buffer, &extra_named_params);
+	}
+
+	if (call) {
+		uint32_t op_num = execute_data->opline - op_array->opcodes;
+		if (suspended_by_yield) {
+			/* When the execution was suspended by yield, EX(opline) points to
+			 * next opline to execute. Otherwise, it points to the opline that
+			 * suspended execution. */
+			op_num--;
+			ZEND_ASSERT(EX(func)->op_array.opcodesop_num.opcode == ZEND_YIELD
+				|| EX(func)->op_array.opcodesop_num.opcode == ZEND_YIELD_FROM);
+		}
+		zend_unfinished_calls_gc(execute_data, call, op_num, gc_buffer);
+	}
+
+	if (execute_data->opline != op_array->opcodes) {
+		uint32_t i, op_num = execute_data->opline - op_array->opcodes - 1;
+		for (i = 0; i < op_array->last_live_range; i++) {
+			const zend_live_range *range = &op_array->live_rangei;
+			if (range->start > op_num) {
+				break;
+			} else if (op_num < range->end) {
+				uint32_t kind = range->var & ZEND_LIVE_MASK;
+				uint32_t var_num = range->var & ~ZEND_LIVE_MASK;
+				zval *var = EX_VAR(var_num);
+				if (kind == ZEND_LIVE_TMPVAR || kind == ZEND_LIVE_LOOP) {
+					zend_get_gc_buffer_add_zval(gc_buffer, var);
+				}
+			}
+		}
+	}
+
+	if (EX_CALL_INFO() & ZEND_CALL_HAS_SYMBOL_TABLE) {
+		return execute_data->symbol_table;
+	} else {
+		return NULL;
+	}
+}
+
 #if ZEND_VM_SPEC
 static void zend_swap_operands(zend_op *op) /* {{{ */
 {

php-8.1.13.tar.xz/Zend/zend_execute.h -> php-8.1.21.tar.xz/Zend/zend_execute.h Changed

@@ -76,6 +76,8 @@
 ZEND_API ZEND_COLD void ZEND_FASTCALL zend_readonly_property_modification_error(zend_property_info *info);
 ZEND_API ZEND_COLD void ZEND_FASTCALL zend_readonly_property_indirect_modification_error(zend_property_info *info);
 
+ZEND_API ZEND_COLD void ZEND_FASTCALL zend_cannot_add_element(void);
+
 ZEND_API bool zend_verify_scalar_type_hint(uint32_t type_mask, zval *arg, bool strict, bool is_internal_arg);
 ZEND_API ZEND_COLD void zend_verify_arg_error(
 		const zend_function *zf, const zend_arg_info *arg_info, uint32_t arg_num, zval *value);
@@ -378,6 +380,8 @@
 ZEND_API void ZEND_FASTCALL zend_free_compiled_variables(zend_execute_data *execute_data);
 ZEND_API void zend_unfinished_calls_gc(zend_execute_data *execute_data, zend_execute_data *call, uint32_t op_num, zend_get_gc_buffer *buf);
 ZEND_API void zend_cleanup_unfinished_execution(zend_execute_data *execute_data, uint32_t op_num, uint32_t catch_op_num);
+ZEND_API ZEND_ATTRIBUTE_DEPRECATED HashTable *zend_unfinished_execution_gc(zend_execute_data *execute_data, zend_execute_data *call, zend_get_gc_buffer *gc_buffer);
+ZEND_API HashTable *zend_unfinished_execution_gc_ex(zend_execute_data *execute_data, zend_execute_data *call, zend_get_gc_buffer *gc_buffer, bool suspended_by_yield);
 
 zval * ZEND_FASTCALL zend_handle_named_arg(
 		zend_execute_data **call_ptr, zend_string *arg_name,

php-8.1.13.tar.xz/Zend/zend_execute_API.c -> php-8.1.21.tar.xz/Zend/zend_execute_API.c Changed

@@ -43,6 +43,9 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#ifdef ZEND_MAX_EXECUTION_TIMERS
+#include <sys/syscall.h>
+#endif
 
 ZEND_API void (*zend_execute_ex)(zend_execute_data *execute_data);
 ZEND_API void (*zend_execute_internal)(zend_execute_data *execute_data, zval *return_value);
@@ -192,6 +195,7 @@
 	EG(num_errors) = 0;
 	EG(errors) = NULL;
 
+	zend_max_execution_timer_init();
 	zend_fiber_init();
 	zend_weakrefs_init();
 
@@ -403,6 +407,7 @@
 	zend_shutdown_executor_values(fast_shutdown);
 
 	zend_weakrefs_shutdown();
+	zend_max_execution_timer_shutdown();
 	zend_fiber_shutdown();
 
 	zend_try {
@@ -627,6 +632,10 @@
 		ex = ex->prev_execute_data;
 	}
 	if (ex) {
+		if (!ex->opline) {
+			/* Missing SAVE_OPLINE()? Falling back to first line of function */
+			return ex->func->op_array.opcodes0.lineno;
+		}
 		if (EG(exception) && ex->opline->opcode == ZEND_HANDLE_EXCEPTION &&
 		 ex->opline->lineno == 0 && EG(opline_before_exception)) {
 			return EG(opline_before_exception)->lineno;
@@ -676,7 +685,19 @@
 		} else {
 			zval tmp;
 
-			if (UNEXPECTED(zend_ast_evaluate(&tmp, ast, scope) != SUCCESS)) {
+			// Increase the refcount during zend_ast_evaluate to avoid releasing the ast too early
+			// on nested calls to zval_update_constant_ex which can happen when retriggering ast
+			// evaluation during autoloading.
+			zend_ast_ref *ast_ref = Z_AST_P(p);
+			bool ast_is_refcounted = !(GC_FLAGS(ast_ref) & GC_IMMUTABLE);
+			if (ast_is_refcounted) {
+				GC_ADDREF(ast_ref);
+			}
+			zend_result result = zend_ast_evaluate(&tmp, ast, scope);
+			if (ast_is_refcounted && !GC_DELREF(ast_ref)) {
+				rc_dtor_func((zend_refcounted *)ast_ref);
+			}
+			if (UNEXPECTED(result != SUCCESS)) {
 				return FAILURE;
 			}
 			zval_ptr_dtor_nogc(p);
@@ -1310,8 +1331,27 @@
 /* }}} */
 
 #ifndef ZEND_WIN32
+# ifdef ZEND_MAX_EXECUTION_TIMERS
+static void zend_timeout_handler(int dummy, siginfo_t *si, void *uc) /* {{{ */
+{
+	if (si->si_value.sival_ptr != &EG(max_execution_timer_timer)) {
+#ifdef MAX_EXECUTION_TIMERS_DEBUG
+		fprintf(stderr, "Executing previous handler (if set) for unexpected signal SIGRTMIN received on thread %d\n", (pid_t) syscall(SYS_gettid));
+#endif
+
+		if (EG(oldact).sa_sigaction) {
+			EG(oldact).sa_sigaction(dummy, si, uc);
+
+			return;
+		}
+		if (EG(oldact).sa_handler) EG(oldact).sa_handler(dummy);
+
+		return;
+	}
+# else
 static void zend_timeout_handler(int dummy) /* {{{ */
 {
+# endif
 #ifndef ZTS
 	if (EG(timed_out)) {
 		/* Die on hard timeout */
@@ -1411,6 +1451,21 @@
 		zend_error_noreturn(E_ERROR, "Could not queue new timer");
 		return;
 	}
+#elif defined(ZEND_MAX_EXECUTION_TIMERS)
+	zend_max_execution_timer_settime(seconds);
+
+	if (reset_signals) {
+		sigset_t sigset;
+		struct sigaction act;
+
+		act.sa_sigaction = zend_timeout_handler;
+		sigemptyset(&act.sa_mask);
+		act.sa_flags = SA_ONSTACK | SA_SIGINFO;
+		sigaction(SIGRTMIN, &act, NULL);
+		sigemptyset(&sigset);
+		sigaddset(&sigset, SIGRTMIN);
+		sigprocmask(SIG_UNBLOCK, &sigset, NULL);
+	}
 #elif defined(HAVE_SETITIMER)
 	{
 		struct itimerval t_r;		/* timeout requested */
@@ -1476,6 +1531,8 @@
 		}
 		tq_timer = NULL;
 	}
+#elif ZEND_MAX_EXECUTION_TIMERS
+	zend_max_execution_timer_settime(0);
 #elif defined(HAVE_SETITIMER)
 	if (EG(timeout_seconds)) {
 		struct itimerval no_timeout;

php-8.1.13.tar.xz/Zend/zend_fibers.c -> php-8.1.21.tar.xz/Zend/zend_fibers.c Changed

@@ -24,6 +24,8 @@
 #include "zend_exceptions.h"
 #include "zend_builtin_functions.h"
 #include "zend_observer.h"
+#include "zend_compile.h"
+#include "zend_closures.h"
 
 #include "zend_fibers.h"
 #include "zend_fibers_arginfo.h"
@@ -174,8 +176,12 @@
 {
 	void *pointer;
 	const size_t page_size = zend_fiber_get_page_size();
+	const size_t minimum_stack_size = page_size + ZEND_FIBER_GUARD_PAGES * page_size;
 
-	ZEND_ASSERT(size >= page_size + ZEND_FIBER_GUARD_PAGES * page_size);
+	if (size < minimum_stack_size) {
+		zend_throw_exception_ex(NULL, 0, "Fiber stack size is too small, it needs to be at least %zu bytes", minimum_stack_size);
+		return NULL;
+	}
 
 	const size_t stack_size = (size + page_size - 1) / page_size * page_size;
 	const size_t alloc_size = stack_size + ZEND_FIBER_GUARD_PAGES * page_size;
@@ -537,6 +543,7 @@
 
 	/* Forward bailout into current fiber. */
 	if (UNEXPECTED(transfer.flags & ZEND_FIBER_TRANSFER_FLAG_BAILOUT)) {
+		EG(active_fiber) = NULL;
 		zend_bailout();
 	}
 
@@ -637,9 +644,32 @@
 	zend_get_gc_buffer_add_zval(buf, &fiber->fci.function_name);
 	zend_get_gc_buffer_add_zval(buf, &fiber->result);
 
+	if (fiber->context.status != ZEND_FIBER_STATUS_SUSPENDED || fiber->caller != NULL) {
+		zend_get_gc_buffer_use(buf, table, num);
+		return NULL;
+	}
+
+	HashTable *lastSymTable = NULL;
+	zend_execute_data *ex = fiber->execute_data;
+	for (; ex; ex = ex->prev_execute_data) {
+		HashTable *symTable = zend_unfinished_execution_gc_ex(ex, ex->call, buf, false);
+		if (symTable) {
+			if (lastSymTable) {
+				zval *val;
+				ZEND_HASH_FOREACH_VAL(lastSymTable, val) {
+					if (EXPECTED(Z_TYPE_P(val) == IS_INDIRECT)) {
+						val = Z_INDIRECT_P(val);
+					}
+					zend_get_gc_buffer_add_zval(buf, val);
+				} ZEND_HASH_FOREACH_END();
+			}
+			lastSymTable = symTable;
+		}
+	}
+
 	zend_get_gc_buffer_use(buf, table, num);
 
-	return NULL;
+	return lastSymTable;
 }
 
 ZEND_METHOD(Fiber, __construct)

php-8.1.13.tar.xz/Zend/zend_generators.c -> php-8.1.21.tar.xz/Zend/zend_generators.c Changed

@@ -223,6 +223,14 @@
 	uint32_t op_num, try_catch_offset;
 	int i;
 
+	/* Generator is running in a suspended fiber.
+	 * Will be dtor during fiber dtor */
+	if (zend_generator_get_current(generator)->flags & ZEND_GENERATOR_IN_FIBER) {
+		/* Prevent finally blocks from yielding */
+		generator->flags |= ZEND_GENERATOR_FORCED_CLOSE;
+		return;
+	}
+
 	/* leave yield from mode to properly allow finally execution */
 	if (UNEXPECTED(Z_TYPE(generator->values) != IS_UNDEF)) {
 		zval_ptr_dtor(&generator->values);
@@ -271,14 +279,25 @@
 				ZEND_CALL_VAR(ex, ex->func->op_array.opcodestry_catch->finally_end.op1.var);
 
 			zend_generator_cleanup_unfinished_execution(generator, ex, try_catch->finally_op);
-			Z_OBJ_P(fast_call) = EG(exception);
+			zend_object *old_exception = EG(exception);
+			const zend_op *old_opline_before_exception = EG(opline_before_exception);
 			EG(exception) = NULL;
+			Z_OBJ_P(fast_call) = NULL;
 			Z_OPLINE_NUM_P(fast_call) = (uint32_t)-1;
 
 			ex->opline = &ex->func->op_array.opcodestry_catch->finally_op;
 			generator->flags |= ZEND_GENERATOR_FORCED_CLOSE;
 			zend_generator_resume(generator);
 
+			if (old_exception) {
+				EG(opline_before_exception) = old_opline_before_exception;
+				if (EG(exception)) {
+					zend_exception_set_previous(EG(exception), old_exception);
+				} else {
+					EG(exception) = old_exception;
+				}
+			}
+
 			/* TODO: If we hit another yield inside try/finally,
 			 * should we also jump to the next finally block? */
 			break;
@@ -332,7 +351,7 @@
 {
 	zend_generator *generator = (zend_generator*)object;
 	zend_execute_data *execute_data = generator->execute_data;
-	zend_op_array *op_array;
+	zend_execute_data *call = NULL;
 
 	if (!execute_data) {
 		/* If the generator has been closed, it can only hold on to three values: The value, key
@@ -352,7 +371,6 @@
 		return NULL;
 	}
 
-	op_array = &EX(func)->op_array;
 
 	zend_get_gc_buffer *gc_buffer = zend_get_gc_buffer_create();
 	zend_get_gc_buffer_add_zval(gc_buffer, &generator->value);
@@ -360,59 +378,17 @@
 	zend_get_gc_buffer_add_zval(gc_buffer, &generator->retval);
 	zend_get_gc_buffer_add_zval(gc_buffer, &generator->values);
 
-	if (!(EX_CALL_INFO() & ZEND_CALL_HAS_SYMBOL_TABLE)) {
-		uint32_t i, num_cvs = EX(func)->op_array.last_var;
-		for (i = 0; i < num_cvs; i++) {
-			zend_get_gc_buffer_add_zval(gc_buffer, EX_VAR_NUM(i));
-		}
-	}
-
-	if (EX_CALL_INFO() & ZEND_CALL_FREE_EXTRA_ARGS) {
-		zval *zv = EX_VAR_NUM(op_array->last_var + op_array->T);
-		zval *end = zv + (EX_NUM_ARGS() - op_array->num_args);
-		while (zv != end) {
-			zend_get_gc_buffer_add_zval(gc_buffer, zv++);
-		}
+	if (UNEXPECTED(generator->frozen_call_stack)) {
+		/* The frozen stack is linked in reverse order */
+		call = zend_generator_revert_call_stack(generator->frozen_call_stack);
 	}
 
-	if (EX_CALL_INFO() & ZEND_CALL_RELEASE_THIS) {
-		zend_get_gc_buffer_add_obj(gc_buffer, Z_OBJ(execute_data->This));
-	}
-	if (EX_CALL_INFO() & ZEND_CALL_CLOSURE) {
-		zend_get_gc_buffer_add_obj(gc_buffer, ZEND_CLOSURE_OBJECT(EX(func)));
-	}
-	if (EX_CALL_INFO() & ZEND_CALL_HAS_EXTRA_NAMED_PARAMS) {
-		zval extra_named_params;
-		ZVAL_ARR(&extra_named_params, EX(extra_named_params));
-		zend_get_gc_buffer_add_zval(gc_buffer, &extra_named_params);
-	}
+	zend_unfinished_execution_gc_ex(execute_data, call, gc_buffer, true);
 
 	if (UNEXPECTED(generator->frozen_call_stack)) {
-		/* The frozen stack is linked in reverse order */
-		zend_execute_data *call = zend_generator_revert_call_stack(generator->frozen_call_stack);
-		/* -1 required because we want the last run opcode, not the next to-be-run one. */
-		uint32_t op_num = execute_data->opline - op_array->opcodes - 1;
-		zend_unfinished_calls_gc(execute_data, call, op_num, gc_buffer);
 		zend_generator_revert_call_stack(call);
 	}
 
-	if (execute_data->opline != op_array->opcodes) {
-		uint32_t i, op_num = execute_data->opline - op_array->opcodes - 1;
-		for (i = 0; i < op_array->last_live_range; i++) {
-			const zend_live_range *range = &op_array->live_rangei;
-			if (range->start > op_num) {
-				break;
-			} else if (op_num < range->end) {
-				uint32_t kind = range->var & ZEND_LIVE_MASK;
-				uint32_t var_num = range->var & ~ZEND_LIVE_MASK;
-				zval *var = EX_VAR(var_num);
-				if (kind == ZEND_LIVE_TMPVAR || kind == ZEND_LIVE_LOOP) {
-					zend_get_gc_buffer_add_zval(gc_buffer, var);
-				}
-			}
-		}
-	}
-
 	if (generator->node.parent) {
 		zend_get_gc_buffer_add_obj(gc_buffer, &generator->node.parent->std);
 	}
@@ -770,7 +746,8 @@
 	}
 
 	/* Resume execution */
-	generator->flags |= ZEND_GENERATOR_CURRENTLY_RUNNING;
+	generator->flags |= ZEND_GENERATOR_CURRENTLY_RUNNING
+						| (EG(active_fiber) ? ZEND_GENERATOR_IN_FIBER : 0);
 	if (!ZEND_OBSERVER_ENABLED) {
 		zend_execute_ex(generator->execute_data);
 	} else {
@@ -781,7 +758,7 @@
 			zend_observer_fcall_end(generator->execute_data, &generator->value);
 		}
 	}
-	generator->flags &= ~ZEND_GENERATOR_CURRENTLY_RUNNING;
+	generator->flags &= ~(ZEND_GENERATOR_CURRENTLY_RUNNING | ZEND_GENERATOR_IN_FIBER);
 
 	generator->frozen_call_stack = NULL;
 	if (EXPECTED(generator->execute_data) &&

php-8.1.13.tar.xz/Zend/zend_generators.h -> php-8.1.21.tar.xz/Zend/zend_generators.h Changed

php-8.1.13.tar.xz/Zend/zend_globals.h -> php-8.1.21.tar.xz/Zend/zend_globals.h Changed

php-8.1.13.tar.xz/Zend/zend_hash.c -> php-8.1.21.tar.xz/Zend/zend_hash.c Changed

@@ -166,6 +166,8 @@
 	void *data;
 	uint32_t nSize = ht->nTableSize;
 
+	ZEND_ASSERT(HT_SIZE_TO_MASK(nSize));
+
 	if (UNEXPECTED(GC_FLAGS(ht) & IS_ARRAY_PERSISTENT)) {
 		data = pemalloc(HT_SIZE_EX(nSize, HT_SIZE_TO_MASK(nSize)), 1);
 	} else if (EXPECTED(nSize == HT_MIN_SIZE)) {
@@ -307,8 +309,9 @@
 	if (ht->nTableSize >= HT_MAX_SIZE) {
 		zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%u * %zu + %zu)", ht->nTableSize * 2, sizeof(Bucket), sizeof(Bucket));
 	}
-	ht->nTableSize += ht->nTableSize;
-	HT_SET_DATA_ADDR(ht, perealloc2(HT_GET_DATA_ADDR(ht), HT_SIZE_EX(ht->nTableSize, HT_MIN_MASK), HT_USED_SIZE(ht), GC_FLAGS(ht) & IS_ARRAY_PERSISTENT));
+	uint32_t newTableSize = ht->nTableSize * 2;
+	HT_SET_DATA_ADDR(ht, perealloc2(HT_GET_DATA_ADDR(ht), HT_SIZE_EX(newTableSize, HT_MIN_MASK), HT_USED_SIZE(ht), GC_FLAGS(ht) & IS_ARRAY_PERSISTENT));
+	ht->nTableSize = newTableSize;
 }
 
 ZEND_API void ZEND_FASTCALL zend_hash_real_init(HashTable *ht, bool packed)
@@ -341,9 +344,12 @@
 	Bucket *old_buckets = ht->arData;
 	uint32_t nSize = ht->nTableSize;
 
+	ZEND_ASSERT(HT_SIZE_TO_MASK(nSize));
+
 	HT_ASSERT_RC1(ht);
-	HT_FLAGS(ht) &= ~HASH_FLAG_PACKED;
+	// Alloc before assign to avoid inconsistencies on OOM
 	new_data = pemalloc(HT_SIZE_EX(nSize, HT_SIZE_TO_MASK(nSize)), GC_FLAGS(ht) & IS_ARRAY_PERSISTENT);
+	HT_FLAGS(ht) &= ~HASH_FLAG_PACKED;
 	ht->nTableMask = HT_SIZE_TO_MASK(ht->nTableSize);
 	HT_SET_DATA_ADDR(ht, new_data);
 	memcpy(ht->arData, old_buckets, sizeof(Bucket) * ht->nNumUsed);
@@ -369,7 +375,11 @@
 ZEND_API void ZEND_FASTCALL zend_hash_extend(HashTable *ht, uint32_t nSize, bool packed)
 {
 	HT_ASSERT_RC1(ht);
+
 	if (nSize == 0) return;
+
+	ZEND_ASSERT(HT_SIZE_TO_MASK(nSize));
+
 	if (UNEXPECTED(HT_FLAGS(ht) & HASH_FLAG_UNINITIALIZED)) {
 		if (nSize > ht->nTableSize) {
 			ht->nTableSize = zend_hash_check_size(nSize);
@@ -379,8 +389,9 @@
 		if (packed) {
 			ZEND_ASSERT(HT_FLAGS(ht) & HASH_FLAG_PACKED);
 			if (nSize > ht->nTableSize) {
-				ht->nTableSize = zend_hash_check_size(nSize);
-				HT_SET_DATA_ADDR(ht, perealloc2(HT_GET_DATA_ADDR(ht), HT_SIZE_EX(ht->nTableSize, HT_MIN_MASK), HT_USED_SIZE(ht), GC_FLAGS(ht) & IS_ARRAY_PERSISTENT));
+				uint32_t newTableSize = zend_hash_check_size(nSize);
+				HT_SET_DATA_ADDR(ht, perealloc2(HT_GET_DATA_ADDR(ht), HT_SIZE_EX(newTableSize, HT_MIN_MASK), HT_USED_SIZE(ht), GC_FLAGS(ht) & IS_ARRAY_PERSISTENT));
+				ht->nTableSize = newTableSize;
 			}
 		} else {
 			ZEND_ASSERT(!(HT_FLAGS(ht) & HASH_FLAG_PACKED));
@@ -388,8 +399,8 @@
 				void *new_data, *old_data = HT_GET_DATA_ADDR(ht);
 				Bucket *old_buckets = ht->arData;
 				nSize = zend_hash_check_size(nSize);
-				ht->nTableSize = nSize;
 				new_data = pemalloc(HT_SIZE_EX(nSize, HT_SIZE_TO_MASK(nSize)), GC_FLAGS(ht) & IS_ARRAY_PERSISTENT);
+				ht->nTableSize = nSize;
 				ht->nTableMask = HT_SIZE_TO_MASK(ht->nTableSize);
 				HT_SET_DATA_ADDR(ht, new_data);
 				memcpy(ht->arData, old_buckets, sizeof(Bucket) * ht->nNumUsed);
@@ -1207,8 +1218,10 @@
 		uint32_t nSize = ht->nTableSize + ht->nTableSize;
 		Bucket *old_buckets = ht->arData;
 
-		ht->nTableSize = nSize;
+		ZEND_ASSERT(HT_SIZE_TO_MASK(nSize));
+
 		new_data = pemalloc(HT_SIZE_EX(nSize, HT_SIZE_TO_MASK(nSize)), GC_FLAGS(ht) & IS_ARRAY_PERSISTENT);
+		ht->nTableSize = nSize;
 		ht->nTableMask = HT_SIZE_TO_MASK(ht->nTableSize);
 		HT_SET_DATA_ADDR(ht, new_data);
 		memcpy(ht->arData, old_buckets, sizeof(Bucket) * ht->nNumUsed);
@@ -1269,7 +1282,7 @@
 						}
 					}
 				} else {
-					uint32_t iter_pos = zend_hash_iterators_lower_pos(ht, 0);
+					uint32_t iter_pos = zend_hash_iterators_lower_pos(ht, i + 1);
 
 					while (++i < ht->nNumUsed) {
 						p++;

php-8.1.13.tar.xz/Zend/zend_inheritance.c -> php-8.1.21.tar.xz/Zend/zend_inheritance.c Changed

php-8.1.13.tar.xz/Zend/zend_ini.c -> php-8.1.21.tar.xz/Zend/zend_ini.c Changed

php-8.1.13.tar.xz/Zend/zend_ini_scanner.c -> php-8.1.21.tar.xz/Zend/zend_ini_scanner.c Changed

php-8.1.13.tar.xz/Zend/zend_ini_scanner_defs.h -> php-8.1.21.tar.xz/Zend/zend_ini_scanner_defs.h Changed

php-8.1.13.tar.xz/Zend/zend_language_scanner.c -> php-8.1.21.tar.xz/Zend/zend_language_scanner.c Changed

php-8.1.13.tar.xz/Zend/zend_language_scanner_defs.h -> php-8.1.21.tar.xz/Zend/zend_language_scanner_defs.h Changed

php-8.1.21.tar.xz/Zend/zend_max_execution_timer.c Added

@@ -0,0 +1,103 @@
+/*
+ +----------------------------------------------------------------------+
+ | Copyright (c) The PHP Group |
+ +----------------------------------------------------------------------+
+ | This source file is subject to version 3.01 of the PHP license, |
+ | that is bundled with this package in the file LICENSE, and is |
+ | available through the world-wide-web at the following url: |
+ | https://www.php.net/license/3_01.txt |
+ | If you did not receive a copy of the PHP license and are unable to |
+ | obtain it through the world-wide-web, please send a note to |
+ | license@php.net so we can mail you a copy immediately. |
+ +----------------------------------------------------------------------+
+ | Author: Kévin Dunglas <kevin@dunglas.dev> |
+ +----------------------------------------------------------------------+
+ */
+
+#ifdef ZEND_MAX_EXECUTION_TIMERS
+
+#include <stdio.h>
+#include <signal.h>
+#include <time.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/syscall.h>
+#include <sys/types.h>
+
+#include "zend.h"
+#include "zend_globals.h"
+
+// Musl Libc defines this macro, glibc does not
+// According to "man 2 timer_create" this field should always be available, but it's not: https://sourceware.org/bugzilla/show_bug.cgi?id=27417
+# ifndef sigev_notify_thread_id
+# define sigev_notify_thread_id _sigev_un._tid
+# endif
+
+ZEND_API void zend_max_execution_timer_init(void) /* {{{ */
+{
+	struct sigevent sev;
+	sev.sigev_notify = SIGEV_THREAD_ID;
+	sev.sigev_value.sival_ptr = &EG(max_execution_timer_timer);
+	sev.sigev_signo = SIGRTMIN;
+	sev.sigev_notify_thread_id = (pid_t) syscall(SYS_gettid);
+
+	EG(pid) = getpid();
+	// Measure wall time instead of CPU time as originally planned now that it is possible https://github.com/php/php-src/pull/6504#issuecomment-1370303727
+	if (timer_create(CLOCK_BOOTTIME, &sev, &EG(max_execution_timer_timer)) != 0) {
+		zend_strerror_noreturn(E_ERROR, errno, "Could not create timer");
+	}
+
+# ifdef MAX_EXECUTION_TIMERS_DEBUG
+		fprintf(stderr, "Timer %#jx created on thread %d\n", (uintmax_t) EG(max_execution_timer_timer), sev.sigev_notify_thread_id);
+# endif
+
+	sigaction(sev.sigev_signo, NULL, &EG(oldact));
+}
+/* }}} */
+
+void zend_max_execution_timer_settime(zend_long seconds) /* {{{ }*/
+{
+	/* Timer not initialized or shutdown. */
+	if (!EG(pid)) {
+		return;
+	}
+
+	timer_t timer = EG(max_execution_timer_timer);
+
+	struct itimerspec its;
+	its.it_value.tv_sec = seconds;
+	its.it_value.tv_nsec = its.it_interval.tv_sec = its.it_interval.tv_nsec = 0;
+
+# ifdef MAX_EXECUTION_TIMERS_DEBUG
+	fprintf(stderr, "Setting timer %#jx on thread %d (%ld seconds)...\n", (uintmax_t) timer, (pid_t) syscall(SYS_gettid), seconds);
+# endif
+
+	if (timer_settime(timer, 0, &its, NULL) != 0) {
+		zend_strerror_noreturn(E_ERROR, errno, "Could not set timer");
+	}
+}
+/* }}} */
+
+void zend_max_execution_timer_shutdown(void) /* {{{ */
+{
+	/* Don't try to delete a timer created before a call to fork() */
+	if (EG(pid) != getpid()) {
+		return;
+	}
+
+	EG(pid) = 0;
+
+	timer_t timer = EG(max_execution_timer_timer);
+
+# ifdef MAX_EXECUTION_TIMERS_DEBUG
+	fprintf(stderr, "Deleting timer %#jx on thread %d...\n", (uintmax_t) timer, (pid_t) syscall(SYS_gettid));
+# endif
+
+	int err = timer_delete(timer);
+	if (err != 0) {
+		zend_strerror_noreturn(E_ERROR, errno, "Could not delete timer");
+	}
+}
+/* }}}} */
+
+#endif

php-8.1.21.tar.xz/Zend/zend_max_execution_timer.h Added

@@ -0,0 +1,36 @@
+/*
+ +----------------------------------------------------------------------+
+ | Copyright (c) The PHP Group |
+ +----------------------------------------------------------------------+
+ | This source file is subject to version 3.01 of the PHP license, |
+ | that is bundled with this package in the file LICENSE, and is |
+ | available through the world-wide-web at the following url: |
+ | https://www.php.net/license/3_01.txt |
+ | If you did not receive a copy of the PHP license and are unable to |
+ | obtain it through the world-wide-web, please send a note to |
+ | license@php.net so we can mail you a copy immediately. |
+ +----------------------------------------------------------------------+
+ | Author: Kévin Dunglas <kevin@dunglas.dev> |
+ +----------------------------------------------------------------------+
+ */
+
+#ifndef ZEND_MAX_EXECUTION_TIMER_H
+#define ZEND_MAX_EXECUTION_TIMER_H
+
+# ifdef ZEND_MAX_EXECUTION_TIMERS
+
+#include "zend_long.h"
+
+/* Must be called after calls to fork() */
+ZEND_API void zend_max_execution_timer_init(void);
+void zend_max_execution_timer_settime(zend_long seconds);
+void zend_max_execution_timer_shutdown(void);
+
+# else
+
+#define zend_max_execution_timer_init()
+#define zend_max_execution_timer_settime(seconds)
+#define zend_max_execution_timer_shutdown()
+
+# endif
+#endif

php-8.1.13.tar.xz/Zend/zend_object_handlers.c -> php-8.1.21.tar.xz/Zend/zend_object_handlers.c Changed

@@ -535,9 +535,8 @@
 	if (EXPECTED(Z_TYPE_P(zv) == IS_STRING)) {
 		zend_string *str = Z_STR_P(zv);
 		if (EXPECTED(str == member) ||
-		     /* "str" always has a pre-calculated hash value here */
-		    (EXPECTED(ZSTR_H(str) == zend_string_hash_val(member)) &&
-		     EXPECTED(zend_string_equal_content(str, member)))) {
+		    /* str and member don't necessarily have a pre-calculated hash value here */
+		    EXPECTED(zend_string_equal_content(str, member))) {
 			return &Z_PROPERTY_GUARD_P(zv);
 		} else if (EXPECTED(Z_PROPERTY_GUARD_P(zv) == 0)) {
 			zval_ptr_dtor_str(zv);
@@ -1038,6 +1037,8 @@
 				} else if (prop_info && UNEXPECTED(prop_info->flags & ZEND_ACC_READONLY)) {
 					/* Readonly property, delegate to read_property + write_property. */
 					retval = NULL;
+				} else if (!prop_info || !ZEND_TYPE_IS_SET(prop_info->type)) {
+					ZVAL_NULL(retval);
 				}
 			} else {
 				/* we do have getter - fail and let it try again with usual get/set */
@@ -1254,6 +1255,12 @@
 	ZEND_MAP_PTR_INIT(func->run_time_cache, (void***)&dummy);
 	func->scope = fbc->common.scope;
 	/* reserve space for arguments, local and temporary variables */
+	/* EG(trampoline) is reused from other places, like FFI (e.g. zend_ffi_cdata_get_closure()) where
+	 * it is used as an internal function. It may set fields that don't belong to common, thus
+	 * modifying zend_op_array specific data, most significantly last_var. We need to reset this
+	 * value so that it doesn't contain garbage when the engine allocates space for the next stack
+	 * frame. This didn't cause any issues until now due to "lucky" structure layout. */
+	func->last_var = 0;
 	func->T = (fbc->type == ZEND_USER_FUNCTION)? MAX(fbc->op_array.last_var + fbc->op_array.T, 2) : 2;
 	func->filename = (fbc->type == ZEND_USER_FUNCTION)? fbc->op_array.filename : ZSTR_EMPTY_ALLOC();
 	func->line_start = (fbc->type == ZEND_USER_FUNCTION)? fbc->op_array.line_start : 0;

php-8.1.13.tar.xz/Zend/zend_operators.c -> php-8.1.21.tar.xz/Zend/zend_operators.c Changed

php-8.1.13.tar.xz/Zend/zend_portability.h -> php-8.1.21.tar.xz/Zend/zend_portability.h Changed

php-8.1.13.tar.xz/Zend/zend_signal.c -> php-8.1.21.tar.xz/Zend/zend_signal.c Changed

php-8.1.13.tar.xz/Zend/zend_string.c -> php-8.1.21.tar.xz/Zend/zend_string.c Changed

@@ -372,11 +372,28 @@
 # define I_REPLACE_SONAME_FNNAME_ZU(soname, fnname) _vgr00000ZU_ ## soname ## _ ## fnname
 #endif
 
-ZEND_API bool ZEND_FASTCALL I_REPLACE_SONAME_FNNAME_ZU(NONE,zend_string_equal_val)(zend_string *s1, zend_string *s2)
+/* See GH-9068 */
+#if defined(__GNUC__) && (__GNUC__ >= 11 || defined(__clang__)) && __has_attribute(no_caller_saved_registers)
+# define NO_CALLER_SAVED_REGISTERS __attribute__((no_caller_saved_registers))
+# ifndef __clang__
+#  pragma GCC push_options
+#  pragma GCC target ("general-regs-only")
+#  define POP_OPTIONS
+# endif
+#else
+# define NO_CALLER_SAVED_REGISTERS
+#endif
+
+ZEND_API bool ZEND_FASTCALL NO_CALLER_SAVED_REGISTERS I_REPLACE_SONAME_FNNAME_ZU(NONE,zend_string_equal_val)(zend_string *s1, zend_string *s2)
 {
 	return !memcmp(ZSTR_VAL(s1), ZSTR_VAL(s2), ZSTR_LEN(s1));
 }
 
+#ifdef POP_OPTIONS
+# pragma GCC pop_options
+# undef POP_OPTIONS
+#endif
+
 #if defined(__GNUC__) && defined(__i386__)
 ZEND_API bool ZEND_FASTCALL zend_string_equal_val(zend_string *s1, zend_string *s2)
 {

php-8.1.13.tar.xz/Zend/zend_string.h -> php-8.1.21.tar.xz/Zend/zend_string.h Changed

php-8.1.13.tar.xz/Zend/zend_types.h -> php-8.1.21.tar.xz/Zend/zend_types.h Changed

@@ -400,8 +400,15 @@
 #define HT_MIN_MASK ((uint32_t) -2)
 #define HT_MIN_SIZE 8
 
+/* HT_MAX_SIZE is chosen to satisfy the following constraints:
+ * - HT_SIZE_TO_MASK(HT_MAX_SIZE) != 0
+ * - HT_SIZE_EX(HT_MAX_SIZE, HT_SIZE_TO_MASK(HT_MAX_SIZE)) does not overflow or
+ * wrapparound, and is <= the addressable space size
+ * - HT_MAX_SIZE must be a power of two:
+ * (nTableSize<HT_MAX_SIZE ? nTableSize+nTableSize : nTableSize) <= HT_MAX_SIZE
+ */
 #if SIZEOF_SIZE_T == 4
-# define HT_MAX_SIZE 0x04000000 /* small enough to avoid overflow checks */
+# define HT_MAX_SIZE 0x02000000
 # define HT_HASH_TO_BUCKET_EX(data, idx) \
 	((Bucket*)((char*)(data) + (idx)))
 # define HT_IDX_TO_HASH(idx) \
@@ -409,7 +416,7 @@
 # define HT_HASH_TO_IDX(idx) \
 	((idx) / sizeof(Bucket))
 #elif SIZEOF_SIZE_T == 8
-# define HT_MAX_SIZE 0x80000000
+# define HT_MAX_SIZE 0x40000000
 # define HT_HASH_TO_BUCKET_EX(data, idx) \
 	((data) + (idx))
 # define HT_IDX_TO_HASH(idx) \
@@ -428,7 +435,7 @@
 #define HT_SIZE_TO_MASK(nTableSize) \
 	((uint32_t)(-((nTableSize) + (nTableSize))))
 #define HT_HASH_SIZE(nTableMask) \
-	(((size_t)(uint32_t)-(int32_t)(nTableMask)) * sizeof(uint32_t))
+	(((size_t)-(uint32_t)(nTableMask)) * sizeof(uint32_t))
 #define HT_DATA_SIZE(nTableSize) \
 	((size_t)(nTableSize) * sizeof(Bucket))
 #define HT_SIZE_EX(nTableSize, nTableMask) \

php-8.1.13.tar.xz/Zend/zend_vm_def.h -> php-8.1.21.tar.xz/Zend/zend_vm_def.h Changed

@@ -2157,7 +2157,7 @@
 	zend_fetch_property_address(
 		result, container, OP1_TYPE, property, OP2_TYPE,
 		((OP2_TYPE == IS_CONST) ? CACHE_ADDR(opline->extended_value & ~ZEND_FETCH_OBJ_FLAGS) : NULL),
-		BP_VAR_W, opline->extended_value & ZEND_FETCH_OBJ_FLAGS, 1 OPLINE_CC EXECUTE_DATA_CC);
+		BP_VAR_W, opline->extended_value & ZEND_FETCH_OBJ_FLAGS OPLINE_CC EXECUTE_DATA_CC);
 	FREE_OP2();
 	if (OP1_TYPE == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -2174,7 +2174,7 @@
 	container = GET_OP1_OBJ_ZVAL_PTR_PTR_UNDEF(BP_VAR_RW);
 	property = GET_OP2_ZVAL_PTR(BP_VAR_R);
 	result = EX_VAR(opline->result.var);
-	zend_fetch_property_address(result, container, OP1_TYPE, property, OP2_TYPE, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_RW, 0, 1 OPLINE_CC EXECUTE_DATA_CC);
+	zend_fetch_property_address(result, container, OP1_TYPE, property, OP2_TYPE, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_RW, 0 OPLINE_CC EXECUTE_DATA_CC);
 	FREE_OP2();
 	if (OP1_TYPE == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -2321,7 +2321,7 @@
 	container = GET_OP1_OBJ_ZVAL_PTR_PTR_UNDEF(BP_VAR_UNSET);
 	property = GET_OP2_ZVAL_PTR(BP_VAR_R);
 	result = EX_VAR(opline->result.var);
-	zend_fetch_property_address(result, container, OP1_TYPE, property, OP2_TYPE, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_UNSET, 0, 1 OPLINE_CC EXECUTE_DATA_CC);
+	zend_fetch_property_address(result, container, OP1_TYPE, property, OP2_TYPE, ((OP2_TYPE == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_UNSET, 0 OPLINE_CC EXECUTE_DATA_CC);
 	FREE_OP2();
 	if (OP1_TYPE == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -4549,6 +4549,8 @@
 
 	ZEND_OBSERVER_FCALL_END(generator->execute_data, &generator->retval);
 
+	EG(current_execute_data) = EX(prev_execute_data);
+
 	/* Close the generator to free up resources */
 	zend_generator_close(generator, 1);
 
@@ -7837,6 +7839,7 @@
 	cleanup_live_vars(execute_data, op_num, 0);
 	if (UNEXPECTED((EX_CALL_INFO() & ZEND_CALL_GENERATOR) != 0)) {
 		zend_generator *generator = zend_get_running_generator(EXECUTE_DATA_C);
+		EG(current_execute_data) = EX(prev_execute_data);
 		zend_generator_close(generator, 1);
 		ZEND_VM_RETURN();
 	} else {
@@ -7930,6 +7933,7 @@
 		case ZEND_USER_OPCODE_RETURN:
 			if (UNEXPECTED((EX_CALL_INFO() & ZEND_CALL_GENERATOR) != 0)) {
 				zend_generator *generator = zend_get_running_generator(EXECUTE_DATA_C);
+				EG(current_execute_data) = EX(prev_execute_data);
 				zend_generator_close(generator, 1);
 				ZEND_VM_RETURN();
 			} else {
@@ -8119,7 +8123,7 @@
 	/* Set the new yielded key */
 	if (OP2_TYPE != IS_UNUSED) {
 		zval *key = GET_OP2_ZVAL_PTR(BP_VAR_R);
-		if ((OP2_TYPE & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key)) == IS_REFERENCE) {
+		if ((OP2_TYPE & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key) == IS_REFERENCE)) {
 			key = Z_REFVAL_P(key);
 		}
 		ZVAL_COPY(&generator->key, key);
@@ -8451,7 +8455,7 @@
 				zval_ptr_dtor(&tmp);
 			}
 			if (!EG(exception)) {
-				zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_zval_type_name(value));
+				zend_type_error("strlen(): Argument #1 ($string) must be of type string, %s given", zend_zval_type_name(value));
 			}
 			ZVAL_UNDEF(EX_VAR(opline->result.var));
 		} while (0);
@@ -8663,7 +8667,9 @@
 			SAVE_OPLINE_EX();
 			ZEND_OBSERVER_FCALL_BEGIN(execute_data);
 			execute_data = EX(prev_execute_data);
-			LOAD_OPLINE();
+			if (execute_data) {
+				LOAD_OPLINE();
+			}
 			ZEND_ADD_CALL_FLAG(call, ZEND_CALL_TOP);
 			zend_execute_ex(call);
 		}
@@ -8713,7 +8719,7 @@
 
 	execute_data = EG(current_execute_data);
 
-	if (!EX(func) || !ZEND_USER_CODE(EX(func)->type) || (call_info & ZEND_CALL_TOP)) {
+	if (!execute_data || !EX(func) || !ZEND_USER_CODE(EX(func)->type) || (call_info & ZEND_CALL_TOP)) {
 		ZEND_VM_RETURN();
 	}

php-8.1.13.tar.xz/Zend/zend_vm_execute.h -> php-8.1.21.tar.xz/Zend/zend_vm_execute.h Changed

@@ -3061,6 +3061,7 @@
 	cleanup_live_vars(execute_data, op_num, 0);
 	if (UNEXPECTED((EX_CALL_INFO() & ZEND_CALL_GENERATOR) != 0)) {
 		zend_generator *generator = zend_get_running_generator(EXECUTE_DATA_C);
+		EG(current_execute_data) = EX(prev_execute_data);
 		zend_generator_close(generator, 1);
 		ZEND_VM_RETURN();
 	} else {
@@ -3154,6 +3155,7 @@
 		case ZEND_USER_OPCODE_RETURN:
 			if (UNEXPECTED((EX_CALL_INFO() & ZEND_CALL_GENERATOR) != 0)) {
 				zend_generator *generator = zend_get_running_generator(EXECUTE_DATA_C);
+				EG(current_execute_data) = EX(prev_execute_data);
 				zend_generator_close(generator, 1);
 				ZEND_VM_RETURN();
 			} else {
@@ -3319,7 +3321,9 @@
 			SAVE_OPLINE_EX();
 
 			execute_data = EX(prev_execute_data);
-			LOAD_OPLINE();
+			if (execute_data) {
+				LOAD_OPLINE();
+			}
 			ZEND_ADD_CALL_FLAG(call, ZEND_CALL_TOP);
 			zend_execute_ex(call);
 		}
@@ -3369,7 +3373,7 @@
 
 	execute_data = EG(current_execute_data);
 
-	if (!EX(func) || !ZEND_USER_CODE(EX(func)->type) || (call_info & ZEND_CALL_TOP)) {
+	if (!execute_data || !EX(func) || !ZEND_USER_CODE(EX(func)->type) || (call_info & ZEND_CALL_TOP)) {
 		ZEND_VM_RETURN();
 	}
 
@@ -3456,7 +3460,9 @@
 			SAVE_OPLINE_EX();
 			zend_observer_fcall_begin(execute_data);
 			execute_data = EX(prev_execute_data);
-			LOAD_OPLINE();
+			if (execute_data) {
+				LOAD_OPLINE();
+			}
 			ZEND_ADD_CALL_FLAG(call, ZEND_CALL_TOP);
 			zend_execute_ex(call);
 		}
@@ -3506,7 +3512,7 @@
 
 	execute_data = EG(current_execute_data);
 
-	if (!EX(func) || !ZEND_USER_CODE(EX(func)->type) || (call_info & ZEND_CALL_TOP)) {
+	if (!execute_data || !EX(func) || !ZEND_USER_CODE(EX(func)->type) || (call_info & ZEND_CALL_TOP)) {
 		ZEND_VM_RETURN();
 	}
 
@@ -4513,6 +4519,8 @@
 		}
 	}
 
+	EG(current_execute_data) = EX(prev_execute_data);
+
 	/* Close the generator to free up resources */
 	zend_generator_close(generator, 1);
 
@@ -4558,6 +4566,8 @@
 
 	zend_observer_fcall_end(generator->execute_data, &generator->retval);
 
+	EG(current_execute_data) = EX(prev_execute_data);
+
 	/* Close the generator to free up resources */
 	zend_generator_close(generator, 1);
 
@@ -5519,7 +5529,7 @@
 				zval_ptr_dtor(&tmp);
 			}
 			if (!EG(exception)) {
-				zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_zval_type_name(value));
+				zend_type_error("strlen(): Argument #1 ($string) must be of type string, %s given", zend_zval_type_name(value));
 			}
 			ZVAL_UNDEF(EX_VAR(opline->result.var));
 		} while (0);
@@ -7522,7 +7532,7 @@
 	/* Set the new yielded key */
 	if (IS_CONST != IS_UNUSED) {
 		zval *key = RT_CONSTANT(opline, opline->op2);
-		if ((IS_CONST & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key)) == IS_REFERENCE) {
+		if ((IS_CONST & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key) == IS_REFERENCE)) {
 			key = Z_REFVAL_P(key);
 		}
 		ZVAL_COPY(&generator->key, key);
@@ -9661,7 +9671,7 @@
 	/* Set the new yielded key */
 	if ((IS_TMP_VAR|IS_VAR) != IS_UNUSED) {
 		zval *key = _get_zval_ptr_var(opline->op2.var EXECUTE_DATA_CC);
-		if (((IS_TMP_VAR|IS_VAR) & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key)) == IS_REFERENCE) {
+		if (((IS_TMP_VAR|IS_VAR) & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key) == IS_REFERENCE)) {
 			key = Z_REFVAL_P(key);
 		}
 		ZVAL_COPY(&generator->key, key);
@@ -10504,7 +10514,7 @@
 	/* Set the new yielded key */
 	if (IS_UNUSED != IS_UNUSED) {
 		zval *key = NULL;
-		if ((IS_UNUSED & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key)) == IS_REFERENCE) {
+		if ((IS_UNUSED & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key) == IS_REFERENCE)) {
 			key = Z_REFVAL_P(key);
 		}
 		ZVAL_COPY(&generator->key, key);
@@ -12016,7 +12026,7 @@
 	/* Set the new yielded key */
 	if (IS_CV != IS_UNUSED) {
 		zval *key = _get_zval_ptr_cv_BP_VAR_R(opline->op2.var EXECUTE_DATA_CC);
-		if ((IS_CV & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key)) == IS_REFERENCE) {
+		if ((IS_CV & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key) == IS_REFERENCE)) {
 			key = Z_REFVAL_P(key);
 		}
 		ZVAL_COPY(&generator->key, key);
@@ -14675,7 +14685,7 @@
 				zval_ptr_dtor(&tmp);
 			}
 			if (!EG(exception)) {
-				zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_zval_type_name(value));
+				zend_type_error("strlen(): Argument #1 ($string) must be of type string, %s given", zend_zval_type_name(value));
 			}
 			ZVAL_UNDEF(EX_VAR(opline->result.var));
 		} while (0);
@@ -18950,6 +18960,8 @@
 		}
 	}
 
+	EG(current_execute_data) = EX(prev_execute_data);
+
 	/* Close the generator to free up resources */
 	zend_generator_close(generator, 1);
 
@@ -19830,7 +19842,7 @@
 	/* Set the new yielded key */
 	if (IS_CONST != IS_UNUSED) {
 		zval *key = RT_CONSTANT(opline, opline->op2);
-		if ((IS_CONST & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key)) == IS_REFERENCE) {
+		if ((IS_CONST & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key) == IS_REFERENCE)) {
 			key = Z_REFVAL_P(key);
 		}
 		ZVAL_COPY(&generator->key, key);
@@ -20269,7 +20281,7 @@
 	/* Set the new yielded key */
 	if ((IS_TMP_VAR|IS_VAR) != IS_UNUSED) {
 		zval *key = _get_zval_ptr_var(opline->op2.var EXECUTE_DATA_CC);
-		if (((IS_TMP_VAR|IS_VAR) & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key)) == IS_REFERENCE) {
+		if (((IS_TMP_VAR|IS_VAR) & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key) == IS_REFERENCE)) {
 			key = Z_REFVAL_P(key);
 		}
 		ZVAL_COPY(&generator->key, key);
@@ -20729,7 +20741,7 @@
 	/* Set the new yielded key */
 	if (IS_UNUSED != IS_UNUSED) {
 		zval *key = NULL;
-		if ((IS_UNUSED & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key)) == IS_REFERENCE) {
+		if ((IS_UNUSED & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key) == IS_REFERENCE)) {
 			key = Z_REFVAL_P(key);
 		}
 		ZVAL_COPY(&generator->key, key);
@@ -21128,7 +21140,7 @@
 	/* Set the new yielded key */
 	if (IS_CV != IS_UNUSED) {
 		zval *key = _get_zval_ptr_cv_BP_VAR_R(opline->op2.var EXECUTE_DATA_CC);
-		if ((IS_CV & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key)) == IS_REFERENCE) {
+		if ((IS_CV & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key) == IS_REFERENCE)) {
 			key = Z_REFVAL_P(key);
 		}
 		ZVAL_COPY(&generator->key, key);
@@ -21608,6 +21620,8 @@
 		}
 	}
 
+	EG(current_execute_data) = EX(prev_execute_data);
+
 	/* Close the generator to free up resources */
 	zend_generator_close(generator, 1);
 
@@ -22804,7 +22818,7 @@
 	zend_fetch_property_address(
 		result, container, IS_VAR, property, IS_CONST,
 		((IS_CONST == IS_CONST) ? CACHE_ADDR(opline->extended_value & ~ZEND_FETCH_OBJ_FLAGS) : NULL),
-		BP_VAR_W, opline->extended_value & ZEND_FETCH_OBJ_FLAGS, 1 OPLINE_CC EXECUTE_DATA_CC);
+		BP_VAR_W, opline->extended_value & ZEND_FETCH_OBJ_FLAGS OPLINE_CC EXECUTE_DATA_CC);
 
 	if (IS_VAR == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -22821,7 +22835,7 @@
 	container = _get_zval_ptr_ptr_var(opline->op1.var EXECUTE_DATA_CC);
 	property = RT_CONSTANT(opline, opline->op2);
 	result = EX_VAR(opline->result.var);
-	zend_fetch_property_address(result, container, IS_VAR, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_RW, 0, 1 OPLINE_CC EXECUTE_DATA_CC);
+	zend_fetch_property_address(result, container, IS_VAR, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_RW, 0 OPLINE_CC EXECUTE_DATA_CC);
 
 	if (IS_VAR == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -22855,7 +22869,7 @@
 	container = _get_zval_ptr_ptr_var(opline->op1.var EXECUTE_DATA_CC);
 	property = RT_CONSTANT(opline, opline->op2);
 	result = EX_VAR(opline->result.var);
-	zend_fetch_property_address(result, container, IS_VAR, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_UNSET, 0, 1 OPLINE_CC EXECUTE_DATA_CC);
+	zend_fetch_property_address(result, container, IS_VAR, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_UNSET, 0 OPLINE_CC EXECUTE_DATA_CC);
 
 	if (IS_VAR == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -24953,7 +24967,7 @@
 	/* Set the new yielded key */
 	if (IS_CONST != IS_UNUSED) {
 		zval *key = RT_CONSTANT(opline, opline->op2);
-		if ((IS_CONST & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key)) == IS_REFERENCE) {
+		if ((IS_CONST & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key) == IS_REFERENCE)) {
 			key = Z_REFVAL_P(key);
 		}
 		ZVAL_COPY(&generator->key, key);
@@ -25502,7 +25516,7 @@
 	zend_fetch_property_address(
 		result, container, IS_VAR, property, (IS_TMP_VAR|IS_VAR),
 		(((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(opline->extended_value & ~ZEND_FETCH_OBJ_FLAGS) : NULL),
-		BP_VAR_W, opline->extended_value & ZEND_FETCH_OBJ_FLAGS, 1 OPLINE_CC EXECUTE_DATA_CC);
+		BP_VAR_W, opline->extended_value & ZEND_FETCH_OBJ_FLAGS OPLINE_CC EXECUTE_DATA_CC);
 	zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 	if (IS_VAR == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -25519,7 +25533,7 @@
 	container = _get_zval_ptr_ptr_var(opline->op1.var EXECUTE_DATA_CC);
 	property = _get_zval_ptr_var(opline->op2.var EXECUTE_DATA_CC);
 	result = EX_VAR(opline->result.var);
-	zend_fetch_property_address(result, container, IS_VAR, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_RW, 0, 1 OPLINE_CC EXECUTE_DATA_CC);
+	zend_fetch_property_address(result, container, IS_VAR, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_RW, 0 OPLINE_CC EXECUTE_DATA_CC);
 	zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 	if (IS_VAR == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -25553,7 +25567,7 @@
 	container = _get_zval_ptr_ptr_var(opline->op1.var EXECUTE_DATA_CC);
 	property = _get_zval_ptr_var(opline->op2.var EXECUTE_DATA_CC);
 	result = EX_VAR(opline->result.var);
-	zend_fetch_property_address(result, container, IS_VAR, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_UNSET, 0, 1 OPLINE_CC EXECUTE_DATA_CC);
+	zend_fetch_property_address(result, container, IS_VAR, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_UNSET, 0 OPLINE_CC EXECUTE_DATA_CC);
 	zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 	if (IS_VAR == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -27251,7 +27265,7 @@
 	/* Set the new yielded key */
 	if ((IS_TMP_VAR|IS_VAR) != IS_UNUSED) {
 		zval *key = _get_zval_ptr_var(opline->op2.var EXECUTE_DATA_CC);
-		if (((IS_TMP_VAR|IS_VAR) & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key)) == IS_REFERENCE) {
+		if (((IS_TMP_VAR|IS_VAR) & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key) == IS_REFERENCE)) {
 			key = Z_REFVAL_P(key);
 		}
 		ZVAL_COPY(&generator->key, key);
@@ -29150,7 +29164,7 @@
 	/* Set the new yielded key */
 	if (IS_UNUSED != IS_UNUSED) {
 		zval *key = NULL;
-		if ((IS_UNUSED & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key)) == IS_REFERENCE) {
+		if ((IS_UNUSED & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key) == IS_REFERENCE)) {
 			key = Z_REFVAL_P(key);
 		}
 		ZVAL_COPY(&generator->key, key);
@@ -29710,7 +29724,7 @@
 	zend_fetch_property_address(
 		result, container, IS_VAR, property, IS_CV,
 		((IS_CV == IS_CONST) ? CACHE_ADDR(opline->extended_value & ~ZEND_FETCH_OBJ_FLAGS) : NULL),
-		BP_VAR_W, opline->extended_value & ZEND_FETCH_OBJ_FLAGS, 1 OPLINE_CC EXECUTE_DATA_CC);
+		BP_VAR_W, opline->extended_value & ZEND_FETCH_OBJ_FLAGS OPLINE_CC EXECUTE_DATA_CC);
 
 	if (IS_VAR == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -29727,7 +29741,7 @@
 	container = _get_zval_ptr_ptr_var(opline->op1.var EXECUTE_DATA_CC);
 	property = _get_zval_ptr_cv_BP_VAR_R(opline->op2.var EXECUTE_DATA_CC);
 	result = EX_VAR(opline->result.var);
-	zend_fetch_property_address(result, container, IS_VAR, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_RW, 0, 1 OPLINE_CC EXECUTE_DATA_CC);
+	zend_fetch_property_address(result, container, IS_VAR, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_RW, 0 OPLINE_CC EXECUTE_DATA_CC);
 
 	if (IS_VAR == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -29761,7 +29775,7 @@
 	container = _get_zval_ptr_ptr_var(opline->op1.var EXECUTE_DATA_CC);
 	property = _get_zval_ptr_cv_BP_VAR_R(opline->op2.var EXECUTE_DATA_CC);
 	result = EX_VAR(opline->result.var);
-	zend_fetch_property_address(result, container, IS_VAR, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_UNSET, 0, 1 OPLINE_CC EXECUTE_DATA_CC);
+	zend_fetch_property_address(result, container, IS_VAR, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_UNSET, 0 OPLINE_CC EXECUTE_DATA_CC);
 
 	if (IS_VAR == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -31529,7 +31543,7 @@
 	/* Set the new yielded key */
 	if (IS_CV != IS_UNUSED) {
 		zval *key = _get_zval_ptr_cv_BP_VAR_R(opline->op2.var EXECUTE_DATA_CC);
-		if ((IS_CV & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key)) == IS_REFERENCE) {
+		if ((IS_CV & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key) == IS_REFERENCE)) {
 			key = Z_REFVAL_P(key);
 		}
 		ZVAL_COPY(&generator->key, key);
@@ -32147,7 +32161,7 @@
 	zend_fetch_property_address(
 		result, container, IS_UNUSED, property, IS_CONST,
 		((IS_CONST == IS_CONST) ? CACHE_ADDR(opline->extended_value & ~ZEND_FETCH_OBJ_FLAGS) : NULL),
-		BP_VAR_W, opline->extended_value & ZEND_FETCH_OBJ_FLAGS, 1 OPLINE_CC EXECUTE_DATA_CC);
+		BP_VAR_W, opline->extended_value & ZEND_FETCH_OBJ_FLAGS OPLINE_CC EXECUTE_DATA_CC);
 
 	if (IS_UNUSED == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -32164,7 +32178,7 @@
 	container = &EX(This);
 	property = RT_CONSTANT(opline, opline->op2);
 	result = EX_VAR(opline->result.var);
-	zend_fetch_property_address(result, container, IS_UNUSED, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_RW, 0, 1 OPLINE_CC EXECUTE_DATA_CC);
+	zend_fetch_property_address(result, container, IS_UNUSED, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_RW, 0 OPLINE_CC EXECUTE_DATA_CC);
 
 	if (IS_UNUSED == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -32311,7 +32325,7 @@
 	container = &EX(This);
 	property = RT_CONSTANT(opline, opline->op2);
 	result = EX_VAR(opline->result.var);
-	zend_fetch_property_address(result, container, IS_UNUSED, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_UNSET, 0, 1 OPLINE_CC EXECUTE_DATA_CC);
+	zend_fetch_property_address(result, container, IS_UNUSED, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_UNSET, 0 OPLINE_CC EXECUTE_DATA_CC);
 
 	if (IS_UNUSED == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -33600,7 +33614,7 @@
 	/* Set the new yielded key */
 	if (IS_CONST != IS_UNUSED) {
 		zval *key = RT_CONSTANT(opline, opline->op2);
-		if ((IS_CONST & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key)) == IS_REFERENCE) {
+		if ((IS_CONST & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key) == IS_REFERENCE)) {
 			key = Z_REFVAL_P(key);
 		}
 		ZVAL_COPY(&generator->key, key);
@@ -34000,7 +34014,7 @@
 	zend_fetch_property_address(
 		result, container, IS_UNUSED, property, (IS_TMP_VAR|IS_VAR),
 		(((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(opline->extended_value & ~ZEND_FETCH_OBJ_FLAGS) : NULL),
-		BP_VAR_W, opline->extended_value & ZEND_FETCH_OBJ_FLAGS, 1 OPLINE_CC EXECUTE_DATA_CC);
+		BP_VAR_W, opline->extended_value & ZEND_FETCH_OBJ_FLAGS OPLINE_CC EXECUTE_DATA_CC);
 	zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 	if (IS_UNUSED == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -34017,7 +34031,7 @@
 	container = &EX(This);
 	property = _get_zval_ptr_var(opline->op2.var EXECUTE_DATA_CC);
 	result = EX_VAR(opline->result.var);
-	zend_fetch_property_address(result, container, IS_UNUSED, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_RW, 0, 1 OPLINE_CC EXECUTE_DATA_CC);
+	zend_fetch_property_address(result, container, IS_UNUSED, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_RW, 0 OPLINE_CC EXECUTE_DATA_CC);
 	zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 	if (IS_UNUSED == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -34164,7 +34178,7 @@
 	container = &EX(This);
 	property = _get_zval_ptr_var(opline->op2.var EXECUTE_DATA_CC);
 	result = EX_VAR(opline->result.var);
-	zend_fetch_property_address(result, container, IS_UNUSED, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_UNSET, 0, 1 OPLINE_CC EXECUTE_DATA_CC);
+	zend_fetch_property_address(result, container, IS_UNUSED, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_UNSET, 0 OPLINE_CC EXECUTE_DATA_CC);
 	zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 	if (IS_UNUSED == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -35337,7 +35351,7 @@
 	/* Set the new yielded key */
 	if ((IS_TMP_VAR|IS_VAR) != IS_UNUSED) {
 		zval *key = _get_zval_ptr_var(opline->op2.var EXECUTE_DATA_CC);
-		if (((IS_TMP_VAR|IS_VAR) & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key)) == IS_REFERENCE) {
+		if (((IS_TMP_VAR|IS_VAR) & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key) == IS_REFERENCE)) {
 			key = Z_REFVAL_P(key);
 		}
 		ZVAL_COPY(&generator->key, key);
@@ -35879,7 +35893,7 @@
 	/* Set the new yielded key */
 	if (IS_UNUSED != IS_UNUSED) {
 		zval *key = NULL;
-		if ((IS_UNUSED & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key)) == IS_REFERENCE) {
+		if ((IS_UNUSED & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key) == IS_REFERENCE)) {
 			key = Z_REFVAL_P(key);
 		}
 		ZVAL_COPY(&generator->key, key);
@@ -36470,7 +36484,7 @@
 	zend_fetch_property_address(
 		result, container, IS_UNUSED, property, IS_CV,
 		((IS_CV == IS_CONST) ? CACHE_ADDR(opline->extended_value & ~ZEND_FETCH_OBJ_FLAGS) : NULL),
-		BP_VAR_W, opline->extended_value & ZEND_FETCH_OBJ_FLAGS, 1 OPLINE_CC EXECUTE_DATA_CC);
+		BP_VAR_W, opline->extended_value & ZEND_FETCH_OBJ_FLAGS OPLINE_CC EXECUTE_DATA_CC);
 
 	if (IS_UNUSED == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -36487,7 +36501,7 @@
 	container = &EX(This);
 	property = _get_zval_ptr_cv_BP_VAR_R(opline->op2.var EXECUTE_DATA_CC);
 	result = EX_VAR(opline->result.var);
-	zend_fetch_property_address(result, container, IS_UNUSED, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_RW, 0, 1 OPLINE_CC EXECUTE_DATA_CC);
+	zend_fetch_property_address(result, container, IS_UNUSED, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_RW, 0 OPLINE_CC EXECUTE_DATA_CC);
 
 	if (IS_UNUSED == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -36634,7 +36648,7 @@
 	container = &EX(This);
 	property = _get_zval_ptr_cv_BP_VAR_R(opline->op2.var EXECUTE_DATA_CC);
 	result = EX_VAR(opline->result.var);
-	zend_fetch_property_address(result, container, IS_UNUSED, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_UNSET, 0, 1 OPLINE_CC EXECUTE_DATA_CC);
+	zend_fetch_property_address(result, container, IS_UNUSED, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_UNSET, 0 OPLINE_CC EXECUTE_DATA_CC);
 
 	if (IS_UNUSED == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -37805,7 +37819,7 @@
 	/* Set the new yielded key */
 	if (IS_CV != IS_UNUSED) {
 		zval *key = _get_zval_ptr_cv_BP_VAR_R(opline->op2.var EXECUTE_DATA_CC);
-		if ((IS_CV & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key)) == IS_REFERENCE) {
+		if ((IS_CV & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key) == IS_REFERENCE)) {
 			key = Z_REFVAL_P(key);
 		}
 		ZVAL_COPY(&generator->key, key);
@@ -38476,6 +38490,8 @@
 		}
 	}
 
+	EG(current_execute_data) = EX(prev_execute_data);
+
 	/* Close the generator to free up resources */
 	zend_generator_close(generator, 1);
 
@@ -39281,7 +39297,7 @@
 				zval_ptr_dtor(&tmp);
 			}
 			if (!EG(exception)) {
-				zend_type_error("strlen(): Argument #1 ($str) must be of type string, %s given", zend_zval_type_name(value));
+				zend_type_error("strlen(): Argument #1 ($string) must be of type string, %s given", zend_zval_type_name(value));
 			}
 			ZVAL_UNDEF(EX_VAR(opline->result.var));
 		} while (0);
@@ -40670,7 +40686,7 @@
 	zend_fetch_property_address(
 		result, container, IS_CV, property, IS_CONST,
 		((IS_CONST == IS_CONST) ? CACHE_ADDR(opline->extended_value & ~ZEND_FETCH_OBJ_FLAGS) : NULL),
-		BP_VAR_W, opline->extended_value & ZEND_FETCH_OBJ_FLAGS, 1 OPLINE_CC EXECUTE_DATA_CC);
+		BP_VAR_W, opline->extended_value & ZEND_FETCH_OBJ_FLAGS OPLINE_CC EXECUTE_DATA_CC);
 
 	if (IS_CV == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -40687,7 +40703,7 @@
 	container = EX_VAR(opline->op1.var);
 	property = RT_CONSTANT(opline, opline->op2);
 	result = EX_VAR(opline->result.var);
-	zend_fetch_property_address(result, container, IS_CV, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_RW, 0, 1 OPLINE_CC EXECUTE_DATA_CC);
+	zend_fetch_property_address(result, container, IS_CV, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_RW, 0 OPLINE_CC EXECUTE_DATA_CC);
 
 	if (IS_CV == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -40834,7 +40850,7 @@
 	container = EX_VAR(opline->op1.var);
 	property = RT_CONSTANT(opline, opline->op2);
 	result = EX_VAR(opline->result.var);
-	zend_fetch_property_address(result, container, IS_CV, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_UNSET, 0, 1 OPLINE_CC EXECUTE_DATA_CC);
+	zend_fetch_property_address(result, container, IS_CV, property, IS_CONST, ((IS_CONST == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_UNSET, 0 OPLINE_CC EXECUTE_DATA_CC);
 
 	if (IS_CV == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -43034,7 +43050,7 @@
 	/* Set the new yielded key */
 	if (IS_CONST != IS_UNUSED) {
 		zval *key = RT_CONSTANT(opline, opline->op2);
-		if ((IS_CONST & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key)) == IS_REFERENCE) {
+		if ((IS_CONST & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key) == IS_REFERENCE)) {
 			key = Z_REFVAL_P(key);
 		}
 		ZVAL_COPY(&generator->key, key);
@@ -44448,7 +44464,7 @@
 	zend_fetch_property_address(
 		result, container, IS_CV, property, (IS_TMP_VAR|IS_VAR),
 		(((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(opline->extended_value & ~ZEND_FETCH_OBJ_FLAGS) : NULL),
-		BP_VAR_W, opline->extended_value & ZEND_FETCH_OBJ_FLAGS, 1 OPLINE_CC EXECUTE_DATA_CC);
+		BP_VAR_W, opline->extended_value & ZEND_FETCH_OBJ_FLAGS OPLINE_CC EXECUTE_DATA_CC);
 	zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 	if (IS_CV == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -44465,7 +44481,7 @@
 	container = EX_VAR(opline->op1.var);
 	property = _get_zval_ptr_var(opline->op2.var EXECUTE_DATA_CC);
 	result = EX_VAR(opline->result.var);
-	zend_fetch_property_address(result, container, IS_CV, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_RW, 0, 1 OPLINE_CC EXECUTE_DATA_CC);
+	zend_fetch_property_address(result, container, IS_CV, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_RW, 0 OPLINE_CC EXECUTE_DATA_CC);
 	zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 	if (IS_CV == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -44612,7 +44628,7 @@
 	container = EX_VAR(opline->op1.var);
 	property = _get_zval_ptr_var(opline->op2.var EXECUTE_DATA_CC);
 	result = EX_VAR(opline->result.var);
-	zend_fetch_property_address(result, container, IS_CV, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_UNSET, 0, 1 OPLINE_CC EXECUTE_DATA_CC);
+	zend_fetch_property_address(result, container, IS_CV, property, (IS_TMP_VAR|IS_VAR), (((IS_TMP_VAR|IS_VAR) == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_UNSET, 0 OPLINE_CC EXECUTE_DATA_CC);
 	zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
 	if (IS_CV == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -46589,7 +46605,7 @@
 	/* Set the new yielded key */
 	if ((IS_TMP_VAR|IS_VAR) != IS_UNUSED) {
 		zval *key = _get_zval_ptr_var(opline->op2.var EXECUTE_DATA_CC);
-		if (((IS_TMP_VAR|IS_VAR) & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key)) == IS_REFERENCE) {
+		if (((IS_TMP_VAR|IS_VAR) & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key) == IS_REFERENCE)) {
 			key = Z_REFVAL_P(key);
 		}
 		ZVAL_COPY(&generator->key, key);
@@ -48388,7 +48404,7 @@
 	/* Set the new yielded key */
 	if (IS_UNUSED != IS_UNUSED) {
 		zval *key = NULL;
-		if ((IS_UNUSED & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key)) == IS_REFERENCE) {
+		if ((IS_UNUSED & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key) == IS_REFERENCE)) {
 			key = Z_REFVAL_P(key);
 		}
 		ZVAL_COPY(&generator->key, key);
@@ -49763,7 +49779,7 @@
 	zend_fetch_property_address(
 		result, container, IS_CV, property, IS_CV,
 		((IS_CV == IS_CONST) ? CACHE_ADDR(opline->extended_value & ~ZEND_FETCH_OBJ_FLAGS) : NULL),
-		BP_VAR_W, opline->extended_value & ZEND_FETCH_OBJ_FLAGS, 1 OPLINE_CC EXECUTE_DATA_CC);
+		BP_VAR_W, opline->extended_value & ZEND_FETCH_OBJ_FLAGS OPLINE_CC EXECUTE_DATA_CC);
 
 	if (IS_CV == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -49780,7 +49796,7 @@
 	container = EX_VAR(opline->op1.var);
 	property = _get_zval_ptr_cv_BP_VAR_R(opline->op2.var EXECUTE_DATA_CC);
 	result = EX_VAR(opline->result.var);
-	zend_fetch_property_address(result, container, IS_CV, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_RW, 0, 1 OPLINE_CC EXECUTE_DATA_CC);
+	zend_fetch_property_address(result, container, IS_CV, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_RW, 0 OPLINE_CC EXECUTE_DATA_CC);
 
 	if (IS_CV == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -49927,7 +49943,7 @@
 	container = EX_VAR(opline->op1.var);
 	property = _get_zval_ptr_cv_BP_VAR_R(opline->op2.var EXECUTE_DATA_CC);
 	result = EX_VAR(opline->result.var);
-	zend_fetch_property_address(result, container, IS_CV, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_UNSET, 0, 1 OPLINE_CC EXECUTE_DATA_CC);
+	zend_fetch_property_address(result, container, IS_CV, property, IS_CV, ((IS_CV == IS_CONST) ? CACHE_ADDR(opline->extended_value) : NULL), BP_VAR_UNSET, 0 OPLINE_CC EXECUTE_DATA_CC);
 
 	if (IS_CV == IS_VAR) {
 		FREE_VAR_PTR_AND_EXTRACT_RESULT_IF_NECESSARY(opline->op1.var);
@@ -51974,7 +51990,7 @@
 	/* Set the new yielded key */
 	if (IS_CV != IS_UNUSED) {
 		zval *key = _get_zval_ptr_cv_BP_VAR_R(opline->op2.var EXECUTE_DATA_CC);
-		if ((IS_CV & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key)) == IS_REFERENCE) {
+		if ((IS_CV & (IS_CV|IS_VAR)) && UNEXPECTED(Z_TYPE_P(key) == IS_REFERENCE)) {
 			key = Z_REFVAL_P(key);
 		}
 		ZVAL_COPY(&generator->key, key);

php-8.1.13.tar.xz/build/Makefile.global -> php-8.1.21.tar.xz/build/Makefile.global Changed

php-8.1.13.tar.xz/build/gen_stub.php -> php-8.1.21.tar.xz/build/gen_stub.php Changed

php-8.1.13.tar.xz/configure -> php-8.1.21.tar.xz/configure Changed

@@ -1,8 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for PHP 8.1.13.
+# Generated by GNU Autoconf 2.71 for PHP 8.1.21.
 #
-# Report bugs to <https://bugs.php.net>.
+# Report bugs to <https://github.com/php/php-src/issues>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -268,10 +268,10 @@
 printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
 else
 printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and
-$0: https://bugs.php.net about your system, including any
-$0: error possibly output before this message. Then install
-$0: a modern shell, or manually run the script under such a
-$0: shell if you do have one."
+$0: https://github.com/php/php-src/issues about your
+$0: system, including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
 fi
 exit 1
 fi
@@ -763,9 +763,9 @@
 # Identity of this package.
 PACKAGE_NAME='PHP'
 PACKAGE_TARNAME='php'
-PACKAGE_VERSION='8.1.13'
-PACKAGE_STRING='PHP 8.1.13'
-PACKAGE_BUGREPORT='https://bugs.php.net'
+PACKAGE_VERSION='8.1.21'
+PACKAGE_STRING='PHP 8.1.21'
+PACKAGE_BUGREPORT='https://github.com/php/php-src/issues'
 PACKAGE_URL='https://www.php.net'
 
 ac_unique_file="main/php_version.h"
@@ -1167,6 +1167,7 @@
 with_pear
 enable_fiber_asm
 enable_zend_signals
+enable_zend_max_execution_timers
 enable_shared
 enable_static
 enable_fast_install
@@ -1802,7 +1803,7 @@
 # Omit some internal or obsolete options to make the list less imposing.
 # This message is too long to be a string in the A/UX 3.1 sh.
 cat <<_ACEOF
-\`configure' configures PHP 8.1.13 to adapt to many kinds of systems.
+\`configure' configures PHP 8.1.21 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1874,7 +1875,7 @@
 
 if test -n "$ac_init_help"; then
 case $ac_init_help in
- short | recursive ) echo "Configuration of PHP 8.1.13:";;
+ short | recursive ) echo "Configuration of PHP 8.1.21:";;
 esac
 cat <<\_ACEOF
 
@@ -2145,6 +2146,8 @@
 Zend:
 
 --disable-zend-signals whether to enable zend signal handling
+ --enable-zend-max-execution-timers
+ whether to enable zend max execution timers
 
 TSRM:
 
@@ -2272,7 +2275,7 @@
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <https://bugs.php.net>.
+Report bugs to <https://github.com/php/php-src/issues>.
 PHP home page: <https://www.php.net>.
 _ACEOF
 ac_status=$?
@@ -2337,7 +2340,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
-PHP configure 8.1.13
+PHP configure 8.1.21
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2527,7 +2530,7 @@
 #define $2 innocuous_$2
 
 /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $2 (); below. */
+ which can conflict with char $2 (void); below. */
 
 #include <limits.h>
 #undef $2
@@ -2538,7 +2541,7 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char $2 ();
+char $2 (void);
 /* The GNU C library defines this for functions which it implements
 to always fail with ENOSYS. Some functions are actually named
 something starting with __ and the normal name is an alias. */
@@ -3071,7 +3074,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by PHP $as_me 8.1.13, which was
+It was created by PHP $as_me 8.1.21, which was
 generated by GNU Autoconf 2.71. Invocation command line was
 
 $ $0$ac_configure_args_raw
@@ -3357,9 +3360,7 @@
 /* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */
 struct buf { int x; };
 struct buf * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
- char **p;
- int i;
+static char *e (char **p, int i)
 {
 return pi;
 }
@@ -3410,6 +3411,7 @@
 extern int printf (const char *, ...);
 extern int dprintf (int, const char *, ...);
 extern void *malloc (size_t);
+extern void free (void *);
 
 // Check varargs macros. These examples are taken from C99 6.10.3.5.
 // dprintf is used instead of fprintf to avoid needing to declare
@@ -4473,7 +4475,7 @@
 
 
 ac_IFS=$IFS; IFS="."
-set $(echo 8.1.13 | "${SED}" 's/$0-9\.*$$.*$/\1\.\2/')
+set $(echo 8.1.21 | "${SED}" 's/$0-9\.*$$.*$/\1\.\2/')
 IFS=$ac_IFS
 PHP_MAJOR_VERSION=$1
 PHP_MINOR_VERSION=$2
@@ -8144,8 +8146,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char socket ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char socket (void);
 int
 main (void)
 {
@@ -8203,8 +8211,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char inet_addr ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char inet_addr (void);
 int
 main (void)
 {
@@ -9500,8 +9514,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char acl_free ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char acl_free (void);
 int
 main (void)
 {
@@ -9621,8 +9641,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char aa_change_profile ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char aa_change_profile (void);
 int
 main (void)
 {
@@ -12088,8 +12114,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char socket ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char socket (void);
 int
 main (void)
 {
@@ -12128,8 +12160,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __socket ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __socket (void);
 int
 main (void)
 {
@@ -12224,8 +12262,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char socket ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char socket (void);
 int
 main (void)
 {
@@ -12264,8 +12308,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __socket ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __socket (void);
 int
 main (void)
 {
@@ -12401,8 +12451,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char socketpair ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char socketpair (void);
 int
 main (void)
 {
@@ -12441,8 +12497,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __socketpair ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __socketpair (void);
 int
 main (void)
 {
@@ -12537,8 +12599,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char socketpair ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char socketpair (void);
 int
 main (void)
 {
@@ -12577,8 +12645,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __socketpair ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __socketpair (void);
 int
 main (void)
 {
@@ -12714,8 +12788,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char htonl ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char htonl (void);
 int
 main (void)
 {
@@ -12754,8 +12834,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __htonl ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __htonl (void);
 int
 main (void)
 {
@@ -12850,8 +12936,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char htonl ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char htonl (void);
 int
 main (void)
 {
@@ -12890,8 +12982,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __htonl ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __htonl (void);
 int
 main (void)
 {
@@ -13027,8 +13125,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char gethostname ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gethostname (void);
 int
 main (void)
 {
@@ -13067,8 +13171,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __gethostname ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __gethostname (void);
 int
 main (void)
 {
@@ -13163,8 +13273,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char gethostname ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gethostname (void);
 int
 main (void)
 {
@@ -13203,8 +13319,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __gethostname ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __gethostname (void);
 int
 main (void)
 {
@@ -13340,8 +13462,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char gethostbyaddr ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gethostbyaddr (void);
 int
 main (void)
 {
@@ -13380,8 +13508,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __gethostbyaddr ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __gethostbyaddr (void);
 int
 main (void)
 {
@@ -13476,8 +13610,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char gethostbyaddr ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gethostbyaddr (void);
 int
 main (void)
 {
@@ -13516,8 +13656,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __gethostbyaddr ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __gethostbyaddr (void);
 int
 main (void)
 {
@@ -13653,8 +13799,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dlopen ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen (void);
 int
 main (void)
 {
@@ -13693,8 +13845,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __dlopen ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __dlopen (void);
 int
 main (void)
 {
@@ -13789,8 +13947,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dlopen ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen (void);
 int
 main (void)
 {
@@ -13829,8 +13993,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __dlopen ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __dlopen (void);
 int
 main (void)
 {
@@ -13966,8 +14136,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dlsym ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlsym (void);
 int
 main (void)
 {
@@ -14006,8 +14182,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __dlsym ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __dlsym (void);
 int
 main (void)
 {
@@ -14102,8 +14284,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dlsym ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlsym (void);
 int
 main (void)
 {
@@ -14142,8 +14330,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __dlsym ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __dlsym (void);
 int
 main (void)
 {
@@ -14250,8 +14444,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char sin ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sin (void);
 int
 main (void)
 {
@@ -14281,6 +14481,72 @@
 fi
 
 
+case $host_alias in
+ riscv64*)
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __atomic_exchange_1 in -latomic" >&5
+printf %s "checking for __atomic_exchange_1 in -latomic... " >&6; }
+if test ${ac_cv_lib_atomic___atomic_exchange_1+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-latomic $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __atomic_exchange_1 (void);
+int
+main (void)
+{
+return __atomic_exchange_1 ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+ ac_cv_lib_atomic___atomic_exchange_1=yes
+else $as_nop
+ ac_cv_lib_atomic___atomic_exchange_1=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atomic___atomic_exchange_1" >&5
+printf "%s\n" "$ac_cv_lib_atomic___atomic_exchange_1" >&6; }
+if test "x$ac_cv_lib_atomic___atomic_exchange_1" = xyes
+then :
+
+
+
+ case atomic in
+ c|c_r) ;;
+ *)
+ LIBS="-latomic $LIBS"
+ ;;
+ esac
+
+
+
+else $as_nop
+
+ as_fn_error $? "Problem with enabling atomic. Please check config.log for details." "$LINENO" 5
+
+fi
+
+ ;;
+esac
+
 
 unset ac_cv_func_inet_aton
 unset ac_cv_func___inet_aton
@@ -14328,8 +14594,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char inet_aton ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char inet_aton (void);
 int
 main (void)
 {
@@ -14368,8 +14640,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __inet_aton ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __inet_aton (void);
 int
 main (void)
 {
@@ -14464,8 +14742,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char inet_aton ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char inet_aton (void);
 int
 main (void)
 {
@@ -14504,8 +14788,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __inet_aton ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __inet_aton (void);
 int
 main (void)
 {
@@ -18148,6 +18438,12 @@
 printf "%s\n" "#define HAVE_MEMMEM 1" >>confdefs.h
 
 fi
+ac_fn_c_check_func "$LINENO" "strerror_r" "ac_cv_func_strerror_r"
+if test "x$ac_cv_func_strerror_r" = xyes
+then :
+ printf "%s\n" "#define HAVE_STRERROR_R 1" >>confdefs.h
+
+fi
 
 
 
@@ -18377,8 +18673,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char nanosleep ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char nanosleep (void);
 int
 main (void)
 {
@@ -18417,8 +18719,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __nanosleep ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __nanosleep (void);
 int
 main (void)
 {
@@ -18520,8 +18828,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char setsockopt ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char setsockopt (void);
 int
 main (void)
 {
@@ -18560,8 +18874,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __setsockopt ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __setsockopt (void);
 int
 main (void)
 {
@@ -19371,8 +19691,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char openpty ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char openpty (void);
 int
 main (void)
 {
@@ -19411,8 +19737,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __openpty ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __openpty (void);
 int
 main (void)
 {
@@ -19507,8 +19839,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char openpty ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char openpty (void);
 int
 main (void)
 {
@@ -19547,8 +19885,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __openpty ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __openpty (void);
 int
 main (void)
 {
@@ -20125,8 +20469,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dmalloc_error ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dmalloc_error (void);
 int
 main (void)
 {
@@ -23680,8 +24030,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char sqlite3_errstr ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sqlite3_errstr (void);
 int
 main (void)
 {
@@ -23841,8 +24197,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char sqlite3_expanded_sql ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sqlite3_expanded_sql (void);
 int
 main (void)
 {
@@ -24003,8 +24365,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char sqlite3_load_extension ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sqlite3_load_extension (void);
 int
 main (void)
 {
@@ -25371,8 +25739,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char BZ2_bzerror ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char BZ2_bzerror (void);
 int
 main (void)
 {
@@ -27170,8 +27544,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char curl_easy_perform ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char curl_easy_perform (void);
 int
 main (void)
 {
@@ -27922,8 +28302,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dpopen ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dpopen (void);
 int
 main (void)
 {
@@ -28270,8 +28656,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char gdbm_open ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gdbm_open (void);
 int
 main (void)
 {
@@ -28594,8 +28986,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dbm_open ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dbm_open (void);
 int
 main (void)
 {
@@ -28950,8 +29348,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char tcadbopen ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char tcadbopen (void);
 int
 main (void)
 {
@@ -29306,8 +29710,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char mdb_env_open ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char mdb_env_open (void);
 int
 main (void)
 {
@@ -30876,8 +31286,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dbminit ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dbminit (void);
 int
 main (void)
 {
@@ -31301,8 +31717,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char cdb_read ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char cdb_read (void);
 int
 main (void)
 {
@@ -33405,8 +33827,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char enchant_get_version ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char enchant_get_version (void);
 int
 main (void)
 {
@@ -33568,8 +33996,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char enchant_broker_set_param ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char enchant_broker_set_param (void);
 int
 main (void)
 {
@@ -38944,8 +39378,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char gdImageCreateFromPng ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gdImageCreateFromPng (void);
 int
 main (void)
 {
@@ -39102,8 +39542,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char gdImageCreateFromAvif ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gdImageCreateFromAvif (void);
 int
 main (void)
 {
@@ -39260,8 +39706,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char gdImageCreateFromWebp ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gdImageCreateFromWebp (void);
 int
 main (void)
 {
@@ -39418,8 +39870,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char gdImageCreateFromJpeg ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gdImageCreateFromJpeg (void);
 int
 main (void)
 {
@@ -39576,8 +40034,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char gdImageCreateFromXpm ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gdImageCreateFromXpm (void);
 int
 main (void)
 {
@@ -39734,8 +40198,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char gdImageCreateFromBmp ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gdImageCreateFromBmp (void);
 int
 main (void)
 {
@@ -39892,8 +40362,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char gdImageCreateFromTga ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gdImageCreateFromTga (void);
 int
 main (void)
 {
@@ -40050,8 +40526,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char gdImageStringFT ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gdImageStringFT (void);
 int
 main (void)
 {
@@ -40208,8 +40690,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char gdVersionString ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gdVersionString (void);
 int
 main (void)
 {
@@ -40366,8 +40854,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char gdImageGetInterpolationMethod ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gdImageGetInterpolationMethod (void);
 int
 main (void)
 {
@@ -40782,8 +41276,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char gdImageCreate ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gdImageCreate (void);
 int
 main (void)
 {
@@ -40932,8 +41432,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char bindtextdomain ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char bindtextdomain (void);
 int
 main (void)
 {
@@ -40974,8 +41480,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char bindtextdomain ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char bindtextdomain (void);
 int
 main (void)
 {
@@ -41320,8 +41832,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char ngettext ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ngettext (void);
 int
 main (void)
 {
@@ -41364,8 +41882,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dngettext ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dngettext (void);
 int
 main (void)
 {
@@ -41408,8 +41932,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dcngettext ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dcngettext (void);
 int
 main (void)
 {
@@ -41452,8 +41982,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char bind_textdomain_codeset ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char bind_textdomain_codeset (void);
 int
 main (void)
 {
@@ -41754,8 +42290,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __gmpz_rootrem ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __gmpz_rootrem (void);
 int
 main (void)
 {
@@ -41943,8 +42485,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __gmpz_rootrem ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __gmpz_rootrem (void);
 int
 main (void)
 {
@@ -43045,8 +43593,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char libiconv ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char libiconv (void);
 int
 main (void)
 {
@@ -43210,8 +43764,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char iconv ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char iconv (void);
 int
 main (void)
 {
@@ -44665,8 +45225,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char pam_start ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pam_start (void);
 int
 main (void)
 {
@@ -44849,8 +45415,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char crypt ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char crypt (void);
 int
 main (void)
 {
@@ -45641,64 +46213,57 @@
 
 
 
+ old_CPPFLAGS="${CPPFLAGS}"
+ CPPFLAGS="${CPPFLAGS} -I${IMAP_INC_DIR}"
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-
- old_LIBS=$LIBS
- LIBS="$TST_LIBS $LIBS"
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for utf8_to_mutf7" >&5
+printf %s "checking for utf8_to_mutf7... " >&6; }
+if test ${ac_cv_utf8_to_mutf7+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
+#include <c-client.h>
+int
+main (void)
+{
 
+ unsigned char c = '\0';
+ utf8_to_mutf7(&c);
 
- char utf8_to_mutf7_php(){ return utf8_to_mutf7(""); }
-
-
-#if defined(__GNUC__) && __GNUC__ >= 4
-# define PHP_IMAP_EXPORT __attribute__ ((visibility("default")))
-#else
-# define PHP_IMAP_EXPORT
-#endif
-
- PHP_IMAP_EXPORT void mm_log(void){}
- PHP_IMAP_EXPORT void mm_dlog(void){}
- PHP_IMAP_EXPORT void mm_flags(void){}
- PHP_IMAP_EXPORT void mm_fatal(void){}
- PHP_IMAP_EXPORT void mm_critical(void){}
- PHP_IMAP_EXPORT void mm_nocritical(void){}
- PHP_IMAP_EXPORT void mm_notify(void){}
- PHP_IMAP_EXPORT void mm_login(void){}
- PHP_IMAP_EXPORT void mm_diskerror(void){}
- PHP_IMAP_EXPORT void mm_status(void){}
- PHP_IMAP_EXPORT void mm_lsub(void){}
- PHP_IMAP_EXPORT void mm_list(void){}
- PHP_IMAP_EXPORT void mm_exists(void){}
- PHP_IMAP_EXPORT void mm_searched(void){}
- PHP_IMAP_EXPORT void mm_expunged(void){}
-
- char utf8_to_mutf7_php();
- int main() {
- utf8_to_mutf7_php();
- return 0;
- }
-
+ ;
+ return 0;
+}
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
+if ac_fn_c_try_compile "$LINENO"
 then :
 
- LIBS=$old_LIBS
-
 
 printf "%s\n" "#define HAVE_IMAP_MUTF7 1" >>confdefs.h
 
-
+ ac_cv_utf8_to_mutf7=yes
 
 else $as_nop
 
- LIBS=$old_LIBS
+ ac_cv_utf8_to_mutf7=no
 
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
- conftest$ac_exeext conftest.$ac_ext
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_utf8_to_mutf7" >&5
+printf "%s\n" "$ac_cv_utf8_to_mutf7" >&6; }
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
@@ -55153,8 +55718,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char op_write_native_code ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char op_write_native_code (void);
 int
 main (void)
 {
@@ -55534,8 +56105,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char shm_open ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shm_open (void);
 int
 main (void)
 {
@@ -55574,8 +56151,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __shm_open ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __shm_open (void);
 int
 main (void)
 {
@@ -55670,8 +56253,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char shm_open ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shm_open (void);
 int
 main (void)
 {
@@ -55710,8 +56299,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __shm_open ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __shm_open (void);
 int
 main (void)
 {
@@ -56002,8 +56597,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char shm_unlink ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shm_unlink (void);
 int
 main (void)
 {
@@ -57375,8 +57976,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dbsqlexec ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dbsqlexec (void);
 int
 main (void)
 {
@@ -57883,8 +58490,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dnet_addr ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dnet_addr (void);
 int
 main (void)
 {
@@ -58417,8 +59030,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char isc_detach_database ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char isc_detach_database (void);
 int
 main (void)
 {
@@ -58574,8 +59193,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char isc_detach_database ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char isc_detach_database (void);
 int
 main (void)
 {
@@ -58731,8 +59356,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char isc_detach_database ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char isc_detach_database (void);
 int
 main (void)
 {
@@ -60887,8 +61518,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char OCIEnvCreate ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char OCIEnvCreate (void);
 int
 main (void)
 {
@@ -61050,8 +61687,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char OCIEnvNlsCreate ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char OCIEnvNlsCreate (void);
 int
 main (void)
 {
@@ -61213,8 +61856,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char OCIStmtFetch2 ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char OCIStmtFetch2 (void);
 int
 main (void)
 {
@@ -61257,6 +61906,175 @@
 
 
 
+ save_old_LDFLAGS=$LDFLAGS
+ ac_stuff="
+ -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
+ "
+
+ save_ext_shared=$ext_shared
+ ext_shared=yes
+
+ for ac_i in $ac_stuff; do
+ case $ac_i in
+ -pthread)
+ if test "$ext_shared" = "yes"; then
+ LDFLAGS="$LDFLAGS -pthread"
+ else
+
+
+ unique=`echo $ac_i|$SED 's/^a-zA-Z0-9/_/g'`
+
+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
+ eval "EXTRA_LDFLAGS$unique=set"
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
+ fi
+
+
+
+ unique=`echo $ac_i|$SED 's/^a-zA-Z0-9/_/g'`
+
+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS_PROGRAM$unique$ac_c\""
+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
+ eval "EXTRA_LDFLAGS_PROGRAM$unique=set"
+ EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $ac_i"
+ fi
+
+ fi
+ ;;
+ -l*)
+ ac_ii=`echo $ac_i|cut -c 3-`
+
+
+ case $ac_ii in
+ c|c_r) ;;
+ *)
+ if test "$ext_shared" = "yes"; then
+ LDFLAGS="$LDFLAGS -l$ac_ii"
+ else
+
+
+ case $ac_ii in
+ c|c_r) ;;
+ *)
+ LIBS="$LIBS -l$ac_ii"
+ ;;
+ esac
+
+
+ fi
+ ;;
+ esac
+
+
+ ;;
+ -L*)
+ ac_ii=`echo $ac_i|cut -c 3-`
+
+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
+
+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
+ ai_p=$ac_ii
+ else
+
+ ep_dir=`echo $ac_ii|$SED 's%/*^/^/*/*$%%'`
+
+ ep_realdir=`(cd "$ep_dir" && pwd)`
+ ai_p="$ep_realdir"/`basename "$ac_ii"`
+ fi
+
+
+ if test "$ext_shared" = "yes"; then
+ LDFLAGS="-L$ai_p $LDFLAGS"
+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
+ else
+
+
+
+ unique=`echo $ai_p|$SED 's/^a-zA-Z0-9/_/g'`
+
+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
+ if test -n "$unique" && test "`eval $cmd`" = "" ; then
+ eval "LIBPATH$unique=set"
+
+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
+ LDFLAGS="$LDFLAGS -L$ai_p"
+ PHP_RPATHS="$PHP_RPATHS $ai_p"
+
+ fi
+
+
+ fi
+
+ fi
+
+ ;;
+ esac
+ done
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OCILobRead2 in -lclntsh" >&5
+printf %s "checking for OCILobRead2 in -lclntsh... " >&6; }
+if test ${ac_cv_lib_clntsh_OCILobRead2+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lclntsh $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char OCILobRead2 (void);
+int
+main (void)
+{
+return OCILobRead2 ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+ ac_cv_lib_clntsh_OCILobRead2=yes
+else $as_nop
+ ac_cv_lib_clntsh_OCILobRead2=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCILobRead2" >&5
+printf "%s\n" "$ac_cv_lib_clntsh_OCILobRead2" >&6; }
+if test "x$ac_cv_lib_clntsh_OCILobRead2" = xyes
+then :
+
+ LDFLAGS=$save_old_LDFLAGS
+ ext_shared=$save_ext_shared
+
+
+printf "%s\n" "#define HAVE_OCILOBREAD2 1" >>confdefs.h
+
+
+
+else $as_nop
+
+ LDFLAGS=$save_old_LDFLAGS
+ ext_shared=$save_ext_shared
+ unset ac_cv_lib_clntsh_OCILobRead2
+
+
+fi
+
+
+
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
 printf %s "checking for PDO includes... " >&6; }
 if test ${pdo_cv_inc_path+y}
@@ -62238,8 +63056,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char SQLBindCol ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char SQLBindCol (void);
 int
 main (void)
 {
@@ -62386,8 +63210,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char SQLAllocHandle ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char SQLAllocHandle (void);
 int
 main (void)
 {
@@ -62863,8 +63693,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char PQlibVersion ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char PQlibVersion (void);
 int
 main (void)
 {
@@ -63768,8 +64604,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char sqlite3_close_v2 ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sqlite3_close_v2 (void);
 int
 main (void)
 {
@@ -63929,8 +64771,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char sqlite3_column_table_name ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sqlite3_column_table_name (void);
 int
 main (void)
 {
@@ -64385,8 +65233,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char PQlibVersion ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char PQlibVersion (void);
 int
 main (void)
 {
@@ -64430,8 +65284,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char pg_encoding_to_char ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pg_encoding_to_char (void);
 int
 main (void)
 {
@@ -64472,8 +65332,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char lo_truncate64 ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char lo_truncate64 (void);
 int
 main (void)
 {
@@ -66325,8 +67191,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char new_aspell_config ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char new_aspell_config (void);
 int
 main (void)
 {
@@ -66655,8 +67527,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char tgetent ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char tgetent (void);
 int
 main (void)
 {
@@ -66720,8 +67598,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char tgetent ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char tgetent (void);
 int
 main (void)
 {
@@ -66896,8 +67780,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char readline ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char readline (void);
 int
 main (void)
 {
@@ -67155,8 +68045,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char rl_pending_input ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char rl_pending_input (void);
 int
 main (void)
 {
@@ -67316,8 +68212,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char rl_callback_read_char ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char rl_callback_read_char (void);
 int
 main (void)
 {
@@ -67479,8 +68381,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char rl_on_new_line ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char rl_on_new_line (void);
 int
 main (void)
 {
@@ -67642,8 +68550,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char rl_completion_matches ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char rl_completion_matches (void);
 int
 main (void)
 {
@@ -67942,8 +68856,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char tgetent ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char tgetent (void);
 int
 main (void)
 {
@@ -68006,8 +68926,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char tgetent ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char tgetent (void);
 int
 main (void)
 {
@@ -68181,8 +69107,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char readline ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char readline (void);
 int
 main (void)
 {
@@ -68343,8 +69275,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char rl_callback_read_char ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char rl_callback_read_char (void);
 int
 main (void)
 {
@@ -68506,8 +69444,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char rl_on_new_line ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char rl_on_new_line (void);
 int
 main (void)
 {
@@ -68669,8 +69613,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char rl_completion_matches ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char rl_completion_matches (void);
 int
 main (void)
 {
@@ -68832,8 +69782,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char history_list ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char history_list (void);
 int
 main (void)
 {
@@ -71493,8 +72449,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char init_snmp ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char init_snmp (void);
 int
 main (void)
 {
@@ -71660,8 +72622,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char shutdown_snmp_logging ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shutdown_snmp_logging (void);
 int
 main (void)
 {
@@ -71825,8 +72793,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char usmHMAC192SHA256AuthProtocol ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char usmHMAC192SHA256AuthProtocol (void);
 int
 main (void)
 {
@@ -71990,8 +72964,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char usmHMAC384SHA512AuthProtocol ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char usmHMAC384SHA512AuthProtocol (void);
 int
 main (void)
 {
@@ -74506,8 +75486,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char crypt ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char crypt (void);
 int
 main (void)
 {
@@ -74546,8 +75532,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __crypt ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __crypt (void);
 int
 main (void)
 {
@@ -74680,8 +75672,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char crypt_r ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char crypt_r (void);
 int
 main (void)
 {
@@ -74720,8 +75718,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __crypt_r ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __crypt_r (void);
 int
 main (void)
 {
@@ -75610,8 +76614,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char res_nsearch ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char res_nsearch (void);
 int
 main (void)
 {
@@ -75650,8 +76660,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __res_nsearch ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __res_nsearch (void);
 int
 main (void)
 {
@@ -75746,8 +76762,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char res_nsearch ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char res_nsearch (void);
 int
 main (void)
 {
@@ -75786,8 +76808,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __res_nsearch ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __res_nsearch (void);
 int
 main (void)
 {
@@ -75882,8 +76910,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char res_nsearch ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char res_nsearch (void);
 int
 main (void)
 {
@@ -75922,8 +76956,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __res_nsearch ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __res_nsearch (void);
 int
 main (void)
 {
@@ -76062,8 +77102,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char res_ndestroy ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char res_ndestroy (void);
 int
 main (void)
 {
@@ -76102,8 +77148,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __res_ndestroy ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __res_ndestroy (void);
 int
 main (void)
 {
@@ -76198,8 +77250,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char res_ndestroy ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char res_ndestroy (void);
 int
 main (void)
 {
@@ -76238,8 +77296,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __res_ndestroy ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __res_ndestroy (void);
 int
 main (void)
 {
@@ -76334,8 +77398,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char res_ndestroy ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char res_ndestroy (void);
 int
 main (void)
 {
@@ -76374,8 +77444,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __res_ndestroy ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __res_ndestroy (void);
 int
 main (void)
 {
@@ -76514,8 +77590,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dns_search ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dns_search (void);
 int
 main (void)
 {
@@ -76554,8 +77636,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __dns_search ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __dns_search (void);
 int
 main (void)
 {
@@ -76650,8 +77738,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dns_search ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dns_search (void);
 int
 main (void)
 {
@@ -76690,8 +77784,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __dns_search ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __dns_search (void);
 int
 main (void)
 {
@@ -76786,8 +77886,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dns_search ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dns_search (void);
 int
 main (void)
 {
@@ -76826,8 +77932,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __dns_search ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __dns_search (void);
 int
 main (void)
 {
@@ -76966,8 +78078,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dn_expand ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dn_expand (void);
 int
 main (void)
 {
@@ -77006,8 +78124,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __dn_expand ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __dn_expand (void);
 int
 main (void)
 {
@@ -77102,8 +78226,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dn_expand ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dn_expand (void);
 int
 main (void)
 {
@@ -77142,8 +78272,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __dn_expand ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __dn_expand (void);
 int
 main (void)
 {
@@ -77238,8 +78374,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dn_expand ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dn_expand (void);
 int
 main (void)
 {
@@ -77278,8 +78420,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __dn_expand ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __dn_expand (void);
 int
 main (void)
 {
@@ -77418,8 +78566,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dn_skipname ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dn_skipname (void);
 int
 main (void)
 {
@@ -77458,8 +78612,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __dn_skipname ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __dn_skipname (void);
 int
 main (void)
 {
@@ -77554,8 +78714,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dn_skipname ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dn_skipname (void);
 int
 main (void)
 {
@@ -77594,8 +78760,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __dn_skipname ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __dn_skipname (void);
 int
 main (void)
 {
@@ -77690,8 +78862,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dn_skipname ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dn_skipname (void);
 int
 main (void)
 {
@@ -77730,8 +78908,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __dn_skipname ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __dn_skipname (void);
 int
 main (void)
 {
@@ -77872,8 +79056,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char res_search ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char res_search (void);
 int
 main (void)
 {
@@ -77912,8 +79102,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __res_search ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __res_search (void);
 int
 main (void)
 {
@@ -78008,8 +79204,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char res_search ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char res_search (void);
 int
 main (void)
 {
@@ -78048,8 +79250,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __res_search ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __res_search (void);
 int
 main (void)
 {
@@ -78144,8 +79352,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char res_search ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char res_search (void);
 int
 main (void)
 {
@@ -78184,8 +79398,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char __res_search ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __res_search (void);
 int
 main (void)
 {
@@ -80182,8 +81402,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char tidyOptGetDoc ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char tidyOptGetDoc (void);
 int
 main (void)
 {
@@ -80340,8 +81566,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char tidyOptGetDoc ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char tidyOptGetDoc (void);
 int
 main (void)
 {
@@ -80507,8 +81739,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char tidyReleaseDate ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char tidyReleaseDate (void);
 int
 main (void)
 {
@@ -84747,8 +85985,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char zip_file_set_mtime ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char zip_file_set_mtime (void);
 int
 main (void)
 {
@@ -84913,8 +86157,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char zip_file_set_encryption ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char zip_file_set_encryption (void);
 int
 main (void)
 {
@@ -85079,8 +86329,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char zip_libzip_version ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char zip_libzip_version (void);
 int
 main (void)
 {
@@ -85243,8 +86499,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char zip_register_progress_callback_with_state ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char zip_register_progress_callback_with_state (void);
 int
 main (void)
 {
@@ -85407,8 +86669,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char zip_register_cancel_callback_with_state ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char zip_register_cancel_callback_with_state (void);
 int
 main (void)
 {
@@ -85571,8 +86839,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char zip_compression_method_supported ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char zip_compression_method_supported (void);
 int
 main (void)
 {
@@ -87412,7 +88686,7 @@
 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 lt_status=$lt_dlunknown
 cat > conftest.$ac_ext <<EOF
-#line 87415 "configure"
+#line 88689 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -87984,6 +89258,224 @@
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ZEND_SIGNALS" >&5
 printf "%s\n" "$ZEND_SIGNALS" >&6; }
 
+# Check whether --enable-zend-max-execution-timers was given.
+if test ${enable_zend_max_execution_timers+y}
+then :
+ enableval=$enable_zend_max_execution_timers; ZEND_MAX_EXECUTION_TIMERS=$enableval
+else $as_nop
+ ZEND_MAX_EXECUTION_TIMERS='no'
+fi
+
+
+case "$host_alias" in #(
+ *linux*) :
+ ;; #(
+ *) :
+ ZEND_MAX_EXECUTION_TIMERS='no' ;;
+esac
+
+
+ unset ac_cv_func_timer_create
+ unset ac_cv_func___timer_create
+ unset found
+
+ ac_fn_c_check_func "$LINENO" "timer_create" "ac_cv_func_timer_create"
+if test "x$ac_cv_func_timer_create" = xyes
+then :
+ found=yes
+else $as_nop
+ ac_fn_c_check_func "$LINENO" "__timer_create" "ac_cv_func___timer_create"
+if test "x$ac_cv_func___timer_create" = xyes
+then :
+ found=yes
+else $as_nop
+ found=no
+fi
+
+fi
+
+
+ case $found in
+ yes)
+
+printf "%s\n" "#define HAVE_TIMER_CREATE 1" >>confdefs.h
+
+ ac_cv_func_timer_create=yes
+ ;;
+
+ *)
+
+ unset ac_cv_lib_rt_timer_create
+ unset ac_cv_lib_rt___timer_create
+ unset found
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for timer_create in -lrt" >&5
+printf %s "checking for timer_create in -lrt... " >&6; }
+if test ${ac_cv_lib_rt_timer_create+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lrt $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char timer_create (void);
+int
+main (void)
+{
+return timer_create ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+ ac_cv_lib_rt_timer_create=yes
+else $as_nop
+ ac_cv_lib_rt_timer_create=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_timer_create" >&5
+printf "%s\n" "$ac_cv_lib_rt_timer_create" >&6; }
+if test "x$ac_cv_lib_rt_timer_create" = xyes
+then :
+ found=yes
+else $as_nop
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __timer_create in -lrt" >&5
+printf %s "checking for __timer_create in -lrt... " >&6; }
+if test ${ac_cv_lib_rt___timer_create+y}
+then :
+ printf %s "(cached) " >&6
+else $as_nop
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lrt $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char __timer_create (void);
+int
+main (void)
+{
+return __timer_create ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+ ac_cv_lib_rt___timer_create=yes
+else $as_nop
+ ac_cv_lib_rt___timer_create=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt___timer_create" >&5
+printf "%s\n" "$ac_cv_lib_rt___timer_create" >&6; }
+if test "x$ac_cv_lib_rt___timer_create" = xyes
+then :
+ found=yes
+else $as_nop
+ found=no
+fi
+
+
+fi
+
+
+ if test "$found" = "yes"; then
+ ac_libs=$LIBS
+ LIBS="$LIBS -lrt"
+ if test "$cross_compiling" = yes
+then :
+
+ found=yes
+
+else $as_nop
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int main() { return (0); }
+_ACEOF
+if ac_fn_c_try_run "$LINENO"
+then :
+ found=yes
+else $as_nop
+ found=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+ LIBS=$ac_libs
+ fi
+
+ if test "$found" = "yes"; then
+
+
+ case rt in
+ c|c_r) ;;
+ *)
+ LIBS="-lrt $LIBS"
+ ;;
+ esac
+
+
+
+printf "%s\n" "#define HAVE_TIMER_CREATE 1" >>confdefs.h
+
+
+printf "%s\n" "#define HAVE_LIBRT 1" >>confdefs.h
+
+ ac_cv_func_timer_create=yes
+ else
+
+ :
+
+ fi
+
+ ;;
+
+ esac
+
+if test "$ac_cv_func_timer_create" != "yes"; then
+ ZEND_MAX_EXECUTION_TIMERS='no'
+fi
+
+if test "$ZEND_MAX_EXECUTION_TIMERS" = "yes"; then
+
+printf "%s\n" "#define ZEND_MAX_EXECUTION_TIMERS 1" >>confdefs.h
+
+ CFLAGS="$CFLAGS -DZEND_MAX_EXECUTION_TIMERS"
+fi
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable zend max execution timers" >&5
+printf %s "checking whether to enable zend max execution timers... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ZEND_MAX_EXECUTION_TIMERS" >&5
+printf "%s\n" "$ZEND_MAX_EXECUTION_TIMERS" >&6; }
+
 
 
 INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM"
@@ -89315,7 +90807,7 @@
 ;;
 *-*-irix6*)
 # Find out which ABI we are using.
- echo '#line 89318 "configure"' > conftest.$ac_ext
+ echo '#line 90810 "configure"' > conftest.$ac_ext
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 (eval $ac_compile) 2>&5
 ac_status=$?
@@ -90767,7 +92259,7 @@
 LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
 
 cat > conftest.$ac_ext <<EOF
-#line 90770 "configure"
+#line 92262 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
@@ -90928,11 +92420,11 @@
 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 -e 's: ^ *conftest\.: $lt_compiler_flag&:; t' \
 -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"configure:90931: $lt_compile\"" >&5)
+ (eval echo "\"configure:92423: $lt_compile\"" >&5)
 (eval "$lt_compile" 2>conftest.err)
 ac_status=$?
 cat conftest.err >&5
- echo "configure:90935: \$? = $ac_status" >&5
+ echo "configure:92427: \$? = $ac_status" >&5
 if (exit $ac_status) && test -s "$ac_outfile"; then
 # The compiler can only warn and ignore the option if not recognized
 # So say no if there are warnings other than the usual output.
@@ -91227,11 +92719,11 @@
 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 -e 's: ^ *conftest\.: $lt_compiler_flag&:; t' \
 -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"configure:91230: $lt_compile\"" >&5)
+ (eval echo "\"configure:92722: $lt_compile\"" >&5)
 (eval "$lt_compile" 2>conftest.err)
 ac_status=$?
 cat conftest.err >&5
- echo "configure:91234: \$? = $ac_status" >&5
+ echo "configure:92726: \$? = $ac_status" >&5
 if (exit $ac_status) && test -s "$ac_outfile"; then
 # The compiler can only warn and ignore the option if not recognized
 # So say no if there are warnings other than the usual output.
@@ -91333,11 +92825,11 @@
 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 -e 's: ^ *conftest\.: $lt_compiler_flag&:; t' \
 -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"configure:91336: $lt_compile\"" >&5)
+ (eval echo "\"configure:92828: $lt_compile\"" >&5)
 (eval "$lt_compile" 2>out/conftest.err)
 ac_status=$?
 cat out/conftest.err >&5
- echo "configure:91340: \$? = $ac_status" >&5
+ echo "configure:92832: \$? = $ac_status" >&5
 if (exit $ac_status) && test -s out/conftest2.$ac_objext
 then
 # The compiler can only warn and ignore the option if not recognized
@@ -91797,7 +93289,7 @@
 # Determine the default libpath from the value encoded in an empty executable.
 
 cat > conftest.$ac_ext <<EOF
-#line 91800 "configure"
+#line 93292 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
@@ -91839,7 +93331,7 @@
 	 # Determine the default libpath from the value encoded in an empty executable.
 
 cat > conftest.$ac_ext <<EOF
-#line 91842 "configure"
+#line 93334 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
@@ -93122,8 +94614,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dlopen ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen (void);
 int
 main (void)
 {
@@ -93176,8 +94674,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char shl_load ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load (void);
 int
 main (void)
 {
@@ -93220,8 +94724,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dlopen ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen (void);
 int
 main (void)
 {
@@ -93259,8 +94769,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dlopen ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen (void);
 int
 main (void)
 {
@@ -93298,8 +94814,14 @@
 
 /* Override any GCC internal prototype to avoid an error.
 Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-char dld_link ();
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dld_link (void);
 int
 main (void)
 {
@@ -93372,7 +94894,7 @@
 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 lt_status=$lt_dlunknown
 cat > conftest.$ac_ext <<EOF
-#line 93375 "configure"
+#line 94897 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -93470,7 +94992,7 @@
 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 lt_status=$lt_dlunknown
 cat > conftest.$ac_ext <<EOF
-#line 93473 "configure"
+#line 94995 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -94536,7 +96058,7 @@
 # Determine the default libpath from the value encoded in an empty executable.
 
 cat > conftest.$ac_ext <<EOF
-#line 94539 "configure"
+#line 96061 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
@@ -94579,7 +96101,7 @@
 	# Determine the default libpath from the value encoded in an empty executable.
 
 cat > conftest.$ac_ext <<EOF
-#line 94582 "configure"
+#line 96104 "configure"
 #include "confdefs.h"
 int main() {
 ; return 0; }
@@ -95832,11 +97354,11 @@
 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 -e 's: ^ *conftest\.: $lt_compiler_flag&:; t' \
 -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"configure:95835: $lt_compile\"" >&5)
+ (eval echo "\"configure:97357: $lt_compile\"" >&5)
 (eval "$lt_compile" 2>conftest.err)
 ac_status=$?
 cat conftest.err >&5
- echo "configure:95839: \$? = $ac_status" >&5
+ echo "configure:97361: \$? = $ac_status" >&5
 if (exit $ac_status) && test -s "$ac_outfile"; then
 # The compiler can only warn and ignore the option if not recognized
 # So say no if there are warnings other than the usual output.
@@ -95938,11 +97460,11 @@
 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 -e 's: ^ *conftest\.: $lt_compiler_flag&:; t' \
 -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"configure:95941: $lt_compile\"" >&5)
+ (eval echo "\"configure:97463: $lt_compile\"" >&5)
 (eval "$lt_compile" 2>out/conftest.err)
 ac_status=$?
 cat out/conftest.err >&5
- echo "configure:95945: \$? = $ac_status" >&5
+ echo "configure:97467: \$? = $ac_status" >&5
 if (exit $ac_status) && test -s out/conftest2.$ac_objext
 then
 # The compiler can only warn and ignore the option if not recognized
@@ -97610,7 +99132,7 @@
 zend_closures.c zend_weakrefs.c zend_float.c zend_string.c zend_signal.c zend_generators.c \
 zend_virtual_cwd.c zend_ast.c zend_objects.c zend_object_handlers.c zend_objects_API.c \
 zend_default_classes.c zend_inheritance.c zend_smart_str.c zend_cpuinfo.c zend_gdb.c \
- zend_observer.c zend_system_id.c zend_enum.c zend_fibers.c \
+ zend_observer.c zend_system_id.c zend_enum.c zend_fibers.c zend_max_execution_timer.c \
 	Optimizer/zend_optimizer.c \
 	Optimizer/pass1.c \
 	Optimizer/pass3.c \
@@ -98231,7 +99753,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by PHP $as_me 8.1.13, which was
+This file was extended by PHP $as_me 8.1.21, which was
 generated by GNU Autoconf 2.71. Invocation command line was
 
 CONFIG_FILES = $CONFIG_FILES
@@ -98291,7 +99813,7 @@
 Configuration commands:
 $config_commands
 
-Report bugs to <https://bugs.php.net>.
+Report bugs to <https://github.com/php/php-src/issues>.
 PHP home page: <https://www.php.net>."
 
 _ACEOF
@@ -98300,7 +99822,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-PHP config.status 8.1.13
+PHP config.status 8.1.21
 configured by $0, generated by GNU Autoconf 2.71,
 with options \\"\$ac_cs_config\\"

php-8.1.13.tar.xz/configure.ac -> php-8.1.21.tar.xz/configure.ac Changed

@@ -17,7 +17,7 @@
 dnl ----------------------------------------------------------------------------
 
 AC_PREREQ(2.68)
-AC_INIT(PHP,8.1.13,https://bugs.php.net,php,https://www.php.net)
+AC_INIT(PHP,8.1.21,https://github.com/php/php-src/issues,php,https://www.php.net)
 AC_CONFIG_SRCDIR(main/php_version.h)
 AC_CONFIG_AUX_DIR(build)
 AC_PRESERVE_HELP_ORDER
@@ -365,6 +365,16 @@
 fi
 AC_CHECK_LIB(m, sin)
 
+case $host_alias in
+  riscv64*)
+    AC_CHECK_LIB(atomic, __atomic_exchange_1, 
+      PHP_ADD_LIBRARY(atomic)
+    , 
+      AC_MSG_ERROR(Problem with enabling atomic. Please check config.log for details.)
+    )
+    ;;
+esac
+
 dnl Check for inet_aton in -lc, -lbind and -lresolv.
 PHP_CHECK_FUNC(inet_aton, resolv, bind)
 
@@ -609,6 +619,7 @@
 asprintf \
 nanosleep \
 memmem \
+strerror_r \
 )
 
 AX_FUNC_WHICH_GETHOSTBYNAME_R
@@ -1633,7 +1644,7 @@
     zend_closures.c zend_weakrefs.c zend_float.c zend_string.c zend_signal.c zend_generators.c \
     zend_virtual_cwd.c zend_ast.c zend_objects.c zend_object_handlers.c zend_objects_API.c \
     zend_default_classes.c zend_inheritance.c zend_smart_str.c zend_cpuinfo.c zend_gdb.c \
-    zend_observer.c zend_system_id.c zend_enum.c zend_fibers.c \
+    zend_observer.c zend_system_id.c zend_enum.c zend_fibers.c zend_max_execution_timer.c \
 	Optimizer/zend_optimizer.c \
 	Optimizer/pass1.c \
 	Optimizer/pass3.c \

php-8.1.13.tar.xz/ext/curl/interface.c -> php-8.1.21.tar.xz/ext/curl/interface.c Changed

@@ -60,6 +60,13 @@
 #include "ext/standard/file.h"
 #include "ext/standard/url.h"
 #include "curl_private.h"
+
+#ifdef __GNUC__
+/* don't complain about deprecated CURLOPT_* we're exposing to PHP; we
+   need to keep using those to avoid breaking PHP API compatibiltiy */
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 #include "curl_arginfo.h"
 
 #ifdef PHP_CURL_NEED_OPENSSL_TSL /* {{{ */
@@ -1541,6 +1548,8 @@
 				if (Z_TYPE(retval) == IS_STRING) {
 					length = MIN((int) (size * nmemb), Z_STRLEN(retval));
 					memcpy(data, Z_STRVAL(retval), length);
+				} else if (Z_TYPE(retval) == IS_LONG) {
+					length = Z_LVAL_P(&retval);
 				}
 				zval_ptr_dtor(&retval);
 			}
@@ -2045,7 +2054,7 @@
 				postval = Z_STR_P(prop);
 
 				if (php_check_open_basedir(ZSTR_VAL(postval))) {
-					return 1;
+					return FAILURE;
 				}
 
 				prop = zend_read_property(curl_CURLFile_class, Z_OBJ_P(current), "mime", sizeof("mime")-1, 0, &rv);
@@ -2484,7 +2493,6 @@
 		case CURLOPT_TLSAUTH_TYPE:
 		case CURLOPT_TLSAUTH_PASSWORD:
 		case CURLOPT_TLSAUTH_USERNAME:
-		case CURLOPT_ACCEPT_ENCODING:
 		case CURLOPT_TRANSFER_ENCODING:
 		case CURLOPT_DNS_SERVERS:
 		case CURLOPT_MAIL_AUTH:
@@ -2544,6 +2552,7 @@
 		case CURLOPT_RANGE:
 		case CURLOPT_FTP_ACCOUNT:
 		case CURLOPT_RTSP_SESSION_ID:
+		case CURLOPT_ACCEPT_ENCODING:
 #if LIBCURL_VERSION_NUM >= 0x072100 /* Available since 7.33.0 */
 		case CURLOPT_DNS_INTERFACE:
 		case CURLOPT_DNS_LOCAL_IP4:

php-8.1.21.tar.xz/ext/curl/tests/CONFLICTS Added

php-8.1.13.tar.xz/ext/curl/tests/bug45161.phpt -> php-8.1.21.tar.xz/ext/curl/tests/bug45161.phpt Changed

php-8.1.21.tar.xz/ext/curl/tests/curl_pause_001.phpt Added

@@ -0,0 +1,47 @@
+--TEST--
+Test CURL_READFUNC_PAUSE and curl_pause()
+--EXTENSIONS--
+curl
+--FILE--
+<?php
+include 'server.inc';
+$host = curl_cli_server_start();
+
+class Input {
+	private static $RESPONSES = 
+		'Foo bar ',
+		CURL_READFUNC_PAUSE,
+		'baz qux',
+		null
+	;
+	private int $res = 0;
+	public function __invoke($ch, $hReadHandle, $iMaxOut)
+	{
+		return self::$RESPONSES$this->res++;
+	}
+}
+
+$inputHandle = fopen(__FILE__, 'r');
+
+$ch = curl_init();
+curl_setopt($ch, CURLOPT_URL, "{$host}/get.inc?test=input");
+curl_setopt($ch, CURLOPT_UPLOAD, 1);
+curl_setopt($ch, CURLOPT_READFUNCTION, new Input);
+curl_setopt($ch, CURLOPT_INFILE, $inputHandle);
+curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+
+$mh = curl_multi_init();
+curl_multi_add_handle($mh, $ch);
+do {
+	$status = curl_multi_exec($mh, $active);
+	curl_pause($ch, CURLPAUSE_CONT);
+	if ($active) {
+		usleep(100);
+		curl_multi_select($mh);
+	}
+} while ($active && $status == CURLM_OK);
+
+echo curl_multi_getcontent($ch);
+?>
+--EXPECT--
+string(15) "Foo bar baz qux"

php-8.1.21.tar.xz/ext/curl/tests/curl_setopt_CURLOPT_ACCEPT_ENCODING.phpt Added

php-8.1.13.tar.xz/ext/curl/tests/curl_version_basic_001.phpt -> php-8.1.21.tar.xz/ext/curl/tests/curl_version_basic_001.phpt Changed

php-8.1.13.tar.xz/ext/curl/tests/responder/get.inc -> php-8.1.21.tar.xz/ext/curl/tests/responder/get.inc Changed

php-8.1.13.tar.xz/ext/date/lib/interval.c -> php-8.1.21.tar.xz/ext/date/lib/interval.c Changed

php-8.1.13.tar.xz/ext/date/lib/parse_date.c -> php-8.1.21.tar.xz/ext/date/lib/parse_date.c Changed

@@ -1,4 +1,4 @@
-/* Generated by re2c 0.15.3 on Wed Sep 14 10:36:03 2022 */
+/* Generated by re2c 0.15.3 on Tue Jan 10 15:14:08 2023 */
 #line 1 "ext/date/lib/parse_date.re"
 /*
 * The MIT License (MIT)
@@ -756,7 +756,13 @@
 	timelib_long value = 0;
 	const timelib_tz_lookup_table *tp;
 
-	while (**ptr != '\0' && **ptr != ')' && **ptr != ' ') {
+	/* Only include A-Z, a-z, 0-9, /, _, and - in abbreviations/TZ IDs */
+	while (
+		(**ptr >= 'A' && **ptr <= 'Z') ||
+		(**ptr >= 'a' && **ptr <= 'z') ||
+		(**ptr >= '0' && **ptr <= '9') ||
+		**ptr == '/' || **ptr == '_' || **ptr == '-' || **ptr == '+'
+	) {
 		++*ptr;
 	}
 	end = *ptr;
@@ -952,11 +958,11 @@
 std:
 	s->tok = cursor;
 	s->len = 0;
-#line 1083 "ext/date/lib/parse_date.re"
+#line 1089 "ext/date/lib/parse_date.re"
 
 
 
-#line 960 "<stdout>"
+#line 966 "<stdout>"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept = 0;
@@ -1094,7 +1100,7 @@
 	}
 yy3:
 	YYDEBUG(3, *YYCURSOR);
-#line 1817 "ext/date/lib/parse_date.re"
+#line 1823 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("tzcorrection | tz");
@@ -1107,7 +1113,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_TIMEZONE;
 	}
-#line 1111 "<stdout>"
+#line 1117 "<stdout>"
 yy4:
 	YYDEBUG(4, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -1414,12 +1420,12 @@
 	if (yych <= '9') goto yy1483;
 yy12:
 	YYDEBUG(12, *YYCURSOR);
-#line 1912 "ext/date/lib/parse_date.re"
+#line 1918 "ext/date/lib/parse_date.re"
 	{
 		add_error(s, TIMELIB_ERR_UNEXPECTED_CHARACTER, "Unexpected character");
 		goto std;
 	}
-#line 1423 "<stdout>"
+#line 1429 "<stdout>"
 yy13:
 	YYDEBUG(13, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -2663,11 +2669,11 @@
 	if (yych <= '9') goto yy54;
 yy49:
 	YYDEBUG(49, *YYCURSOR);
-#line 1901 "ext/date/lib/parse_date.re"
+#line 1907 "ext/date/lib/parse_date.re"
 	{
 		goto std;
 	}
-#line 2671 "<stdout>"
+#line 2677 "<stdout>"
 yy50:
 	YYDEBUG(50, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -2676,12 +2682,12 @@
 	YYDEBUG(51, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(52, *YYCURSOR);
-#line 1906 "ext/date/lib/parse_date.re"
+#line 1912 "ext/date/lib/parse_date.re"
 	{
 		s->pos = cursor; s->line++;
 		goto std;
 	}
-#line 2685 "<stdout>"
+#line 2691 "<stdout>"
 yy53:
 	YYDEBUG(53, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -3103,7 +3109,7 @@
 	if (yych == 's') goto yy85;
 yy84:
 	YYDEBUG(84, *YYCURSOR);
-#line 1885 "ext/date/lib/parse_date.re"
+#line 1891 "ext/date/lib/parse_date.re"
 	{
 		timelib_ull i;
 		DEBUG_OUTPUT("relative");
@@ -3118,7 +3124,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 3122 "<stdout>"
+#line 3128 "<stdout>"
 yy85:
 	YYDEBUG(85, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -4127,7 +4133,7 @@
 	}
 yy219:
 	YYDEBUG(219, *YYCURSOR);
-#line 1748 "ext/date/lib/parse_date.re"
+#line 1754 "ext/date/lib/parse_date.re"
 	{
 		const timelib_relunit* relunit;
 		DEBUG_OUTPUT("daytext");
@@ -4144,7 +4150,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_WEEKDAY;
 	}
-#line 4148 "<stdout>"
+#line 4154 "<stdout>"
 yy220:
 	YYDEBUG(220, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -4690,7 +4696,7 @@
 	}
 yy248:
 	YYDEBUG(248, *YYCURSOR);
-#line 1807 "ext/date/lib/parse_date.re"
+#line 1813 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("monthtext");
 		TIMELIB_INIT;
@@ -4699,7 +4705,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_TEXT;
 	}
-#line 4703 "<stdout>"
+#line 4709 "<stdout>"
 yy249:
 	YYDEBUG(249, *YYCURSOR);
 	++YYCURSOR;
@@ -4948,7 +4954,7 @@
 	goto yy267;
 yy262:
 	YYDEBUG(262, *YYCURSOR);
-#line 1553 "ext/date/lib/parse_date.re"
+#line 1559 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datetextual | datenoyear");
@@ -4961,7 +4967,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_TEXT;
 	}
-#line 4965 "<stdout>"
+#line 4971 "<stdout>"
 yy263:
 	YYDEBUG(263, *YYCURSOR);
 	yyaccept = 6;
@@ -5088,7 +5094,7 @@
 	}
 yy276:
 	YYDEBUG(276, *YYCURSOR);
-#line 1855 "ext/date/lib/parse_date.re"
+#line 1861 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("dateshortwithtimeshort | dateshortwithtimelong | dateshortwithtimelongtz");
@@ -5117,7 +5123,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_SHORTDATE_WITH_TIME;
 	}
-#line 5121 "<stdout>"
+#line 5127 "<stdout>"
 yy277:
 	YYDEBUG(277, *YYCURSOR);
 	yyaccept = 7;
@@ -5415,7 +5421,7 @@
 	YYDEBUG(300, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(301, *YYCURSOR);
-#line 1831 "ext/date/lib/parse_date.re"
+#line 1837 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("dateshortwithtimeshort12 | dateshortwithtimelong12");
 		TIMELIB_INIT;
@@ -5438,7 +5444,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_SHORTDATE_WITH_TIME;
 	}
-#line 5442 "<stdout>"
+#line 5448 "<stdout>"
 yy302:
 	YYDEBUG(302, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -6116,7 +6122,7 @@
 	YYDEBUG(362, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(363, *YYCURSOR);
-#line 1525 "ext/date/lib/parse_date.re"
+#line 1531 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datenoday");
@@ -6129,7 +6135,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_NO_DAY;
 	}
-#line 6133 "<stdout>"
+#line 6139 "<stdout>"
 yy364:
 	YYDEBUG(364, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -6360,7 +6366,7 @@
 	if (yych <= '9') goto yy372;
 yy371:
 	YYDEBUG(371, *YYCURSOR);
-#line 1669 "ext/date/lib/parse_date.re"
+#line 1675 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pgtextshort");
@@ -6373,7 +6379,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_PG_TEXT;
 	}
-#line 6377 "<stdout>"
+#line 6383 "<stdout>"
 yy372:
 	YYDEBUG(372, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -6955,7 +6961,7 @@
 	}
 yy398:
 	YYDEBUG(398, *YYCURSOR);
-#line 1727 "ext/date/lib/parse_date.re"
+#line 1733 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("ago");
 		TIMELIB_INIT;
@@ -6975,7 +6981,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_AGO;
 	}
-#line 6979 "<stdout>"
+#line 6985 "<stdout>"
 yy399:
 	YYDEBUG(399, *YYCURSOR);
 	yyaccept = 5;
@@ -8764,7 +8770,7 @@
 	++YYCURSOR;
 yy461:
 	YYDEBUG(461, *YYCURSOR);
-#line 1418 "ext/date/lib/parse_date.re"
+#line 1424 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("iso8601date4 | iso8601date2 | iso8601dateslash | dateslash");
 		TIMELIB_INIT;
@@ -8775,7 +8781,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 8779 "<stdout>"
+#line 8785 "<stdout>"
 yy462:
 	YYDEBUG(462, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -8897,7 +8903,7 @@
 	YYDEBUG(484, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(485, *YYCURSOR);
-#line 1444 "ext/date/lib/parse_date.re"
+#line 1450 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("iso8601datex");
 		TIMELIB_INIT;
@@ -8908,7 +8914,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 8912 "<stdout>"
+#line 8918 "<stdout>"
 yy486:
 	YYDEBUG(486, *YYCURSOR);
 	yyaccept = 1;
@@ -9662,7 +9668,7 @@
 	}
 yy509:
 	YYDEBUG(509, *YYCURSOR);
-#line 1567 "ext/date/lib/parse_date.re"
+#line 1573 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("datenoyearrev");
 		TIMELIB_INIT;
@@ -9673,7 +9679,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_TEXT;
 	}
-#line 9677 "<stdout>"
+#line 9683 "<stdout>"
 yy510:
 	YYDEBUG(510, *YYCURSOR);
 	yyaccept = 9;
@@ -9814,7 +9820,7 @@
 	YYDEBUG(521, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(522, *YYCURSOR);
-#line 1271 "ext/date/lib/parse_date.re"
+#line 1277 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("timetiny12 | timeshort12 | timelong12");
 		TIMELIB_INIT;
@@ -9830,7 +9836,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_TIME12;
 	}
-#line 9834 "<stdout>"
+#line 9840 "<stdout>"
 yy523:
 	YYDEBUG(523, *YYCURSOR);
 	yyaccept = 10;
@@ -9843,7 +9849,7 @@
 	}
 yy524:
 	YYDEBUG(524, *YYCURSOR);
-#line 1308 "ext/date/lib/parse_date.re"
+#line 1314 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("timetiny24 | timeshort24 | timelong24 | iso8601long");
@@ -9870,7 +9876,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_TIME24_WITH_ZONE;
 	}
-#line 9874 "<stdout>"
+#line 9880 "<stdout>"
 yy525:
 	YYDEBUG(525, *YYCURSOR);
 	yyaccept = 10;
@@ -10183,7 +10189,7 @@
 	YYDEBUG(556, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(557, *YYCURSOR);
-#line 1288 "ext/date/lib/parse_date.re"
+#line 1294 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("mssqltime");
 		TIMELIB_INIT;
@@ -10202,7 +10208,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_TIME24_WITH_ZONE;
 	}
-#line 10206 "<stdout>"
+#line 10212 "<stdout>"
 yy558:
 	YYDEBUG(558, *YYCURSOR);
 	yyaccept = 10;
@@ -10308,7 +10314,7 @@
 	if (yych <= '9') goto yy574;
 yy568:
 	YYDEBUG(568, *YYCURSOR);
-#line 1484 "ext/date/lib/parse_date.re"
+#line 1490 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datefull");
@@ -10322,7 +10328,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_FULL;
 	}
-#line 10326 "<stdout>"
+#line 10332 "<stdout>"
 yy569:
 	YYDEBUG(569, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -11058,7 +11064,7 @@
 	YYDEBUG(639, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(640, *YYCURSOR);
-#line 1499 "ext/date/lib/parse_date.re"
+#line 1505 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("pointed date YYYY");
 		TIMELIB_INIT;
@@ -11069,7 +11075,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_FULL_POINTED;
 	}
-#line 11073 "<stdout>"
+#line 11079 "<stdout>"
 yy641:
 	YYDEBUG(641, *YYCURSOR);
 	yyaccept = 10;
@@ -11105,7 +11111,7 @@
 	if (yych <= '9') goto yy638;
 yy645:
 	YYDEBUG(645, *YYCURSOR);
-#line 1511 "ext/date/lib/parse_date.re"
+#line 1517 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pointed date YY");
@@ -11118,7 +11124,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_FULL_POINTED;
 	}
-#line 11122 "<stdout>"
+#line 11128 "<stdout>"
 yy646:
 	YYDEBUG(646, *YYCURSOR);
 	yyaccept = 10;
@@ -11759,7 +11765,7 @@
 	}
 yy690:
 	YYDEBUG(690, *YYCURSOR);
-#line 1470 "ext/date/lib/parse_date.re"
+#line 1476 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("gnudateshort");
@@ -11772,7 +11778,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 11776 "<stdout>"
+#line 11782 "<stdout>"
 yy691:
 	YYDEBUG(691, *YYCURSOR);
 	yyaccept = 12;
@@ -11878,7 +11884,7 @@
 	}
 yy700:
 	YYDEBUG(700, *YYCURSOR);
-#line 1402 "ext/date/lib/parse_date.re"
+#line 1408 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("americanshort | american");
@@ -11893,7 +11899,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_AMERICAN;
 	}
-#line 11897 "<stdout>"
+#line 11903 "<stdout>"
 yy701:
 	YYDEBUG(701, *YYCURSOR);
 	yyaccept = 13;
@@ -12127,7 +12133,7 @@
 	if (yych <= ':') goto yy737;
 yy734:
 	YYDEBUG(734, *YYCURSOR);
-#line 1697 "ext/date/lib/parse_date.re"
+#line 1703 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("clf");
@@ -12147,7 +12153,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_CLF;
 	}
-#line 12151 "<stdout>"
+#line 12157 "<stdout>"
 yy735:
 	YYDEBUG(735, *YYCURSOR);
 	yyaccept = 14;
@@ -12767,7 +12773,7 @@
 	}
 yy808:
 	YYDEBUG(808, *YYCURSOR);
-#line 1430 "ext/date/lib/parse_date.re"
+#line 1436 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("iso8601date2");
@@ -12780,7 +12786,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 12784 "<stdout>"
+#line 12790 "<stdout>"
 yy809:
 	YYDEBUG(809, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -12819,7 +12825,7 @@
 	YYDEBUG(815, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(816, *YYCURSOR);
-#line 1683 "ext/date/lib/parse_date.re"
+#line 1689 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pgtextreverse");
@@ -12832,7 +12838,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_PG_TEXT;
 	}
-#line 12836 "<stdout>"
+#line 12842 "<stdout>"
 yy817:
 	YYDEBUG(817, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -12997,7 +13003,7 @@
 	}
 yy828:
 	YYDEBUG(828, *YYCURSOR);
-#line 1718 "ext/date/lib/parse_date.re"
+#line 1724 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("year4");
 		TIMELIB_INIT;
@@ -13005,7 +13011,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_CLF;
 	}
-#line 13009 "<stdout>"
+#line 13015 "<stdout>"
 yy829:
 	YYDEBUG(829, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -13210,7 +13216,7 @@
 	}
 yy838:
 	YYDEBUG(838, *YYCURSOR);
-#line 1539 "ext/date/lib/parse_date.re"
+#line 1545 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("datenodayrev");
@@ -13223,7 +13229,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_NO_DAY;
 	}
-#line 13227 "<stdout>"
+#line 13233 "<stdout>"
 yy839:
 	YYDEBUG(839, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -13444,7 +13450,7 @@
 	if (yych <= '7') goto yy861;
 yy859:
 	YYDEBUG(859, *YYCURSOR);
-#line 1650 "ext/date/lib/parse_date.re"
+#line 1656 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll w, d;
 		DEBUG_OUTPUT("isoweek");
@@ -13462,7 +13468,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_WEEK;
 	}
-#line 13466 "<stdout>"
+#line 13472 "<stdout>"
 yy860:
 	YYDEBUG(860, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -13472,7 +13478,7 @@
 	YYDEBUG(861, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(862, *YYCURSOR);
-#line 1631 "ext/date/lib/parse_date.re"
+#line 1637 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll w, d;
 		DEBUG_OUTPUT("isoweekday");
@@ -13490,7 +13496,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_WEEK;
 	}
-#line 13494 "<stdout>"
+#line 13500 "<stdout>"
 yy863:
 	YYDEBUG(863, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -13562,7 +13568,7 @@
 	}
 yy866:
 	YYDEBUG(866, *YYCURSOR);
-#line 1617 "ext/date/lib/parse_date.re"
+#line 1623 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("pgydotd");
@@ -13575,7 +13581,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_PG_YEARDAY;
 	}
-#line 13579 "<stdout>"
+#line 13585 "<stdout>"
 yy867:
 	YYDEBUG(867, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -13678,7 +13684,7 @@
 	++YYCURSOR;
 yy887:
 	YYDEBUG(887, *YYCURSOR);
-#line 1591 "ext/date/lib/parse_date.re"
+#line 1597 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("xmlrpc | xmlrpcnocolon | soap | wddx | exif");
@@ -13703,7 +13709,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_XMLRPC_SOAP;
 	}
-#line 13707 "<stdout>"
+#line 13713 "<stdout>"
 yy888:
 	YYDEBUG(888, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -13999,7 +14005,7 @@
 	}
 yy893:
 	YYDEBUG(893, *YYCURSOR);
-#line 1579 "ext/date/lib/parse_date.re"
+#line 1585 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("datenocolon");
 		TIMELIB_INIT;
@@ -14010,7 +14016,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_NOCOLON;
 	}
-#line 14014 "<stdout>"
+#line 14020 "<stdout>"
 yy894:
 	YYDEBUG(894, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -14932,7 +14938,7 @@
 	}
 yy1018:
 	YYDEBUG(1018, *YYCURSOR);
-#line 1456 "ext/date/lib/parse_date.re"
+#line 1462 "ext/date/lib/parse_date.re"
 	{
 		int length = 0;
 		DEBUG_OUTPUT("gnudateshorter");
@@ -14945,7 +14951,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
-#line 14949 "<stdout>"
+#line 14955 "<stdout>"
 yy1019:
 	YYDEBUG(1019, *YYCURSOR);
 	yyaccept = 22;
@@ -16153,7 +16159,7 @@
 	}
 yy1127:
 	YYDEBUG(1127, *YYCURSOR);
-#line 1336 "ext/date/lib/parse_date.re"
+#line 1342 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("gnunocolon");
 		TIMELIB_INIT;
@@ -16175,7 +16181,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_GNU_NOCOLON;
 	}
-#line 16179 "<stdout>"
+#line 16185 "<stdout>"
 yy1128:
 	YYDEBUG(1128, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -16275,7 +16281,7 @@
 	}
 yy1135:
 	YYDEBUG(1135, *YYCURSOR);
-#line 1382 "ext/date/lib/parse_date.re"
+#line 1388 "ext/date/lib/parse_date.re"
 	{
 		int tz_not_found;
 		DEBUG_OUTPUT("iso8601nocolon");
@@ -16294,7 +16300,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_NOCOLON;
 	}
-#line 16298 "<stdout>"
+#line 16304 "<stdout>"
 yy1136:
 	YYDEBUG(1136, *YYCURSOR);
 	yyaccept = 25;
@@ -17270,7 +17276,7 @@
 	}
 yy1179:
 	YYDEBUG(1179, *YYCURSOR);
-#line 1790 "ext/date/lib/parse_date.re"
+#line 1796 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll i;
 		int behavior = 0;
@@ -17286,7 +17292,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 17290 "<stdout>"
+#line 17296 "<stdout>"
 yy1180:
 	YYDEBUG(1180, *YYCURSOR);
 	++YYCURSOR;
@@ -17352,7 +17358,7 @@
 	YYDEBUG(1188, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(1189, *YYCURSOR);
-#line 1249 "ext/date/lib/parse_date.re"
+#line 1255 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll i;
 		int behavior = 0;
@@ -17373,7 +17379,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_WEEK_DAY_OF_MONTH;
 	}
-#line 17377 "<stdout>"
+#line 17383 "<stdout>"
 yy1190:
 	YYDEBUG(1190, *YYCURSOR);
 	yyaccept = 26;
@@ -17513,7 +17519,7 @@
 	}
 yy1206:
 	YYDEBUG(1206, *YYCURSOR);
-#line 1766 "ext/date/lib/parse_date.re"
+#line 1772 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll i;
 		int behavior = 0;
@@ -17536,7 +17542,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 17540 "<stdout>"
+#line 17546 "<stdout>"
 yy1207:
 	YYDEBUG(1207, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -20485,7 +20491,7 @@
 	}
 yy1388:
 	YYDEBUG(1388, *YYCURSOR);
-#line 1226 "ext/date/lib/parse_date.re"
+#line 1232 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("backof | frontof");
 		TIMELIB_INIT;
@@ -20507,7 +20513,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_LF_DAY_OF_MONTH;
 	}
-#line 20511 "<stdout>"
+#line 20517 "<stdout>"
 yy1389:
 	YYDEBUG(1389, *YYCURSOR);
 	yyaccept = 28;
@@ -20806,7 +20812,7 @@
 	YYDEBUG(1410, *YYCURSOR);
 	++YYCURSOR;
 	YYDEBUG(1411, *YYCURSOR);
-#line 1209 "ext/date/lib/parse_date.re"
+#line 1215 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("firstdayof | lastdayof");
 		TIMELIB_INIT;
@@ -20822,7 +20828,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_LF_DAY_OF_MONTH;
 	}
-#line 20826 "<stdout>"
+#line 20832 "<stdout>"
 yy1412:
 	YYDEBUG(1412, *YYCURSOR);
 	yyaccept = 1;
@@ -22344,7 +22350,7 @@
 	if (yych <= '9') goto yy1483;
 yy1485:
 	YYDEBUG(1485, *YYCURSOR);
-#line 1143 "ext/date/lib/parse_date.re"
+#line 1149 "ext/date/lib/parse_date.re"
 	{
 		timelib_ull i;
 
@@ -22369,7 +22375,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 22373 "<stdout>"
+#line 22379 "<stdout>"
 yy1486:
 	YYDEBUG(1486, *YYCURSOR);
 	++YYCURSOR;
@@ -22377,7 +22383,7 @@
 	if (yych <= '9') goto yy1488;
 yy1487:
 	YYDEBUG(1487, *YYCURSOR);
-#line 1169 "ext/date/lib/parse_date.re"
+#line 1175 "ext/date/lib/parse_date.re"
 	{
 		timelib_sll i;
 		timelib_ull us;
@@ -22416,7 +22422,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 22420 "<stdout>"
+#line 22426 "<stdout>"
 yy1488:
 	YYDEBUG(1488, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -22885,7 +22891,7 @@
 	++YYCURSOR;
 yy1524:
 	YYDEBUG(1524, *YYCURSOR);
-#line 1131 "ext/date/lib/parse_date.re"
+#line 1137 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("tomorrow");
 		TIMELIB_INIT;
@@ -22896,7 +22902,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 22900 "<stdout>"
+#line 22906 "<stdout>"
 yy1525:
 	YYDEBUG(1525, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -22931,7 +22937,7 @@
 	}
 yy1527:
 	YYDEBUG(1527, *YYCURSOR);
-#line 1121 "ext/date/lib/parse_date.re"
+#line 1127 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("midnight | today");
 		TIMELIB_INIT;
@@ -22940,7 +22946,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 22944 "<stdout>"
+#line 22950 "<stdout>"
 yy1528:
 	YYDEBUG(1528, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -25035,7 +25041,7 @@
 	}
 yy1612:
 	YYDEBUG(1612, *YYCURSOR);
-#line 1100 "ext/date/lib/parse_date.re"
+#line 1106 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("now");
 		TIMELIB_INIT;
@@ -25043,7 +25049,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 25047 "<stdout>"
+#line 25053 "<stdout>"
 yy1613:
 	YYDEBUG(1613, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -25182,7 +25188,7 @@
 	}
 yy1620:
 	YYDEBUG(1620, *YYCURSOR);
-#line 1109 "ext/date/lib/parse_date.re"
+#line 1115 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("noon");
 		TIMELIB_INIT;
@@ -25193,7 +25199,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 25197 "<stdout>"
+#line 25203 "<stdout>"
 yy1621:
 	YYDEBUG(1621, *YYCURSOR);
 	yyaccept = 1;
@@ -25726,7 +25732,7 @@
 	++YYCURSOR;
 yy1643:
 	YYDEBUG(1643, *YYCURSOR);
-#line 1088 "ext/date/lib/parse_date.re"
+#line 1094 "ext/date/lib/parse_date.re"
 	{
 		DEBUG_OUTPUT("yesterday");
 		TIMELIB_INIT;
@@ -25737,7 +25743,7 @@
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 25741 "<stdout>"
+#line 25747 "<stdout>"
 yy1644:
 	YYDEBUG(1644, *YYCURSOR);
 	yyaccept = 1;
@@ -25910,7 +25916,7 @@
 		goto yy1643;
 	}
 }
-#line 1916 "ext/date/lib/parse_date.re"
+#line 1922 "ext/date/lib/parse_date.re"
 
 }

php-8.1.13.tar.xz/ext/date/lib/parse_date.re -> php-8.1.21.tar.xz/ext/date/lib/parse_date.re Changed

php-8.1.13.tar.xz/ext/date/lib/timelib.h -> php-8.1.21.tar.xz/ext/date/lib/timelib.h Changed

php-8.1.13.tar.xz/ext/date/lib/timezonedb.h -> php-8.1.21.tar.xz/ext/date/lib/timezonedb.h Changed

@@ -4,7 +4,7 @@
 #endif
 
 #ifdef TIMELIB_SUPPORT_SLIM_FILE
-const timelib_tzdb_index_entry timezonedb_idx_builtin596 = {
+const timelib_tzdb_index_entry timezonedb_idx_builtin597 = {
 	{ (char*) "Africa/Abidjan"                    , 0x000000 },
 	{ (char*) "Africa/Accra"                      , 0x00008E },
 	{ (char*) "Africa/Addis_Ababa"                , 0x000356 },
@@ -19,592 +19,593 @@
 	{ (char*) "Africa/Brazzaville"                , 0x000A9B },
 	{ (char*) "Africa/Bujumbura"                  , 0x000B2A },
 	{ (char*) "Africa/Cairo"                      , 0x000BB9 },
-	{ (char*) "Africa/Casablanca"                 , 0x0010C1 },
-	{ (char*) "Africa/Ceuta"                      , 0x00184C },
-	{ (char*) "Africa/Conakry"                    , 0x001A98 },
-	{ (char*) "Africa/Dakar"                      , 0x001B42 },
-	{ (char*) "Africa/Dar_es_Salaam"              , 0x001BE3 },
-	{ (char*) "Africa/Djibouti"                   , 0x001C90 },
-	{ (char*) "Africa/Douala"                     , 0x001D1F },
-	{ (char*) "Africa/El_Aaiun"                   , 0x001DAE },
-	{ (char*) "Africa/Freetown"                   , 0x0024E0 },
-	{ (char*) "Africa/Gaborone"                   , 0x002630 },
-	{ (char*) "Africa/Harare"                     , 0x0026F0 },
-	{ (char*) "Africa/Johannesburg"               , 0x00277F },
-	{ (char*) "Africa/Juba"                       , 0x002849 },
-	{ (char*) "Africa/Kampala"                    , 0x002A1F },
-	{ (char*) "Africa/Khartoum"                   , 0x002AE1 },
-	{ (char*) "Africa/Kigali"                     , 0x002CB7 },
-	{ (char*) "Africa/Kinshasa"                   , 0x002D46 },
-	{ (char*) "Africa/Lagos"                      , 0x002DEE },
-	{ (char*) "Africa/Libreville"                 , 0x002EAE },
-	{ (char*) "Africa/Lome"                       , 0x002F3D },
-	{ (char*) "Africa/Luanda"                     , 0x002FCB },
-	{ (char*) "Africa/Lubumbashi"                 , 0x003069 },
-	{ (char*) "Africa/Lusaka"                     , 0x003124 },
-	{ (char*) "Africa/Malabo"                     , 0x0031B3 },
-	{ (char*) "Africa/Maputo"                     , 0x003255 },
-	{ (char*) "Africa/Maseru"                     , 0x0032E4 },
-	{ (char*) "Africa/Mbabane"                    , 0x00338D },
-	{ (char*) "Africa/Mogadishu"                  , 0x00341E },
-	{ (char*) "Africa/Monrovia"                   , 0x0034CB },
-	{ (char*) "Africa/Nairobi"                    , 0x00357B },
-	{ (char*) "Africa/Ndjamena"                   , 0x003646 },
-	{ (char*) "Africa/Niamey"                     , 0x0036F2 },
-	{ (char*) "Africa/Nouakchott"                 , 0x0037A7 },
-	{ (char*) "Africa/Ouagadougou"                , 0x003851 },
-	{ (char*) "Africa/Porto-Novo"                 , 0x0038DF },
-	{ (char*) "Africa/Sao_Tome"                   , 0x003981 },
-	{ (char*) "Africa/Timbuktu"                   , 0x003A3A },
-	{ (char*) "Africa/Tripoli"                    , 0x003AC8 },
-	{ (char*) "Africa/Tunis"                      , 0x003C83 },
-	{ (char*) "Africa/Windhoek"                   , 0x003E50 },
-	{ (char*) "America/Adak"                      , 0x0040DA },
-	{ (char*) "America/Anchorage"                 , 0x0044BF },
-	{ (char*) "America/Anguilla"                  , 0x0048AF },
-	{ (char*) "America/Antigua"                   , 0x00493D },
-	{ (char*) "America/Araguaina"                 , 0x0049DE },
-	{ (char*) "America/Argentina/Buenos_Aires"    , 0x004C43 },
-	{ (char*) "America/Argentina/Catamarca"       , 0x004F28 },
-	{ (char*) "America/Argentina/ComodRivadavia"  , 0x005213 },
-	{ (char*) "America/Argentina/Cordoba"         , 0x0054E3 },
-	{ (char*) "America/Argentina/Jujuy"           , 0x0057E9 },
-	{ (char*) "America/Argentina/La_Rioja"        , 0x005AB1 },
-	{ (char*) "America/Argentina/Mendoza"         , 0x005D97 },
-	{ (char*) "America/Argentina/Rio_Gallegos"    , 0x006073 },
-	{ (char*) "America/Argentina/Salta"           , 0x006352 },
-	{ (char*) "America/Argentina/San_Juan"        , 0x006626 },
-	{ (char*) "America/Argentina/San_Luis"        , 0x00690C },
-	{ (char*) "America/Argentina/Tucuman"         , 0x006BF2 },
-	{ (char*) "America/Argentina/Ushuaia"         , 0x006EE0 },
-	{ (char*) "America/Aruba"                     , 0x0071C5 },
-	{ (char*) "America/Asuncion"                  , 0x007268 },
-	{ (char*) "America/Atikokan"                  , 0x0075E8 },
-	{ (char*) "America/Atka"                      , 0x0076F5 },
-	{ (char*) "America/Bahia"                     , 0x007ACA },
-	{ (char*) "America/Bahia_Banderas"            , 0x007D85 },
-	{ (char*) "America/Barbados"                  , 0x008089 },
-	{ (char*) "America/Belem"                     , 0x0081AB },
-	{ (char*) "America/Belize"                    , 0x008353 },
-	{ (char*) "America/Blanc-Sablon"              , 0x008774 },
-	{ (char*) "America/Boa_Vista"                 , 0x008869 },
-	{ (char*) "America/Bogota"                    , 0x008A2A },
-	{ (char*) "America/Boise"                     , 0x008AE9 },
-	{ (char*) "America/Buenos_Aires"              , 0x008EFC },
-	{ (char*) "America/Cambridge_Bay"             , 0x0091CC },
-	{ (char*) "America/Campo_Grande"              , 0x0094EC },
-	{ (char*) "America/Cancun"                    , 0x0098C2 },
-	{ (char*) "America/Caracas"                   , 0x009B03 },
-	{ (char*) "America/Catamarca"                 , 0x009BCD },
-	{ (char*) "America/Cayenne"                   , 0x009E9D },
-	{ (char*) "America/Cayman"                    , 0x009F40 },
-	{ (char*) "America/Chicago"                   , 0x009FE1 },
-	{ (char*) "America/Chihuahua"                 , 0x00A6DB },
-	{ (char*) "America/Coral_Harbour"             , 0x00A9C0 },
-	{ (char*) "America/Cordoba"                   , 0x00AA61 },
-	{ (char*) "America/Costa_Rica"                , 0x00AD31 },
-	{ (char*) "America/Creston"                   , 0x00AE25 },
-	{ (char*) "America/Cuiaba"                    , 0x00AEE1 },
-	{ (char*) "America/Curacao"                   , 0x00B29E },
-	{ (char*) "America/Danmarkshavn"              , 0x00B341 },
-	{ (char*) "America/Dawson"                    , 0x00B526 },
-	{ (char*) "America/Dawson_Creek"              , 0x00B949 },
-	{ (char*) "America/Denver"                    , 0x00BC20 },
-	{ (char*) "America/Detroit"                   , 0x00C053 },
-	{ (char*) "America/Dominica"                  , 0x00C3FB },
-	{ (char*) "America/Edmonton"                  , 0x00C489 },
-	{ (char*) "America/Eirunepe"                  , 0x00C87C },
-	{ (char*) "America/El_Salvador"               , 0x00CA4B },
-	{ (char*) "America/Ensenada"                  , 0x00CB07 },
-	{ (char*) "America/Fort_Nelson"               , 0x00CF14 },
-	{ (char*) "America/Fort_Wayne"                , 0x00D4DC },
-	{ (char*) "America/Fortaleza"                 , 0x00D6FB },
-	{ (char*) "America/Glace_Bay"                 , 0x00D911 },
-	{ (char*) "America/Godthab"                   , 0x00DCA8 },
-	{ (char*) "America/Goose_Bay"                 , 0x00DE85 },
-	{ (char*) "America/Grand_Turk"                , 0x00E4DD },
-	{ (char*) "America/Grenada"                   , 0x00E83E },
-	{ (char*) "America/Guadeloupe"                , 0x00E8CC },
-	{ (char*) "America/Guatemala"                 , 0x00E95A },
-	{ (char*) "America/Guayaquil"                 , 0x00EA3A },
-	{ (char*) "America/Guyana"                    , 0x00EB0B },
-	{ (char*) "America/Halifax"                   , 0x00EBCC },
-	{ (char*) "America/Havana"                    , 0x00F27E },
-	{ (char*) "America/Hermosillo"                , 0x00F6E7 },
-	{ (char*) "America/Indiana/Indianapolis"      , 0x00F830 },
-	{ (char*) "America/Indiana/Knox"              , 0x00FA68 },
-	{ (char*) "America/Indiana/Marengo"           , 0x00FE81 },
-	{ (char*) "America/Indiana/Petersburg"        , 0x0100DB },
-	{ (char*) "America/Indiana/Tell_City"         , 0x0103A5 },
-	{ (char*) "America/Indiana/Vevay"             , 0x0105CF },
-	{ (char*) "America/Indiana/Vincennes"         , 0x010766 },
-	{ (char*) "America/Indiana/Winamac"           , 0x0109BC },
-	{ (char*) "America/Indianapolis"              , 0x010C42 },
-	{ (char*) "America/Inuvik"                    , 0x010E61 },
-	{ (char*) "America/Iqaluit"                   , 0x01113E },
-	{ (char*) "America/Jamaica"                   , 0x01144C },
-	{ (char*) "America/Jujuy"                     , 0x0115AB },
-	{ (char*) "America/Juneau"                    , 0x011869 },
-	{ (char*) "America/Kentucky/Louisville"       , 0x011C4F },
-	{ (char*) "America/Kentucky/Monticello"       , 0x012153 },
-	{ (char*) "America/Knox_IN"                   , 0x01253F },
-	{ (char*) "America/Kralendijk"                , 0x012943 },
-	{ (char*) "America/La_Paz"                    , 0x012A00 },
-	{ (char*) "America/Lima"                      , 0x012AB6 },
-	{ (char*) "America/Los_Angeles"               , 0x012BDD },
-	{ (char*) "America/Louisville"                , 0x0130FE },
-	{ (char*) "America/Lower_Princes"             , 0x0135E4 },
-	{ (char*) "America/Maceio"                    , 0x0136A1 },
-	{ (char*) "America/Managua"                   , 0x0138B3 },
-	{ (char*) "America/Manaus"                    , 0x0139E6 },
-	{ (char*) "America/Marigot"                   , 0x013B9D },
-	{ (char*) "America/Martinique"                , 0x013C5A },
-	{ (char*) "America/Matamoros"                 , 0x013D18 },
-	{ (char*) "America/Mazatlan"                  , 0x013F17 },
-	{ (char*) "America/Mendoza"                   , 0x014226 },
-	{ (char*) "America/Menominee"                 , 0x0144F6 },
-	{ (char*) "America/Merida"                    , 0x0148B6 },
-	{ (char*) "America/Metlakatla"                , 0x014B70 },
-	{ (char*) "America/Mexico_City"               , 0x014DE6 },
-	{ (char*) "America/Miquelon"                  , 0x015103 },
-	{ (char*) "America/Moncton"                   , 0x015335 },
-	{ (char*) "America/Monterrey"                 , 0x01592E },
-	{ (char*) "America/Montevideo"                , 0x015C03 },
-	{ (char*) "America/Montreal"                  , 0x015FD8 },
-	{ (char*) "America/Montserrat"                , 0x016699 },
-	{ (char*) "America/Nassau"                    , 0x016727 },
-	{ (char*) "America/New_York"                  , 0x016B21 },
-	{ (char*) "America/Nipigon"                   , 0x017211 },
-	{ (char*) "America/Nome"                      , 0x0178D2 },
-	{ (char*) "America/Noronha"                   , 0x017CBA },
-	{ (char*) "America/North_Dakota/Beulah"       , 0x017EBA },
-	{ (char*) "America/North_Dakota/Center"       , 0x0182EE },
-	{ (char*) "America/North_Dakota/New_Salem"    , 0x0186ED },
-	{ (char*) "America/Nuuk"                      , 0x018AF2 },
-	{ (char*) "America/Ojinaga"                   , 0x018CE5 },
-	{ (char*) "America/Panama"                    , 0x018FCC },
-	{ (char*) "America/Pangnirtung"               , 0x01906D },
-	{ (char*) "America/Paramaribo"                , 0x019394 },
-	{ (char*) "America/Phoenix"                   , 0x01945B },
-	{ (char*) "America/Port-au-Prince"            , 0x019574 },
-	{ (char*) "America/Port_of_Spain"             , 0x0197B5 },
-	{ (char*) "America/Porto_Acre"                , 0x019843 },
-	{ (char*) "America/Porto_Velho"               , 0x0199F1 },
-	{ (char*) "America/Puerto_Rico"               , 0x019B8F },
-	{ (char*) "America/Punta_Arenas"              , 0x019C4C },
-	{ (char*) "America/Rainy_River"               , 0x01A12E },
-	{ (char*) "America/Rankin_Inlet"              , 0x01A648 },
-	{ (char*) "America/Recife"                    , 0x01A91E },
-	{ (char*) "America/Regina"                    , 0x01AB18 },
-	{ (char*) "America/Resolute"                  , 0x01ADB7 },
-	{ (char*) "America/Rio_Branco"                , 0x01B08E },
-	{ (char*) "America/Rosario"                   , 0x01B240 },
-	{ (char*) "America/Santa_Isabel"              , 0x01B510 },
-	{ (char*) "America/Santarem"                  , 0x01B91D },
-	{ (char*) "America/Santiago"                  , 0x01BACD },
-	{ (char*) "America/Santo_Domingo"             , 0x01C035 },
-	{ (char*) "America/Sao_Paulo"                 , 0x01C17E },
-	{ (char*) "America/Scoresbysund"              , 0x01C578 },
-	{ (char*) "America/Shiprock"                  , 0x01C780 },
-	{ (char*) "America/Sitka"                     , 0x01CB9E },
-	{ (char*) "America/St_Barthelemy"             , 0x01CF79 },
-	{ (char*) "America/St_Johns"                  , 0x01D036 },
-	{ (char*) "America/St_Kitts"                  , 0x01D7BA },
-	{ (char*) "America/St_Lucia"                  , 0x01D848 },
-	{ (char*) "America/St_Thomas"                 , 0x01D8E9 },
-	{ (char*) "America/St_Vincent"                , 0x01D977 },
-	{ (char*) "America/Swift_Current"             , 0x01DA18 },
-	{ (char*) "America/Tegucigalpa"               , 0x01DBA6 },
-	{ (char*) "America/Thule"                     , 0x01DC74 },
-	{ (char*) "America/Thunder_Bay"               , 0x01DE55 },
-	{ (char*) "America/Tijuana"                   , 0x01E516 },
-	{ (char*) "America/Toronto"                   , 0x01E944 },
-	{ (char*) "America/Tortola"                   , 0x01F022 },
-	{ (char*) "America/Vancouver"                 , 0x01F0B0 },
-	{ (char*) "America/Virgin"                    , 0x01F607 },
-	{ (char*) "America/Whitehorse"                , 0x01F6C4 },
-	{ (char*) "America/Winnipeg"                  , 0x01FAE7 },
-	{ (char*) "America/Yakutat"                   , 0x02001E },
-	{ (char*) "America/Yellowknife"               , 0x0203EC },
-	{ (char*) "Antarctica/Casey"                  , 0x0206E8 },
-	{ (char*) "Antarctica/Davis"                  , 0x0207EC },
-	{ (char*) "Antarctica/DumontDUrville"         , 0x0208C2 },
-	{ (char*) "Antarctica/Macquarie"              , 0x020976 },
-	{ (char*) "Antarctica/Mawson"                 , 0x020D62 },
-	{ (char*) "Antarctica/McMurdo"                , 0x020E0C },
-	{ (char*) "Antarctica/Palmer"                 , 0x02113E },
-	{ (char*) "Antarctica/Rothera"                , 0x0214C7 },
-	{ (char*) "Antarctica/South_Pole"             , 0x02155E },
-	{ (char*) "Antarctica/Syowa"                  , 0x02197D },
-	{ (char*) "Antarctica/Troll"                  , 0x021A13 },
-	{ (char*) "Antarctica/Vostok"                 , 0x021AD5 },
-	{ (char*) "Arctic/Longyearbyen"               , 0x021B6C },
-	{ (char*) "Asia/Aden"                         , 0x021E39 },
-	{ (char*) "Asia/Almaty"                       , 0x021ECA },
-	{ (char*) "Asia/Amman"                        , 0x02214E },
-	{ (char*) "Asia/Anadyr"                       , 0x0224FA },
-	{ (char*) "Asia/Aqtau"                        , 0x022800 },
-	{ (char*) "Asia/Aqtobe"                       , 0x022A7F },
-	{ (char*) "Asia/Ashgabat"                     , 0x022CFF },
-	{ (char*) "Asia/Ashkhabad"                    , 0x022E82 },
-	{ (char*) "Asia/Atyrau"                       , 0x023005 },
-	{ (char*) "Asia/Baghdad"                      , 0x02328E },
-	{ (char*) "Asia/Bahrain"                      , 0x023510 },
-	{ (char*) "Asia/Baku"                         , 0x0235C9 },
-	{ (char*) "Asia/Bangkok"                      , 0x0238BD },
-	{ (char*) "Asia/Barnaul"                      , 0x023961 },
-	{ (char*) "Asia/Beirut"                       , 0x023C6C },
-	{ (char*) "Asia/Bishkek"                      , 0x023F54 },
-	{ (char*) "Asia/Brunei"                       , 0x0241CA },
-	{ (char*) "Asia/Calcutta"                     , 0x024270 },
-	{ (char*) "Asia/Chita"                        , 0x024358 },
-	{ (char*) "Asia/Choibalsan"                   , 0x024666 },
-	{ (char*) "Asia/Chongqing"                    , 0x0248EF },
-	{ (char*) "Asia/Chungking"                    , 0x024A84 },
-	{ (char*) "Asia/Colombo"                      , 0x024C19 },
-	{ (char*) "Asia/Dacca"                        , 0x024D1C },
-	{ (char*) "Asia/Damascus"                     , 0x024E0F },
-	{ (char*) "Asia/Dhaka"                        , 0x0252ED },
-	{ (char*) "Asia/Dili"                         , 0x0253E0 },
-	{ (char*) "Asia/Dubai"                        , 0x025496 },
-	{ (char*) "Asia/Dushanbe"                     , 0x025527 },
-	{ (char*) "Asia/Famagusta"                    , 0x0256A1 },
-	{ (char*) "Asia/Gaza"                         , 0x025A68 },
-	{ (char*) "Asia/Harbin"                       , 0x025F68 },
-	{ (char*) "Asia/Hebron"                       , 0x0260FD },
-	{ (char*) "Asia/Ho_Chi_Minh"                  , 0x02660E },
-	{ (char*) "Asia/Hong_Kong"                    , 0x026706 },
-	{ (char*) "Asia/Hovd"                         , 0x026A19 },
-	{ (char*) "Asia/Irkutsk"                      , 0x026CA2 },
-	{ (char*) "Asia/Istanbul"                     , 0x026FC0 },
-	{ (char*) "Asia/Jakarta"                      , 0x02747C },
-	{ (char*) "Asia/Jayapura"                     , 0x02758D },
-	{ (char*) "Asia/Jerusalem"                    , 0x02767A },
-	{ (char*) "Asia/Kabul"                        , 0x027AB8 },
-	{ (char*) "Asia/Kamchatka"                    , 0x027B63 },
-	{ (char*) "Asia/Karachi"                      , 0x027E58 },
-	{ (char*) "Asia/Kashgar"                      , 0x027F6E },
-	{ (char*) "Asia/Kathmandu"                    , 0x027FFF },
-	{ (char*) "Asia/Katmandu"                     , 0x0280AC },
-	{ (char*) "Asia/Khandyga"                     , 0x028159 },
-	{ (char*) "Asia/Kolkata"                      , 0x02848A },
-	{ (char*) "Asia/Krasnoyarsk"                  , 0x028572 },
-	{ (char*) "Asia/Kuala_Lumpur"                 , 0x02887C },
-	{ (char*) "Asia/Kuching"                      , 0x02899C },
-	{ (char*) "Asia/Kuwait"                       , 0x028AF6 },
-	{ (char*) "Asia/Macao"                        , 0x028B87 },
-	{ (char*) "Asia/Macau"                        , 0x028EAA },
-	{ (char*) "Asia/Magadan"                      , 0x0291CD },
-	{ (char*) "Asia/Makassar"                     , 0x0294D8 },
-	{ (char*) "Asia/Manila"                       , 0x0295EB },
-	{ (char*) "Asia/Muscat"                       , 0x0296E5 },
-	{ (char*) "Asia/Nicosia"                      , 0x029776 },
-	{ (char*) "Asia/Novokuznetsk"                 , 0x0299EA },
-	{ (char*) "Asia/Novosibirsk"                  , 0x029CDD },
-	{ (char*) "Asia/Omsk"                         , 0x029FEE },
-	{ (char*) "Asia/Oral"                         , 0x02A2EC },
-	{ (char*) "Asia/Phnom_Penh"                   , 0x02A578 },
-	{ (char*) "Asia/Pontianak"                    , 0x02A64C },
-	{ (char*) "Asia/Pyongyang"                    , 0x02A765 },
-	{ (char*) "Asia/Qatar"                        , 0x02A828 },
-	{ (char*) "Asia/Qostanay"                     , 0x02A8CC },
-	{ (char*) "Asia/Qyzylorda"                    , 0x02AB59 },
-	{ (char*) "Asia/Rangoon"                      , 0x02ADF2 },
-	{ (char*) "Asia/Riyadh"                       , 0x02AEB9 },
-	{ (char*) "Asia/Saigon"                       , 0x02AF4A },
-	{ (char*) "Asia/Sakhalin"                     , 0x02B042 },
-	{ (char*) "Asia/Samarkand"                    , 0x02B359 },
-	{ (char*) "Asia/Seoul"                        , 0x02B4E4 },
-	{ (char*) "Asia/Shanghai"                     , 0x02B68F },
-	{ (char*) "Asia/Singapore"                    , 0x02B830 },
-	{ (char*) "Asia/Srednekolymsk"                , 0x02B93C },
-	{ (char*) "Asia/Taipei"                       , 0x02BC50 },
-	{ (char*) "Asia/Tashkent"                     , 0x02BE5B },
-	{ (char*) "Asia/Tbilisi"                      , 0x02BFE6 },
-	{ (char*) "Asia/Tehran"                       , 0x02C267 },
-	{ (char*) "Asia/Tel_Aviv"                     , 0x02C59F },
-	{ (char*) "Asia/Thimbu"                       , 0x02C9DD },
-	{ (char*) "Asia/Thimphu"                      , 0x02CA83 },
-	{ (char*) "Asia/Tokyo"                        , 0x02CB29 },
-	{ (char*) "Asia/Tomsk"                        , 0x02CC0A },
-	{ (char*) "Asia/Ujung_Pandang"                , 0x02CF15 },
-	{ (char*) "Asia/Ulaanbaatar"                  , 0x02CFDF },
-	{ (char*) "Asia/Ulan_Bator"                   , 0x02D252 },
-	{ (char*) "Asia/Urumqi"                       , 0x02D4B0 },
-	{ (char*) "Asia/Ust-Nera"                     , 0x02D54E },
-	{ (char*) "Asia/Vientiane"                    , 0x02D871 },
-	{ (char*) "Asia/Vladivostok"                  , 0x02D957 },
-	{ (char*) "Asia/Yakutsk"                      , 0x02DC5C },
-	{ (char*) "Asia/Yangon"                       , 0x02DF60 },
-	{ (char*) "Asia/Yekaterinburg"                , 0x02E027 },
-	{ (char*) "Asia/Yerevan"                      , 0x02E339 },
-	{ (char*) "Atlantic/Azores"                   , 0x02E609 },
-	{ (char*) "Atlantic/Bermuda"                  , 0x02EBC8 },
-	{ (char*) "Atlantic/Canary"                   , 0x02EFD4 },
-	{ (char*) "Atlantic/Cape_Verde"               , 0x02F1CC },
-	{ (char*) "Atlantic/Faeroe"                   , 0x02F287 },
-	{ (char*) "Atlantic/Faroe"                    , 0x02F44C },
-	{ (char*) "Atlantic/Jan_Mayen"                , 0x02F611 },
-	{ (char*) "Atlantic/Madeira"                  , 0x02F8DE },
-	{ (char*) "Atlantic/Reykjavik"                , 0x02FEA6 },
-	{ (char*) "Atlantic/South_Georgia"            , 0x0301A3 },
-	{ (char*) "Atlantic/St_Helena"                , 0x030233 },
-	{ (char*) "Atlantic/Stanley"                  , 0x0302D4 },
-	{ (char*) "Australia/ACT"                     , 0x0305F5 },
-	{ (char*) "Australia/Adelaide"                , 0x030989 },
-	{ (char*) "Australia/Brisbane"                , 0x030D3D },
-	{ (char*) "Australia/Broken_Hill"             , 0x030E81 },
-	{ (char*) "Australia/Canberra"                , 0x031256 },
-	{ (char*) "Australia/Currie"                  , 0x0315EA },
-	{ (char*) "Australia/Darwin"                  , 0x0319E1 },
-	{ (char*) "Australia/Eucla"                   , 0x031AE9 },
-	{ (char*) "Australia/Hobart"                  , 0x031C48 },
-	{ (char*) "Australia/LHI"                     , 0x032047 },
-	{ (char*) "Australia/Lindeman"                , 0x032307 },
-	{ (char*) "Australia/Lord_Howe"               , 0x032477 },
-	{ (char*) "Australia/Melbourne"               , 0x032747 },
-	{ (char*) "Australia/North"                   , 0x032AE3 },
-	{ (char*) "Australia/NSW"                     , 0x032BD9 },
-	{ (char*) "Australia/Perth"                   , 0x032F6D },
-	{ (char*) "Australia/Queensland"              , 0x0330C9 },
-	{ (char*) "Australia/South"                   , 0x0331F6 },
-	{ (char*) "Australia/Sydney"                  , 0x03359B },
-	{ (char*) "Australia/Tasmania"                , 0x03394B },
-	{ (char*) "Australia/Victoria"                , 0x033D42 },
-	{ (char*) "Australia/West"                    , 0x0340D6 },
-	{ (char*) "Australia/Yancowinna"              , 0x034214 },
-	{ (char*) "Brazil/Acre"                       , 0x0345CD },
-	{ (char*) "Brazil/DeNoronha"                  , 0x03477B },
-	{ (char*) "Brazil/East"                       , 0x03496B },
-	{ (char*) "Brazil/West"                       , 0x034D2F },
-	{ (char*) "Canada/Atlantic"                   , 0x034ED7 },
-	{ (char*) "Canada/Central"                    , 0x03556B },
-	{ (char*) "Canada/Eastern"                    , 0x035A85 },
-	{ (char*) "Canada/Mountain"                   , 0x036146 },
-	{ (char*) "Canada/Newfoundland"               , 0x03651C },
-	{ (char*) "Canada/Pacific"                    , 0x036C7E },
-	{ (char*) "Canada/Saskatchewan"               , 0x0371BC },
-	{ (char*) "Canada/Yukon"                      , 0x037446 },
-	{ (char*) "CET"                               , 0x037857 },
-	{ (char*) "Chile/Continental"                 , 0x037AD0 },
-	{ (char*) "Chile/EasterIsland"                , 0x038026 },
-	{ (char*) "CST6CDT"                           , 0x0384C8 },
-	{ (char*) "Cuba"                              , 0x03888B },
-	{ (char*) "EET"                               , 0x038CF4 },
-	{ (char*) "Egypt"                             , 0x038EF1 },
-	{ (char*) "Eire"                              , 0x0393F9 },
-	{ (char*) "EST"                               , 0x0399DD },
-	{ (char*) "EST5EDT"                           , 0x039A58 },
-	{ (char*) "Etc/GMT"                           , 0x039E1B },
-	{ (char*) "Etc/GMT+0"                         , 0x039E96 },
-	{ (char*) "Etc/GMT+1"                         , 0x039F11 },
-	{ (char*) "Etc/GMT+10"                        , 0x039F8E },
-	{ (char*) "Etc/GMT+11"                        , 0x03A00C },
-	{ (char*) "Etc/GMT+12"                        , 0x03A08A },
-	{ (char*) "Etc/GMT+2"                         , 0x03A108 },
-	{ (char*) "Etc/GMT+3"                         , 0x03A185 },
-	{ (char*) "Etc/GMT+4"                         , 0x03A202 },
-	{ (char*) "Etc/GMT+5"                         , 0x03A27F },
-	{ (char*) "Etc/GMT+6"                         , 0x03A2FC },
-	{ (char*) "Etc/GMT+7"                         , 0x03A379 },
-	{ (char*) "Etc/GMT+8"                         , 0x03A3F6 },
-	{ (char*) "Etc/GMT+9"                         , 0x03A473 },
-	{ (char*) "Etc/GMT-0"                         , 0x03A4F0 },
-	{ (char*) "Etc/GMT-1"                         , 0x03A56B },
-	{ (char*) "Etc/GMT-10"                        , 0x03A5E9 },
-	{ (char*) "Etc/GMT-11"                        , 0x03A668 },
-	{ (char*) "Etc/GMT-12"                        , 0x03A6E7 },
-	{ (char*) "Etc/GMT-13"                        , 0x03A766 },
-	{ (char*) "Etc/GMT-14"                        , 0x03A7E5 },
-	{ (char*) "Etc/GMT-2"                         , 0x03A864 },
-	{ (char*) "Etc/GMT-3"                         , 0x03A8E2 },
-	{ (char*) "Etc/GMT-4"                         , 0x03A960 },
-	{ (char*) "Etc/GMT-5"                         , 0x03A9DE },
-	{ (char*) "Etc/GMT-6"                         , 0x03AA5C },
-	{ (char*) "Etc/GMT-7"                         , 0x03AADA },
-	{ (char*) "Etc/GMT-8"                         , 0x03AB58 },
-	{ (char*) "Etc/GMT-9"                         , 0x03ABD6 },
-	{ (char*) "Etc/GMT0"                          , 0x03AC54 },
-	{ (char*) "Etc/Greenwich"                     , 0x03ACCF },
-	{ (char*) "Etc/UCT"                           , 0x03AD4A },
-	{ (char*) "Etc/Universal"                     , 0x03ADC5 },
-	{ (char*) "Etc/UTC"                           , 0x03AE40 },
-	{ (char*) "Etc/Zulu"                          , 0x03AEBB },
-	{ (char*) "Europe/Amsterdam"                  , 0x03AF36 },
-	{ (char*) "Europe/Andorra"                    , 0x03B371 },
-	{ (char*) "Europe/Astrakhan"                  , 0x03B502 },
-	{ (char*) "Europe/Athens"                     , 0x03B7F6 },
-	{ (char*) "Europe/Belfast"                    , 0x03BAAC },
-	{ (char*) "Europe/Belgrade"                   , 0x03C0F7 },
-	{ (char*) "Europe/Berlin"                     , 0x03C2E1 },
-	{ (char*) "Europe/Bratislava"                 , 0x03C5C2 },
-	{ (char*) "Europe/Brussels"                   , 0x03C8A1 },
-	{ (char*) "Europe/Bucharest"                  , 0x03CCFC },
-	{ (char*) "Europe/Budapest"                   , 0x03CF9D },
-	{ (char*) "Europe/Busingen"                   , 0x03D2A7 },
-	{ (char*) "Europe/Chisinau"                   , 0x03D4AC },
-	{ (char*) "Europe/Copenhagen"                 , 0x03D7AB },
-	{ (char*) "Europe/Dublin"                     , 0x03DA26 },
-	{ (char*) "Europe/Gibraltar"                  , 0x03E00A },
-	{ (char*) "Europe/Guernsey"                   , 0x03E4DA },
-	{ (char*) "Europe/Helsinki"                   , 0x03EB31 },
-	{ (char*) "Europe/Isle_of_Man"                , 0x03ED1E },
-	{ (char*) "Europe/Istanbul"                   , 0x03F369 },
-	{ (char*) "Europe/Jersey"                     , 0x03F825 },
-	{ (char*) "Europe/Kaliningrad"                , 0x03FE7C },
-	{ (char*) "Europe/Kiev"                       , 0x040224 },
-	{ (char*) "Europe/Kirov"                      , 0x04045E },
-	{ (char*) "Europe/Kyiv"                       , 0x040745 },
-	{ (char*) "Europe/Lisbon"                     , 0x040993 },
-	{ (char*) "Europe/Ljubljana"                  , 0x040F60 },
-	{ (char*) "Europe/London"                     , 0x04114A },
-	{ (char*) "Europe/Luxembourg"                 , 0x041795 },
-	{ (char*) "Europe/Madrid"                     , 0x041BE0 },
-	{ (char*) "Europe/Malta"                      , 0x041F7D },
-	{ (char*) "Europe/Mariehamn"                  , 0x042329 },
-	{ (char*) "Europe/Minsk"                      , 0x042516 },
-	{ (char*) "Europe/Monaco"                     , 0x04284A },
-	{ (char*) "Europe/Moscow"                     , 0x042CB0 },
-	{ (char*) "Europe/Nicosia"                    , 0x04305C },
-	{ (char*) "Europe/Oslo"                       , 0x0432BD },
-	{ (char*) "Europe/Paris"                      , 0x04356D },
-	{ (char*) "Europe/Podgorica"                  , 0x0439CA },
-	{ (char*) "Europe/Prague"                     , 0x043BB4 },
-	{ (char*) "Europe/Riga"                       , 0x043E93 },
-	{ (char*) "Europe/Rome"                       , 0x044155 },
-	{ (char*) "Europe/Samara"                     , 0x044514 },
-	{ (char*) "Europe/San_Marino"                 , 0x044815 },
-	{ (char*) "Europe/Sarajevo"                   , 0x044BD4 },
-	{ (char*) "Europe/Saratov"                    , 0x044DBE },
-	{ (char*) "Europe/Simferopol"                 , 0x0450B0 },
-	{ (char*) "Europe/Skopje"                     , 0x045423 },
-	{ (char*) "Europe/Sofia"                      , 0x04560D },
-	{ (char*) "Europe/Stockholm"                  , 0x045869 },
-	{ (char*) "Europe/Tallinn"                    , 0x045A66 },
-	{ (char*) "Europe/Tirane"                     , 0x045D15 },
-	{ (char*) "Europe/Tiraspol"                   , 0x045F7D },
-	{ (char*) "Europe/Ulyanovsk"                  , 0x04627C },
-	{ (char*) "Europe/Uzhgorod"                   , 0x046592 },
-	{ (char*) "Europe/Vaduz"                      , 0x0467CC },
-	{ (char*) "Europe/Vatican"                    , 0x0469B6 },
-	{ (char*) "Europe/Vienna"                     , 0x046D75 },
-	{ (char*) "Europe/Vilnius"                    , 0x047013 },
-	{ (char*) "Europe/Volgograd"                  , 0x0472C3 },
-	{ (char*) "Europe/Warsaw"                     , 0x0475C0 },
-	{ (char*) "Europe/Zagreb"                     , 0x047967 },
-	{ (char*) "Europe/Zaporozhye"                 , 0x047B51 },
-	{ (char*) "Europe/Zurich"                     , 0x047D8B },
-	{ (char*) "Factory"                           , 0x047F88 },
-	{ (char*) "GB"                                , 0x048005 },
-	{ (char*) "GB-Eire"                           , 0x048650 },
-	{ (char*) "GMT"                               , 0x048C9B },
-	{ (char*) "GMT+0"                             , 0x048D16 },
-	{ (char*) "GMT-0"                             , 0x048D91 },
-	{ (char*) "GMT0"                              , 0x048E0C },
-	{ (char*) "Greenwich"                         , 0x048E87 },
-	{ (char*) "Hongkong"                          , 0x048F02 },
-	{ (char*) "HST"                               , 0x049215 },
-	{ (char*) "Iceland"                           , 0x049291 },
-	{ (char*) "Indian/Antananarivo"               , 0x04931F },
-	{ (char*) "Indian/Chagos"                     , 0x0493CB },
-	{ (char*) "Indian/Christmas"                  , 0x04946F },
-	{ (char*) "Indian/Cocos"                      , 0x049500 },
-	{ (char*) "Indian/Comoro"                     , 0x049598 },
-	{ (char*) "Indian/Kerguelen"                  , 0x049627 },
-	{ (char*) "Indian/Mahe"                       , 0x0496B8 },
-	{ (char*) "Indian/Maldives"                   , 0x049749 },
-	{ (char*) "Indian/Mauritius"                  , 0x0497ED },
-	{ (char*) "Indian/Mayotte"                    , 0x0498AC },
-	{ (char*) "Indian/Reunion"                    , 0x04993B },
-	{ (char*) "Iran"                              , 0x0499CC },
-	{ (char*) "Israel"                            , 0x049D04 },
-	{ (char*) "Jamaica"                           , 0x04A142 },
-	{ (char*) "Japan"                             , 0x04A2A1 },
-	{ (char*) "Kwajalein"                         , 0x04A382 },
-	{ (char*) "Libya"                             , 0x04A469 },
-	{ (char*) "MET"                               , 0x04A624 },
-	{ (char*) "Mexico/BajaNorte"                  , 0x04A89D },
-	{ (char*) "Mexico/BajaSur"                    , 0x04ACAA },
-	{ (char*) "Mexico/General"                    , 0x04AF84 },
-	{ (char*) "MST"                               , 0x04B295 },
-	{ (char*) "MST7MDT"                           , 0x04B310 },
-	{ (char*) "Navajo"                            , 0x04B6D3 },
-	{ (char*) "NZ"                                , 0x04BAF1 },
-	{ (char*) "NZ-CHAT"                           , 0x04BF10 },
-	{ (char*) "Pacific/Apia"                      , 0x04C244 },
-	{ (char*) "Pacific/Auckland"                  , 0x04C3E7 },
-	{ (char*) "Pacific/Bougainville"              , 0x04C81E },
-	{ (char*) "Pacific/Chatham"                   , 0x04C8FF },
-	{ (char*) "Pacific/Chuuk"                     , 0x04CC42 },
-	{ (char*) "Pacific/Easter"                    , 0x04CD20 },
-	{ (char*) "Pacific/Efate"                     , 0x04D1CF },
-	{ (char*) "Pacific/Enderbury"                 , 0x04D331 },
-	{ (char*) "Pacific/Fakaofo"                   , 0x04D3E9 },
-	{ (char*) "Pacific/Fiji"                      , 0x04D48E },
-	{ (char*) "Pacific/Funafuti"                  , 0x04D626 },
-	{ (char*) "Pacific/Galapagos"                 , 0x04D6B8 },
-	{ (char*) "Pacific/Gambier"                   , 0x04D784 },
-	{ (char*) "Pacific/Guadalcanal"               , 0x04D823 },
-	{ (char*) "Pacific/Guam"                      , 0x04D8B5 },
-	{ (char*) "Pacific/Honolulu"                  , 0x04DA1F },
-	{ (char*) "Pacific/Johnston"                  , 0x04DB0E },
-	{ (char*) "Pacific/Kanton"                    , 0x04DBF7 },
-	{ (char*) "Pacific/Kiritimati"                , 0x04DCBE },
-	{ (char*) "Pacific/Kosrae"                    , 0x04DD84 },
-	{ (char*) "Pacific/Kwajalein"                 , 0x04DE88 },
-	{ (char*) "Pacific/Majuro"                    , 0x04DF78 },
-	{ (char*) "Pacific/Marquesas"                 , 0x04E07B },
-	{ (char*) "Pacific/Midway"                    , 0x04E123 },
-	{ (char*) "Pacific/Nauru"                     , 0x04E1E6 },
-	{ (char*) "Pacific/Niue"                      , 0x04E2A9 },
-	{ (char*) "Pacific/Norfolk"                   , 0x04E34F },
-	{ (char*) "Pacific/Noumea"                    , 0x04E452 },
-	{ (char*) "Pacific/Pago_Pago"                 , 0x04E524 },
-	{ (char*) "Pacific/Palau"                     , 0x04E5C2 },
-	{ (char*) "Pacific/Pitcairn"                  , 0x04E662 },
-	{ (char*) "Pacific/Pohnpei"                   , 0x04E707 },
-	{ (char*) "Pacific/Ponape"                    , 0x04E7F7 },
-	{ (char*) "Pacific/Port_Moresby"              , 0x04E889 },
-	{ (char*) "Pacific/Rarotonga"                 , 0x04E94C },
-	{ (char*) "Pacific/Saipan"                    , 0x04EAEE },
-	{ (char*) "Pacific/Samoa"                     , 0x04EC4F },
-	{ (char*) "Pacific/Tahiti"                    , 0x04ECED },
-	{ (char*) "Pacific/Tarawa"                    , 0x04ED8D },
-	{ (char*) "Pacific/Tongatapu"                 , 0x04EE2E },
-	{ (char*) "Pacific/Truk"                      , 0x04EF27 },
-	{ (char*) "Pacific/Wake"                      , 0x04EFCD },
-	{ (char*) "Pacific/Wallis"                    , 0x04F06A },
-	{ (char*) "Pacific/Yap"                       , 0x04F0FC },
-	{ (char*) "Poland"                            , 0x04F1A2 },
-	{ (char*) "Portugal"                          , 0x04F549 },
-	{ (char*) "PRC"                               , 0x04FB03 },
-	{ (char*) "PST8PDT"                           , 0x04FC98 },
-	{ (char*) "ROC"                               , 0x05005B },
-	{ (char*) "ROK"                               , 0x050266 },
-	{ (char*) "Singapore"                         , 0x050411 },
-	{ (char*) "Turkey"                            , 0x05051D },
-	{ (char*) "UCT"                               , 0x0509D9 },
-	{ (char*) "Universal"                         , 0x050A54 },
-	{ (char*) "US/Alaska"                         , 0x050ACF },
-	{ (char*) "US/Aleutian"                       , 0x050EAC },
-	{ (char*) "US/Arizona"                        , 0x051281 },
-	{ (char*) "US/Central"                        , 0x05137D },
-	{ (char*) "US/East-Indiana"                   , 0x051A63 },
-	{ (char*) "US/Eastern"                        , 0x051C82 },
-	{ (char*) "US/Hawaii"                         , 0x05235E },
-	{ (char*) "US/Indiana-Starke"                 , 0x052447 },
-	{ (char*) "US/Michigan"                       , 0x05284B },
-	{ (char*) "US/Mountain"                       , 0x052BDA },
-	{ (char*) "US/Pacific"                        , 0x052FF8 },
-	{ (char*) "US/Samoa"                          , 0x053512 },
-	{ (char*) "UTC"                               , 0x0535B0 },
-	{ (char*) "W-SU"                              , 0x05362B },
-	{ (char*) "WET"                               , 0x0539C3 },
-	{ (char*) "Zulu"                              , 0x053BBD },
+	{ (char*) "Africa/Casablanca"                 , 0x0010E2 },
+	{ (char*) "Africa/Ceuta"                      , 0x00186D },
+	{ (char*) "Africa/Conakry"                    , 0x001AB9 },
+	{ (char*) "Africa/Dakar"                      , 0x001B63 },
+	{ (char*) "Africa/Dar_es_Salaam"              , 0x001C04 },
+	{ (char*) "Africa/Djibouti"                   , 0x001CB1 },
+	{ (char*) "Africa/Douala"                     , 0x001D40 },
+	{ (char*) "Africa/El_Aaiun"                   , 0x001DCF },
+	{ (char*) "Africa/Freetown"                   , 0x002501 },
+	{ (char*) "Africa/Gaborone"                   , 0x002651 },
+	{ (char*) "Africa/Harare"                     , 0x002711 },
+	{ (char*) "Africa/Johannesburg"               , 0x0027A0 },
+	{ (char*) "Africa/Juba"                       , 0x00286A },
+	{ (char*) "Africa/Kampala"                    , 0x002A40 },
+	{ (char*) "Africa/Khartoum"                   , 0x002B02 },
+	{ (char*) "Africa/Kigali"                     , 0x002CD8 },
+	{ (char*) "Africa/Kinshasa"                   , 0x002D67 },
+	{ (char*) "Africa/Lagos"                      , 0x002E0F },
+	{ (char*) "Africa/Libreville"                 , 0x002ECF },
+	{ (char*) "Africa/Lome"                       , 0x002F5E },
+	{ (char*) "Africa/Luanda"                     , 0x002FEC },
+	{ (char*) "Africa/Lubumbashi"                 , 0x00308A },
+	{ (char*) "Africa/Lusaka"                     , 0x003145 },
+	{ (char*) "Africa/Malabo"                     , 0x0031D4 },
+	{ (char*) "Africa/Maputo"                     , 0x003276 },
+	{ (char*) "Africa/Maseru"                     , 0x003305 },
+	{ (char*) "Africa/Mbabane"                    , 0x0033AE },
+	{ (char*) "Africa/Mogadishu"                  , 0x00343F },
+	{ (char*) "Africa/Monrovia"                   , 0x0034EC },
+	{ (char*) "Africa/Nairobi"                    , 0x00359C },
+	{ (char*) "Africa/Ndjamena"                   , 0x003667 },
+	{ (char*) "Africa/Niamey"                     , 0x003713 },
+	{ (char*) "Africa/Nouakchott"                 , 0x0037C8 },
+	{ (char*) "Africa/Ouagadougou"                , 0x003872 },
+	{ (char*) "Africa/Porto-Novo"                 , 0x003900 },
+	{ (char*) "Africa/Sao_Tome"                   , 0x0039A2 },
+	{ (char*) "Africa/Timbuktu"                   , 0x003A5B },
+	{ (char*) "Africa/Tripoli"                    , 0x003AE9 },
+	{ (char*) "Africa/Tunis"                      , 0x003CA4 },
+	{ (char*) "Africa/Windhoek"                   , 0x003E71 },
+	{ (char*) "America/Adak"                      , 0x0040FB },
+	{ (char*) "America/Anchorage"                 , 0x0044EA },
+	{ (char*) "America/Anguilla"                  , 0x0048DA },
+	{ (char*) "America/Antigua"                   , 0x004968 },
+	{ (char*) "America/Araguaina"                 , 0x004A09 },
+	{ (char*) "America/Argentina/Buenos_Aires"    , 0x004C6E },
+	{ (char*) "America/Argentina/Catamarca"       , 0x004F53 },
+	{ (char*) "America/Argentina/ComodRivadavia"  , 0x00523E },
+	{ (char*) "America/Argentina/Cordoba"         , 0x00550E },
+	{ (char*) "America/Argentina/Jujuy"           , 0x005814 },
+	{ (char*) "America/Argentina/La_Rioja"        , 0x005ADC },
+	{ (char*) "America/Argentina/Mendoza"         , 0x005DC2 },
+	{ (char*) "America/Argentina/Rio_Gallegos"    , 0x00609E },
+	{ (char*) "America/Argentina/Salta"           , 0x00637D },
+	{ (char*) "America/Argentina/San_Juan"        , 0x006651 },
+	{ (char*) "America/Argentina/San_Luis"        , 0x006937 },
+	{ (char*) "America/Argentina/Tucuman"         , 0x006C1D },
+	{ (char*) "America/Argentina/Ushuaia"         , 0x006F0B },
+	{ (char*) "America/Aruba"                     , 0x0071F0 },
+	{ (char*) "America/Asuncion"                  , 0x007293 },
+	{ (char*) "America/Atikokan"                  , 0x007613 },
+	{ (char*) "America/Atka"                      , 0x007720 },
+	{ (char*) "America/Bahia"                     , 0x007AF5 },
+	{ (char*) "America/Bahia_Banderas"            , 0x007DB0 },
+	{ (char*) "America/Barbados"                  , 0x0080A5 },
+	{ (char*) "America/Belem"                     , 0x0081C7 },
+	{ (char*) "America/Belize"                    , 0x00836F },
+	{ (char*) "America/Blanc-Sablon"              , 0x008790 },
+	{ (char*) "America/Boa_Vista"                 , 0x008885 },
+	{ (char*) "America/Bogota"                    , 0x008A46 },
+	{ (char*) "America/Boise"                     , 0x008B05 },
+	{ (char*) "America/Buenos_Aires"              , 0x008F18 },
+	{ (char*) "America/Cambridge_Bay"             , 0x0091E8 },
+	{ (char*) "America/Campo_Grande"              , 0x00957B },
+	{ (char*) "America/Cancun"                    , 0x009951 },
+	{ (char*) "America/Caracas"                   , 0x009B7A },
+	{ (char*) "America/Catamarca"                 , 0x009C44 },
+	{ (char*) "America/Cayenne"                   , 0x009F14 },
+	{ (char*) "America/Cayman"                    , 0x009FB7 },
+	{ (char*) "America/Chicago"                   , 0x00A058 },
+	{ (char*) "America/Chihuahua"                 , 0x00A752 },
+	{ (char*) "America/Ciudad_Juarez"             , 0x00AA27 },
+	{ (char*) "America/Coral_Harbour"             , 0x00AD1D },
+	{ (char*) "America/Cordoba"                   , 0x00ADBE },
+	{ (char*) "America/Costa_Rica"                , 0x00B08E },
+	{ (char*) "America/Creston"                   , 0x00B182 },
+	{ (char*) "America/Cuiaba"                    , 0x00B23E },
+	{ (char*) "America/Curacao"                   , 0x00B5FB },
+	{ (char*) "America/Danmarkshavn"              , 0x00B69E },
+	{ (char*) "America/Dawson"                    , 0x00B883 },
+	{ (char*) "America/Dawson_Creek"              , 0x00BCA6 },
+	{ (char*) "America/Denver"                    , 0x00BF7D },
+	{ (char*) "America/Detroit"                   , 0x00C3B0 },
+	{ (char*) "America/Dominica"                  , 0x00C758 },
+	{ (char*) "America/Edmonton"                  , 0x00C7E6 },
+	{ (char*) "America/Eirunepe"                  , 0x00CBE1 },
+	{ (char*) "America/El_Salvador"               , 0x00CDB0 },
+	{ (char*) "America/Ensenada"                  , 0x00CE6C },
+	{ (char*) "America/Fort_Nelson"               , 0x00D279 },
+	{ (char*) "America/Fort_Wayne"                , 0x00D841 },
+	{ (char*) "America/Fortaleza"                 , 0x00DA60 },
+	{ (char*) "America/Glace_Bay"                 , 0x00DC76 },
+	{ (char*) "America/Godthab"                   , 0x00E00D },
+	{ (char*) "America/Goose_Bay"                 , 0x00E3DE },
+	{ (char*) "America/Grand_Turk"                , 0x00EA36 },
+	{ (char*) "America/Grenada"                   , 0x00ED97 },
+	{ (char*) "America/Guadeloupe"                , 0x00EE25 },
+	{ (char*) "America/Guatemala"                 , 0x00EEB3 },
+	{ (char*) "America/Guayaquil"                 , 0x00EF93 },
+	{ (char*) "America/Guyana"                    , 0x00F064 },
+	{ (char*) "America/Halifax"                   , 0x00F125 },
+	{ (char*) "America/Havana"                    , 0x00F7D7 },
+	{ (char*) "America/Hermosillo"                , 0x00FC40 },
+	{ (char*) "America/Indiana/Indianapolis"      , 0x00FD70 },
+	{ (char*) "America/Indiana/Knox"              , 0x00FFA8 },
+	{ (char*) "America/Indiana/Marengo"           , 0x0103C1 },
+	{ (char*) "America/Indiana/Petersburg"        , 0x01061B },
+	{ (char*) "America/Indiana/Tell_City"         , 0x0108E5 },
+	{ (char*) "America/Indiana/Vevay"             , 0x010B0F },
+	{ (char*) "America/Indiana/Vincennes"         , 0x010CA6 },
+	{ (char*) "America/Indiana/Winamac"           , 0x010EFC },
+	{ (char*) "America/Indianapolis"              , 0x011182 },
+	{ (char*) "America/Inuvik"                    , 0x0113A1 },
+	{ (char*) "America/Iqaluit"                   , 0x0116F2 },
+	{ (char*) "America/Jamaica"                   , 0x011A6E },
+	{ (char*) "America/Jujuy"                     , 0x011BCD },
+	{ (char*) "America/Juneau"                    , 0x011E8B },
+	{ (char*) "America/Kentucky/Louisville"       , 0x012271 },
+	{ (char*) "America/Kentucky/Monticello"       , 0x012775 },
+	{ (char*) "America/Knox_IN"                   , 0x012B61 },
+	{ (char*) "America/Kralendijk"                , 0x012F65 },
+	{ (char*) "America/La_Paz"                    , 0x013022 },
+	{ (char*) "America/Lima"                      , 0x0130D8 },
+	{ (char*) "America/Los_Angeles"               , 0x0131FF },
+	{ (char*) "America/Louisville"                , 0x013720 },
+	{ (char*) "America/Lower_Princes"             , 0x013C06 },
+	{ (char*) "America/Maceio"                    , 0x013CC3 },
+	{ (char*) "America/Managua"                   , 0x013ED5 },
+	{ (char*) "America/Manaus"                    , 0x014008 },
+	{ (char*) "America/Marigot"                   , 0x0141BF },
+	{ (char*) "America/Martinique"                , 0x01427C },
+	{ (char*) "America/Matamoros"                 , 0x01433A },
+	{ (char*) "America/Mazatlan"                  , 0x014527 },
+	{ (char*) "America/Mendoza"                   , 0x014833 },
+	{ (char*) "America/Menominee"                 , 0x014B03 },
+	{ (char*) "America/Merida"                    , 0x014EC3 },
+	{ (char*) "America/Metlakatla"                , 0x01516E },
+	{ (char*) "America/Mexico_City"               , 0x0153E4 },
+	{ (char*) "America/Miquelon"                  , 0x015703 },
+	{ (char*) "America/Moncton"                   , 0x015935 },
+	{ (char*) "America/Monterrey"                 , 0x015F2E },
+	{ (char*) "America/Montevideo"                , 0x0161F4 },
+	{ (char*) "America/Montreal"                  , 0x0165C9 },
+	{ (char*) "America/Montserrat"                , 0x016C8A },
+	{ (char*) "America/Nassau"                    , 0x016D18 },
+	{ (char*) "America/New_York"                  , 0x017112 },
+	{ (char*) "America/Nipigon"                   , 0x017802 },
+	{ (char*) "America/Nome"                      , 0x017EC3 },
+	{ (char*) "America/Noronha"                   , 0x0182AB },
+	{ (char*) "America/North_Dakota/Beulah"       , 0x0184AB },
+	{ (char*) "America/North_Dakota/Center"       , 0x0188DF },
+	{ (char*) "America/North_Dakota/New_Salem"    , 0x018CDE },
+	{ (char*) "America/Nuuk"                      , 0x0190E3 },
+	{ (char*) "America/Ojinaga"                   , 0x0194C5 },
+	{ (char*) "America/Panama"                    , 0x0197B2 },
+	{ (char*) "America/Pangnirtung"               , 0x019853 },
+	{ (char*) "America/Paramaribo"                , 0x019BB6 },
+	{ (char*) "America/Phoenix"                   , 0x019C7D },
+	{ (char*) "America/Port-au-Prince"            , 0x019D91 },
+	{ (char*) "America/Port_of_Spain"             , 0x019FD2 },
+	{ (char*) "America/Porto_Acre"                , 0x01A060 },
+	{ (char*) "America/Porto_Velho"               , 0x01A20E },
+	{ (char*) "America/Puerto_Rico"               , 0x01A3AC },
+	{ (char*) "America/Punta_Arenas"              , 0x01A469 },
+	{ (char*) "America/Rainy_River"               , 0x01A94B },
+	{ (char*) "America/Rankin_Inlet"              , 0x01AE65 },
+	{ (char*) "America/Recife"                    , 0x01B1AE },
+	{ (char*) "America/Regina"                    , 0x01B3A8 },
+	{ (char*) "America/Resolute"                  , 0x01B647 },
+	{ (char*) "America/Rio_Branco"                , 0x01B991 },
+	{ (char*) "America/Rosario"                   , 0x01BB43 },
+	{ (char*) "America/Santa_Isabel"              , 0x01BE13 },
+	{ (char*) "America/Santarem"                  , 0x01C220 },
+	{ (char*) "America/Santiago"                  , 0x01C3D0 },
+	{ (char*) "America/Santo_Domingo"             , 0x01C933 },
+	{ (char*) "America/Sao_Paulo"                 , 0x01CA7C },
+	{ (char*) "America/Scoresbysund"              , 0x01CE76 },
+	{ (char*) "America/Shiprock"                  , 0x01D07E },
+	{ (char*) "America/Sitka"                     , 0x01D49C },
+	{ (char*) "America/St_Barthelemy"             , 0x01D877 },
+	{ (char*) "America/St_Johns"                  , 0x01D934 },
+	{ (char*) "America/St_Kitts"                  , 0x01E0B8 },
+	{ (char*) "America/St_Lucia"                  , 0x01E146 },
+	{ (char*) "America/St_Thomas"                 , 0x01E1E7 },
+	{ (char*) "America/St_Vincent"                , 0x01E275 },
+	{ (char*) "America/Swift_Current"             , 0x01E316 },
+	{ (char*) "America/Tegucigalpa"               , 0x01E4A4 },
+	{ (char*) "America/Thule"                     , 0x01E572 },
+	{ (char*) "America/Thunder_Bay"               , 0x01E753 },
+	{ (char*) "America/Tijuana"                   , 0x01EE14 },
+	{ (char*) "America/Toronto"                   , 0x01F230 },
+	{ (char*) "America/Tortola"                   , 0x01F90E },
+	{ (char*) "America/Vancouver"                 , 0x01F99C },
+	{ (char*) "America/Virgin"                    , 0x01FEF3 },
+	{ (char*) "America/Whitehorse"                , 0x01FFB0 },
+	{ (char*) "America/Winnipeg"                  , 0x0203D3 },
+	{ (char*) "America/Yakutat"                   , 0x02090A },
+	{ (char*) "America/Yellowknife"               , 0x020CD8 },
+	{ (char*) "Antarctica/Casey"                  , 0x0210AE },
+	{ (char*) "Antarctica/Davis"                  , 0x0211B2 },
+	{ (char*) "Antarctica/DumontDUrville"         , 0x021288 },
+	{ (char*) "Antarctica/Macquarie"              , 0x02133C },
+	{ (char*) "Antarctica/Mawson"                 , 0x021728 },
+	{ (char*) "Antarctica/McMurdo"                , 0x0217D2 },
+	{ (char*) "Antarctica/Palmer"                 , 0x021B04 },
+	{ (char*) "Antarctica/Rothera"                , 0x021E8D },
+	{ (char*) "Antarctica/South_Pole"             , 0x021F24 },
+	{ (char*) "Antarctica/Syowa"                  , 0x022343 },
+	{ (char*) "Antarctica/Troll"                  , 0x0223D9 },
+	{ (char*) "Antarctica/Vostok"                 , 0x02249B },
+	{ (char*) "Arctic/Longyearbyen"               , 0x022532 },
+	{ (char*) "Asia/Aden"                         , 0x0227FF },
+	{ (char*) "Asia/Almaty"                       , 0x022890 },
+	{ (char*) "Asia/Amman"                        , 0x022B0F },
+	{ (char*) "Asia/Anadyr"                       , 0x022EBB },
+	{ (char*) "Asia/Aqtau"                        , 0x0231C1 },
+	{ (char*) "Asia/Aqtobe"                       , 0x023440 },
+	{ (char*) "Asia/Ashgabat"                     , 0x0236C0 },
+	{ (char*) "Asia/Ashkhabad"                    , 0x023843 },
+	{ (char*) "Asia/Atyrau"                       , 0x0239C6 },
+	{ (char*) "Asia/Baghdad"                      , 0x023C4F },
+	{ (char*) "Asia/Bahrain"                      , 0x023ED1 },
+	{ (char*) "Asia/Baku"                         , 0x023F8A },
+	{ (char*) "Asia/Bangkok"                      , 0x02427E },
+	{ (char*) "Asia/Barnaul"                      , 0x024322 },
+	{ (char*) "Asia/Beirut"                       , 0x02462D },
+	{ (char*) "Asia/Bishkek"                      , 0x024915 },
+	{ (char*) "Asia/Brunei"                       , 0x024B8B },
+	{ (char*) "Asia/Calcutta"                     , 0x024C31 },
+	{ (char*) "Asia/Chita"                        , 0x024D19 },
+	{ (char*) "Asia/Choibalsan"                   , 0x025027 },
+	{ (char*) "Asia/Chongqing"                    , 0x0252B0 },
+	{ (char*) "Asia/Chungking"                    , 0x025445 },
+	{ (char*) "Asia/Colombo"                      , 0x0255DA },
+	{ (char*) "Asia/Dacca"                        , 0x0256DD },
+	{ (char*) "Asia/Damascus"                     , 0x0257D0 },
+	{ (char*) "Asia/Dhaka"                        , 0x025CAE },
+	{ (char*) "Asia/Dili"                         , 0x025DA1 },
+	{ (char*) "Asia/Dubai"                        , 0x025E57 },
+	{ (char*) "Asia/Dushanbe"                     , 0x025EE8 },
+	{ (char*) "Asia/Famagusta"                    , 0x026062 },
+	{ (char*) "Asia/Gaza"                         , 0x026429 },
+	{ (char*) "Asia/Harbin"                       , 0x026E15 },
+	{ (char*) "Asia/Hebron"                       , 0x026FAA },
+	{ (char*) "Asia/Ho_Chi_Minh"                  , 0x0279A7 },
+	{ (char*) "Asia/Hong_Kong"                    , 0x027A9F },
+	{ (char*) "Asia/Hovd"                         , 0x027DB2 },
+	{ (char*) "Asia/Irkutsk"                      , 0x02803B },
+	{ (char*) "Asia/Istanbul"                     , 0x028359 },
+	{ (char*) "Asia/Jakarta"                      , 0x028815 },
+	{ (char*) "Asia/Jayapura"                     , 0x028926 },
+	{ (char*) "Asia/Jerusalem"                    , 0x028A13 },
+	{ (char*) "Asia/Kabul"                        , 0x028E51 },
+	{ (char*) "Asia/Kamchatka"                    , 0x028EFC },
+	{ (char*) "Asia/Karachi"                      , 0x0291F1 },
+	{ (char*) "Asia/Kashgar"                      , 0x029307 },
+	{ (char*) "Asia/Kathmandu"                    , 0x029398 },
+	{ (char*) "Asia/Katmandu"                     , 0x029445 },
+	{ (char*) "Asia/Khandyga"                     , 0x0294F2 },
+	{ (char*) "Asia/Kolkata"                      , 0x029823 },
+	{ (char*) "Asia/Krasnoyarsk"                  , 0x02990B },
+	{ (char*) "Asia/Kuala_Lumpur"                 , 0x029C15 },
+	{ (char*) "Asia/Kuching"                      , 0x029D35 },
+	{ (char*) "Asia/Kuwait"                       , 0x029E8F },
+	{ (char*) "Asia/Macao"                        , 0x029F20 },
+	{ (char*) "Asia/Macau"                        , 0x02A243 },
+	{ (char*) "Asia/Magadan"                      , 0x02A566 },
+	{ (char*) "Asia/Makassar"                     , 0x02A871 },
+	{ (char*) "Asia/Manila"                       , 0x02A984 },
+	{ (char*) "Asia/Muscat"                       , 0x02AA7E },
+	{ (char*) "Asia/Nicosia"                      , 0x02AB0F },
+	{ (char*) "Asia/Novokuznetsk"                 , 0x02AD7E },
+	{ (char*) "Asia/Novosibirsk"                  , 0x02B071 },
+	{ (char*) "Asia/Omsk"                         , 0x02B382 },
+	{ (char*) "Asia/Oral"                         , 0x02B680 },
+	{ (char*) "Asia/Phnom_Penh"                   , 0x02B90C },
+	{ (char*) "Asia/Pontianak"                    , 0x02B9E0 },
+	{ (char*) "Asia/Pyongyang"                    , 0x02BAF9 },
+	{ (char*) "Asia/Qatar"                        , 0x02BBBC },
+	{ (char*) "Asia/Qostanay"                     , 0x02BC60 },
+	{ (char*) "Asia/Qyzylorda"                    , 0x02BEED },
+	{ (char*) "Asia/Rangoon"                      , 0x02C186 },
+	{ (char*) "Asia/Riyadh"                       , 0x02C24D },
+	{ (char*) "Asia/Saigon"                       , 0x02C2DE },
+	{ (char*) "Asia/Sakhalin"                     , 0x02C3D6 },
+	{ (char*) "Asia/Samarkand"                    , 0x02C6ED },
+	{ (char*) "Asia/Seoul"                        , 0x02C878 },
+	{ (char*) "Asia/Shanghai"                     , 0x02CA23 },
+	{ (char*) "Asia/Singapore"                    , 0x02CBC4 },
+	{ (char*) "Asia/Srednekolymsk"                , 0x02CCD0 },
+	{ (char*) "Asia/Taipei"                       , 0x02CFE0 },
+	{ (char*) "Asia/Tashkent"                     , 0x02D1EB },
+	{ (char*) "Asia/Tbilisi"                      , 0x02D376 },
+	{ (char*) "Asia/Tehran"                       , 0x02D5F7 },
+	{ (char*) "Asia/Tel_Aviv"                     , 0x02D92F },
+	{ (char*) "Asia/Thimbu"                       , 0x02DD6D },
+	{ (char*) "Asia/Thimphu"                      , 0x02DE13 },
+	{ (char*) "Asia/Tokyo"                        , 0x02DEB9 },
+	{ (char*) "Asia/Tomsk"                        , 0x02DF9A },
+	{ (char*) "Asia/Ujung_Pandang"                , 0x02E2A5 },
+	{ (char*) "Asia/Ulaanbaatar"                  , 0x02E36F },
+	{ (char*) "Asia/Ulan_Bator"                   , 0x02E5DD },
+	{ (char*) "Asia/Urumqi"                       , 0x02E83B },
+	{ (char*) "Asia/Ust-Nera"                     , 0x02E8D9 },
+	{ (char*) "Asia/Vientiane"                    , 0x02EBFC },
+	{ (char*) "Asia/Vladivostok"                  , 0x02ECE2 },
+	{ (char*) "Asia/Yakutsk"                      , 0x02EFE7 },
+	{ (char*) "Asia/Yangon"                       , 0x02F2EB },
+	{ (char*) "Asia/Yekaterinburg"                , 0x02F3B2 },
+	{ (char*) "Asia/Yerevan"                      , 0x02F6C4 },
+	{ (char*) "Atlantic/Azores"                   , 0x02F994 },
+	{ (char*) "Atlantic/Bermuda"                  , 0x02FF53 },
+	{ (char*) "Atlantic/Canary"                   , 0x03035F },
+	{ (char*) "Atlantic/Cape_Verde"               , 0x030557 },
+	{ (char*) "Atlantic/Faeroe"                   , 0x030612 },
+	{ (char*) "Atlantic/Faroe"                    , 0x0307D7 },
+	{ (char*) "Atlantic/Jan_Mayen"                , 0x03099C },
+	{ (char*) "Atlantic/Madeira"                  , 0x030C69 },
+	{ (char*) "Atlantic/Reykjavik"                , 0x031231 },
+	{ (char*) "Atlantic/South_Georgia"            , 0x03152E },
+	{ (char*) "Atlantic/St_Helena"                , 0x0315BE },
+	{ (char*) "Atlantic/Stanley"                  , 0x03165F },
+	{ (char*) "Australia/ACT"                     , 0x031980 },
+	{ (char*) "Australia/Adelaide"                , 0x031D14 },
+	{ (char*) "Australia/Brisbane"                , 0x0320C8 },
+	{ (char*) "Australia/Broken_Hill"             , 0x03220C },
+	{ (char*) "Australia/Canberra"                , 0x0325E1 },
+	{ (char*) "Australia/Currie"                  , 0x032975 },
+	{ (char*) "Australia/Darwin"                  , 0x032D6C },
+	{ (char*) "Australia/Eucla"                   , 0x032E74 },
+	{ (char*) "Australia/Hobart"                  , 0x032FD3 },
+	{ (char*) "Australia/LHI"                     , 0x0333D2 },
+	{ (char*) "Australia/Lindeman"                , 0x033692 },
+	{ (char*) "Australia/Lord_Howe"               , 0x033802 },
+	{ (char*) "Australia/Melbourne"               , 0x033AD2 },
+	{ (char*) "Australia/North"                   , 0x033E6E },
+	{ (char*) "Australia/NSW"                     , 0x033F64 },
+	{ (char*) "Australia/Perth"                   , 0x0342F8 },
+	{ (char*) "Australia/Queensland"              , 0x034454 },
+	{ (char*) "Australia/South"                   , 0x034581 },
+	{ (char*) "Australia/Sydney"                  , 0x034926 },
+	{ (char*) "Australia/Tasmania"                , 0x034CD6 },
+	{ (char*) "Australia/Victoria"                , 0x0350CD },
+	{ (char*) "Australia/West"                    , 0x035461 },
+	{ (char*) "Australia/Yancowinna"              , 0x03559F },
+	{ (char*) "Brazil/Acre"                       , 0x035958 },
+	{ (char*) "Brazil/DeNoronha"                  , 0x035B06 },
+	{ (char*) "Brazil/East"                       , 0x035CF6 },
+	{ (char*) "Brazil/West"                       , 0x0360BA },
+	{ (char*) "Canada/Atlantic"                   , 0x036262 },
+	{ (char*) "Canada/Central"                    , 0x0368F6 },
+	{ (char*) "Canada/Eastern"                    , 0x036E10 },
+	{ (char*) "Canada/Mountain"                   , 0x0374D1 },
+	{ (char*) "Canada/Newfoundland"               , 0x0378A7 },
+	{ (char*) "Canada/Pacific"                    , 0x038009 },
+	{ (char*) "Canada/Saskatchewan"               , 0x038547 },
+	{ (char*) "Canada/Yukon"                      , 0x0387D1 },
+	{ (char*) "CET"                               , 0x038BE2 },
+	{ (char*) "Chile/Continental"                 , 0x038E5B },
+	{ (char*) "Chile/EasterIsland"                , 0x0393B1 },
+	{ (char*) "CST6CDT"                           , 0x039853 },
+	{ (char*) "Cuba"                              , 0x039C16 },
+	{ (char*) "EET"                               , 0x03A07F },
+	{ (char*) "Egypt"                             , 0x03A27C },
+	{ (char*) "Eire"                              , 0x03A7A5 },
+	{ (char*) "EST"                               , 0x03AD89 },
+	{ (char*) "EST5EDT"                           , 0x03AE04 },
+	{ (char*) "Etc/GMT"                           , 0x03B1C7 },
+	{ (char*) "Etc/GMT+0"                         , 0x03B242 },
+	{ (char*) "Etc/GMT+1"                         , 0x03B2BD },
+	{ (char*) "Etc/GMT+10"                        , 0x03B33A },
+	{ (char*) "Etc/GMT+11"                        , 0x03B3B8 },
+	{ (char*) "Etc/GMT+12"                        , 0x03B436 },
+	{ (char*) "Etc/GMT+2"                         , 0x03B4B4 },
+	{ (char*) "Etc/GMT+3"                         , 0x03B531 },
+	{ (char*) "Etc/GMT+4"                         , 0x03B5AE },
+	{ (char*) "Etc/GMT+5"                         , 0x03B62B },
+	{ (char*) "Etc/GMT+6"                         , 0x03B6A8 },
+	{ (char*) "Etc/GMT+7"                         , 0x03B725 },
+	{ (char*) "Etc/GMT+8"                         , 0x03B7A2 },
+	{ (char*) "Etc/GMT+9"                         , 0x03B81F },
+	{ (char*) "Etc/GMT-0"                         , 0x03B89C },
+	{ (char*) "Etc/GMT-1"                         , 0x03B917 },
+	{ (char*) "Etc/GMT-10"                        , 0x03B995 },
+	{ (char*) "Etc/GMT-11"                        , 0x03BA14 },
+	{ (char*) "Etc/GMT-12"                        , 0x03BA93 },
+	{ (char*) "Etc/GMT-13"                        , 0x03BB12 },
+	{ (char*) "Etc/GMT-14"                        , 0x03BB91 },
+	{ (char*) "Etc/GMT-2"                         , 0x03BC10 },
+	{ (char*) "Etc/GMT-3"                         , 0x03BC8E },
+	{ (char*) "Etc/GMT-4"                         , 0x03BD0C },
+	{ (char*) "Etc/GMT-5"                         , 0x03BD8A },
+	{ (char*) "Etc/GMT-6"                         , 0x03BE08 },
+	{ (char*) "Etc/GMT-7"                         , 0x03BE86 },
+	{ (char*) "Etc/GMT-8"                         , 0x03BF04 },
+	{ (char*) "Etc/GMT-9"                         , 0x03BF82 },
+	{ (char*) "Etc/GMT0"                          , 0x03C000 },
+	{ (char*) "Etc/Greenwich"                     , 0x03C07B },
+	{ (char*) "Etc/UCT"                           , 0x03C0F6 },
+	{ (char*) "Etc/Universal"                     , 0x03C171 },
+	{ (char*) "Etc/UTC"                           , 0x03C1EC },
+	{ (char*) "Etc/Zulu"                          , 0x03C267 },
+	{ (char*) "Europe/Amsterdam"                  , 0x03C2E2 },
+	{ (char*) "Europe/Andorra"                    , 0x03C71D },
+	{ (char*) "Europe/Astrakhan"                  , 0x03C8AE },
+	{ (char*) "Europe/Athens"                     , 0x03CBA2 },
+	{ (char*) "Europe/Belfast"                    , 0x03CE58 },
+	{ (char*) "Europe/Belgrade"                   , 0x03D4A3 },
+	{ (char*) "Europe/Berlin"                     , 0x03D68D },
+	{ (char*) "Europe/Bratislava"                 , 0x03D969 },
+	{ (char*) "Europe/Brussels"                   , 0x03DC48 },
+	{ (char*) "Europe/Bucharest"                  , 0x03E0A3 },
+	{ (char*) "Europe/Budapest"                   , 0x03E344 },
+	{ (char*) "Europe/Busingen"                   , 0x03E64E },
+	{ (char*) "Europe/Chisinau"                   , 0x03E853 },
+	{ (char*) "Europe/Copenhagen"                 , 0x03EB52 },
+	{ (char*) "Europe/Dublin"                     , 0x03EDCD },
+	{ (char*) "Europe/Gibraltar"                  , 0x03F3B1 },
+	{ (char*) "Europe/Guernsey"                   , 0x03F881 },
+	{ (char*) "Europe/Helsinki"                   , 0x03FED8 },
+	{ (char*) "Europe/Isle_of_Man"                , 0x0400C5 },
+	{ (char*) "Europe/Istanbul"                   , 0x040710 },
+	{ (char*) "Europe/Jersey"                     , 0x040BCC },
+	{ (char*) "Europe/Kaliningrad"                , 0x041223 },
+	{ (char*) "Europe/Kiev"                       , 0x0415CB },
+	{ (char*) "Europe/Kirov"                      , 0x041805 },
+	{ (char*) "Europe/Kyiv"                       , 0x041AFE },
+	{ (char*) "Europe/Lisbon"                     , 0x041D47 },
+	{ (char*) "Europe/Ljubljana"                  , 0x042314 },
+	{ (char*) "Europe/London"                     , 0x0424FE },
+	{ (char*) "Europe/Luxembourg"                 , 0x042B49 },
+	{ (char*) "Europe/Madrid"                     , 0x042F94 },
+	{ (char*) "Europe/Malta"                      , 0x043331 },
+	{ (char*) "Europe/Mariehamn"                  , 0x0436DD },
+	{ (char*) "Europe/Minsk"                      , 0x0438CA },
+	{ (char*) "Europe/Monaco"                     , 0x043BFE },
+	{ (char*) "Europe/Moscow"                     , 0x044064 },
+	{ (char*) "Europe/Nicosia"                    , 0x044410 },
+	{ (char*) "Europe/Oslo"                       , 0x044671 },
+	{ (char*) "Europe/Paris"                      , 0x044921 },
+	{ (char*) "Europe/Podgorica"                  , 0x044D7E },
+	{ (char*) "Europe/Prague"                     , 0x044F68 },
+	{ (char*) "Europe/Riga"                       , 0x045247 },
+	{ (char*) "Europe/Rome"                       , 0x045509 },
+	{ (char*) "Europe/Samara"                     , 0x0458C8 },
+	{ (char*) "Europe/San_Marino"                 , 0x045BC9 },
+	{ (char*) "Europe/Sarajevo"                   , 0x045F88 },
+	{ (char*) "Europe/Saratov"                    , 0x046172 },
+	{ (char*) "Europe/Simferopol"                 , 0x046464 },
+	{ (char*) "Europe/Skopje"                     , 0x0467D7 },
+	{ (char*) "Europe/Sofia"                      , 0x0469C1 },
+	{ (char*) "Europe/Stockholm"                  , 0x046C1D },
+	{ (char*) "Europe/Tallinn"                    , 0x046E1A },
+	{ (char*) "Europe/Tirane"                     , 0x0470C9 },
+	{ (char*) "Europe/Tiraspol"                   , 0x047331 },
+	{ (char*) "Europe/Ulyanovsk"                  , 0x047630 },
+	{ (char*) "Europe/Uzhgorod"                   , 0x047946 },
+	{ (char*) "Europe/Vaduz"                      , 0x047B80 },
+	{ (char*) "Europe/Vatican"                    , 0x047D6A },
+	{ (char*) "Europe/Vienna"                     , 0x048129 },
+	{ (char*) "Europe/Vilnius"                    , 0x0483C7 },
+	{ (char*) "Europe/Volgograd"                  , 0x048677 },
+	{ (char*) "Europe/Warsaw"                     , 0x048986 },
+	{ (char*) "Europe/Zagreb"                     , 0x048D2D },
+	{ (char*) "Europe/Zaporozhye"                 , 0x048F17 },
+	{ (char*) "Europe/Zurich"                     , 0x049151 },
+	{ (char*) "Factory"                           , 0x04934E },
+	{ (char*) "GB"                                , 0x0493CB },
+	{ (char*) "GB-Eire"                           , 0x049A16 },
+	{ (char*) "GMT"                               , 0x04A061 },
+	{ (char*) "GMT+0"                             , 0x04A0DC },
+	{ (char*) "GMT-0"                             , 0x04A157 },
+	{ (char*) "GMT0"                              , 0x04A1D2 },
+	{ (char*) "Greenwich"                         , 0x04A24D },
+	{ (char*) "Hongkong"                          , 0x04A2C8 },
+	{ (char*) "HST"                               , 0x04A5DB },
+	{ (char*) "Iceland"                           , 0x04A657 },
+	{ (char*) "Indian/Antananarivo"               , 0x04A6E5 },
+	{ (char*) "Indian/Chagos"                     , 0x04A791 },
+	{ (char*) "Indian/Christmas"                  , 0x04A835 },
+	{ (char*) "Indian/Cocos"                      , 0x04A8C6 },
+	{ (char*) "Indian/Comoro"                     , 0x04A95E },
+	{ (char*) "Indian/Kerguelen"                  , 0x04A9ED },
+	{ (char*) "Indian/Mahe"                       , 0x04AA7E },
+	{ (char*) "Indian/Maldives"                   , 0x04AB0F },
+	{ (char*) "Indian/Mauritius"                  , 0x04ABB3 },
+	{ (char*) "Indian/Mayotte"                    , 0x04AC72 },
+	{ (char*) "Indian/Reunion"                    , 0x04AD01 },
+	{ (char*) "Iran"                              , 0x04AD92 },
+	{ (char*) "Israel"                            , 0x04B0CA },
+	{ (char*) "Jamaica"                           , 0x04B508 },
+	{ (char*) "Japan"                             , 0x04B667 },
+	{ (char*) "Kwajalein"                         , 0x04B748 },
+	{ (char*) "Libya"                             , 0x04B82F },
+	{ (char*) "MET"                               , 0x04B9EA },
+	{ (char*) "Mexico/BajaNorte"                  , 0x04BC63 },
+	{ (char*) "Mexico/BajaSur"                    , 0x04C070 },
+	{ (char*) "Mexico/General"                    , 0x04C34A },
+	{ (char*) "MST"                               , 0x04C65B },
+	{ (char*) "MST7MDT"                           , 0x04C6D6 },
+	{ (char*) "Navajo"                            , 0x04CA99 },
+	{ (char*) "NZ"                                , 0x04CEB7 },
+	{ (char*) "NZ-CHAT"                           , 0x04D2D6 },
+	{ (char*) "Pacific/Apia"                      , 0x04D60A },
+	{ (char*) "Pacific/Auckland"                  , 0x04D7AD },
+	{ (char*) "Pacific/Bougainville"              , 0x04DBDF },
+	{ (char*) "Pacific/Chatham"                   , 0x04DCC0 },
+	{ (char*) "Pacific/Chuuk"                     , 0x04E003 },
+	{ (char*) "Pacific/Easter"                    , 0x04E0E1 },
+	{ (char*) "Pacific/Efate"                     , 0x04E590 },
+	{ (char*) "Pacific/Enderbury"                 , 0x04E6F2 },
+	{ (char*) "Pacific/Fakaofo"                   , 0x04E7AA },
+	{ (char*) "Pacific/Fiji"                      , 0x04E84F },
+	{ (char*) "Pacific/Funafuti"                  , 0x04E9E7 },
+	{ (char*) "Pacific/Galapagos"                 , 0x04EA79 },
+	{ (char*) "Pacific/Gambier"                   , 0x04EB45 },
+	{ (char*) "Pacific/Guadalcanal"               , 0x04EBE4 },
+	{ (char*) "Pacific/Guam"                      , 0x04EC76 },
+	{ (char*) "Pacific/Honolulu"                  , 0x04EDE0 },
+	{ (char*) "Pacific/Johnston"                  , 0x04EECF },
+	{ (char*) "Pacific/Kanton"                    , 0x04EFB8 },
+	{ (char*) "Pacific/Kiritimati"                , 0x04F07F },
+	{ (char*) "Pacific/Kosrae"                    , 0x04F145 },
+	{ (char*) "Pacific/Kwajalein"                 , 0x04F249 },
+	{ (char*) "Pacific/Majuro"                    , 0x04F339 },
+	{ (char*) "Pacific/Marquesas"                 , 0x04F437 },
+	{ (char*) "Pacific/Midway"                    , 0x04F4DF },
+	{ (char*) "Pacific/Nauru"                     , 0x04F5A2 },
+	{ (char*) "Pacific/Niue"                      , 0x04F665 },
+	{ (char*) "Pacific/Norfolk"                   , 0x04F70B },
+	{ (char*) "Pacific/Noumea"                    , 0x04F80E },
+	{ (char*) "Pacific/Pago_Pago"                 , 0x04F8E0 },
+	{ (char*) "Pacific/Palau"                     , 0x04F97E },
+	{ (char*) "Pacific/Pitcairn"                  , 0x04FA1E },
+	{ (char*) "Pacific/Pohnpei"                   , 0x04FAC3 },
+	{ (char*) "Pacific/Ponape"                    , 0x04FBB3 },
+	{ (char*) "Pacific/Port_Moresby"              , 0x04FC45 },
+	{ (char*) "Pacific/Rarotonga"                 , 0x04FD03 },
+	{ (char*) "Pacific/Saipan"                    , 0x04FEA5 },
+	{ (char*) "Pacific/Samoa"                     , 0x050006 },
+	{ (char*) "Pacific/Tahiti"                    , 0x0500A4 },
+	{ (char*) "Pacific/Tarawa"                    , 0x050144 },
+	{ (char*) "Pacific/Tongatapu"                 , 0x0501E5 },
+	{ (char*) "Pacific/Truk"                      , 0x0502DE },
+	{ (char*) "Pacific/Wake"                      , 0x050384 },
+	{ (char*) "Pacific/Wallis"                    , 0x050421 },
+	{ (char*) "Pacific/Yap"                       , 0x0504B3 },
+	{ (char*) "Poland"                            , 0x050559 },
+	{ (char*) "Portugal"                          , 0x050900 },
+	{ (char*) "PRC"                               , 0x050EBA },
+	{ (char*) "PST8PDT"                           , 0x05104F },
+	{ (char*) "ROC"                               , 0x051412 },
+	{ (char*) "ROK"                               , 0x05161D },
+	{ (char*) "Singapore"                         , 0x0517C8 },
+	{ (char*) "Turkey"                            , 0x0518D4 },
+	{ (char*) "UCT"                               , 0x051D90 },
+	{ (char*) "Universal"                         , 0x051E0B },
+	{ (char*) "US/Alaska"                         , 0x051E86 },
+	{ (char*) "US/Aleutian"                       , 0x052263 },
+	{ (char*) "US/Arizona"                        , 0x052638 },
+	{ (char*) "US/Central"                        , 0x052734 },
+	{ (char*) "US/East-Indiana"                   , 0x052E1A },
+	{ (char*) "US/Eastern"                        , 0x053039 },
+	{ (char*) "US/Hawaii"                         , 0x053715 },
+	{ (char*) "US/Indiana-Starke"                 , 0x0537FE },
+	{ (char*) "US/Michigan"                       , 0x053C02 },
+	{ (char*) "US/Mountain"                       , 0x053F91 },
+	{ (char*) "US/Pacific"                        , 0x0543AF },
+	{ (char*) "US/Samoa"                          , 0x0548C9 },
+	{ (char*) "UTC"                               , 0x054967 },
+	{ (char*) "W-SU"                              , 0x0549E2 },
+	{ (char*) "WET"                               , 0x054D7A },
+	{ (char*) "Zulu"                              , 0x054F74 },
 };
 
 
-const unsigned char timelib_timezone_db_data_builtin343096 = {
+const unsigned char timelib_timezone_db_data_builtin348143 = {
 
 /* Africa/Abidjan */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -832,7 +833,7 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0D, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0D, 0xFF,
 0xFF, 0xFF, 0xFF, 0x7D, 0xBD, 0x4D, 0xAB, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x93, 0xB4, 0xE0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC8, 0xFA, 0x7B, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xFC, 0xEF, 0xE0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCA, 0xC7, 0xE8, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xCB, 0xAE, 0x60, 0xFF,
@@ -896,7 +897,7 @@
 0x00, 0x00, 0x00, 0x4C, 0x61, 0xBD, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0x89, 0x58, 0xE0, 0x00,
 0x00, 0x00, 0x00, 0x4C, 0xA4, 0xFA, 0x50, 0x00, 0x00, 0x00, 0x00, 0x53, 0x75, 0x38, 0xE0, 0x00,
 0x00, 0x00, 0x00, 0x53, 0xAC, 0x89, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x53, 0xDA, 0xBC, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x54, 0x24, 0x82, 0x50, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x00, 0x00, 0x00, 0x54, 0x24, 0x82, 0x50, 0x00, 0x00, 0x00, 0x00, 0x64, 0x4A, 0xF0, 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,
@@ -904,10 +905,12 @@
 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, 0x00, 0x00, 0x1D, 0x55, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30,
-0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54,
-0x00, 0x45, 0x45, 0x54, 0x00, 0x0A, 0x45, 0x45, 0x54, 0x2D, 0x32, 0x0A, 0x00, 0xB7, 0x2E, 0x88,
-0x01, 0x42, 0x57, 0x88, 0x00, 0x00, 0x00, 0x00, 
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00,
+0x00, 0x1D, 0x55, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x00,
+0x09, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x0A, 0x45,
+0x45, 0x54, 0x2D, 0x32, 0x45, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x34, 0x2E, 0x35, 0x2E, 0x35, 0x2F,
+0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x34, 0x2F, 0x32, 0x34, 0x0A, 0x00, 0xB7, 0x2E,
+0x88, 0x01, 0x42, 0x57, 0x88, 0x00, 0x00, 0x00, 0x00, 
 
 /* Africa/Casablanca */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -948,7 +951,7 @@
 0x00, 0x00, 0x00, 0x5E, 0xD3, 0x0F, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x60, 0x72, 0x58, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x60, 0xA0, 0x7C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xC5, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x62, 0x77, 0x24, 0x20, 0x00, 0x00, 0x00, 0x00, 0x64, 0x16, 0x6C, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x64, 0x4D, 0xCB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x14, 0x20, 0x00,
+0x00, 0x00, 0x00, 0x64, 0x44, 0x91, 0x20, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x14, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x66, 0x1B, 0x38, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x67, 0xBA, 0x81, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x67, 0xF1, 0xE0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x69, 0x91, 0x28, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0x69, 0xBF, 0x4D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x67, 0xD0, 0x20, 0x00,
@@ -956,7 +959,7 @@
 0x00, 0x00, 0x00, 0x6D, 0x6C, 0x9C, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x0B, 0xE4, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0x6F, 0x3A, 0x09, 0x20, 0x00, 0x00, 0x00, 0x00, 0x70, 0xD9, 0x51, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0x71, 0x10, 0xB0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x72, 0xAF, 0xF9, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x72, 0xE7, 0x58, 0x20, 0x00, 0x00, 0x00, 0x00, 0x74, 0x86, 0xA0, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0x72, 0xDE, 0x1D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x74, 0x86, 0xA0, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0x74, 0xB4, 0xC5, 0x20, 0x00, 0x00, 0x00, 0x00, 0x76, 0x54, 0x0D, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0x76, 0x8B, 0x6C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x78, 0x2A, 0xB5, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x78, 0x58, 0xD9, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x22, 0x20, 0x00,
@@ -964,7 +967,7 @@
 0x00, 0x00, 0x00, 0x7C, 0x06, 0x28, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xA5, 0x71, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x7D, 0xD3, 0x95, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x72, 0xDE, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x7F, 0xAA, 0x3D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x81, 0x49, 0x85, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x81, 0x80, 0xE4, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x83, 0x20, 0x2D, 0x20, 0x00,
+0x00, 0x00, 0x00, 0x81, 0x77, 0xAA, 0x20, 0x00, 0x00, 0x00, 0x00, 0x83, 0x20, 0x2D, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x83, 0x4E, 0x51, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x84, 0xED, 0x9A, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x85, 0x24, 0xF9, 0x20, 0x00, 0x00, 0x00, 0x00, 0x86, 0xC4, 0x41, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0x86, 0xF2, 0x66, 0x20, 0x00, 0x00, 0x00, 0x00, 0x88, 0x91, 0xAE, 0xA0, 0x00,
@@ -972,7 +975,7 @@
 0x00, 0x00, 0x00, 0x8A, 0x9F, 0xB5, 0x20, 0x00, 0x00, 0x00, 0x00, 0x8C, 0x3E, 0xFD, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0x8C, 0x6D, 0x22, 0x20, 0x00, 0x00, 0x00, 0x00, 0x8E, 0x0C, 0x6A, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0x8E, 0x43, 0xC9, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x8F, 0xE3, 0x12, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x90, 0x1A, 0x71, 0x20, 0x00, 0x00, 0x00, 0x00, 0x91, 0xB9, 0xB9, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0x90, 0x11, 0x36, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x91, 0xB9, 0xB9, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0x91, 0xE7, 0xDE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x93, 0x87, 0x26, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0x93, 0xBE, 0x85, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x95, 0x5D, 0xCE, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x95, 0x8B, 0xF2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x97, 0x2B, 0x3B, 0x20, 0x00,
@@ -980,7 +983,7 @@
 0x00, 0x00, 0x00, 0x99, 0x39, 0x41, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x9A, 0xD8, 0x8A, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x9B, 0x06, 0xAE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x9C, 0xA5, 0xF7, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x9C, 0xDD, 0x56, 0x20, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x7C, 0x9E, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x9E, 0xB3, 0xFD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x53, 0x46, 0x20, 0x00,
+0x00, 0x00, 0x00, 0x9E, 0xAA, 0xC3, 0x20, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x53, 0x46, 0x20, 0x00,
 0x00, 0x00, 0x00, 0xA0, 0x81, 0x6A, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xA2, 0x20, 0xB3, 0x20, 0x00,
 0x00, 0x00, 0x00, 0xA2, 0x58, 0x12, 0x20, 0x00, 0x00, 0x00, 0x00, 0xA3, 0xF7, 0x5A, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0xA4, 0x25, 0x7F, 0x20, 0x00, 0x00, 0x00, 0x00, 0xA5, 0xC4, 0xC7, 0xA0, 0x00,
@@ -988,7 +991,7 @@
 0x00, 0x00, 0x00, 0xA7, 0xD2, 0xCE, 0x20, 0x00, 0x00, 0x00, 0x00, 0xA9, 0x72, 0x16, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0xA9, 0xA0, 0x3B, 0x20, 0x00, 0x00, 0x00, 0x00, 0xAB, 0x3F, 0x83, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0xAB, 0x76, 0xE2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xAD, 0x16, 0x2B, 0x20, 0x00,
-0x00, 0x00, 0x00, 0xAD, 0x4D, 0x8A, 0x20, 0x00, 0x00, 0x00, 0x00, 0xAE, 0xEC, 0xD2, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0xAD, 0x44, 0x4F, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xAE, 0xEC, 0xD2, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0xAF, 0x1A, 0xF7, 0x20, 0x00, 0x00, 0x00, 0x00, 0xB0, 0xBA, 0x3F, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0xB0, 0xF1, 0x9E, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xB2, 0x90, 0xE7, 0x20, 0x00,
 0x00, 0x00, 0x00, 0xB2, 0xBF, 0x0B, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xB4, 0x5E, 0x54, 0x20, 0x00,
@@ -996,7 +999,7 @@
 0x00, 0x00, 0x00, 0xB6, 0x6C, 0x5A, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xB8, 0x0B, 0xA3, 0x20, 0x00,
 0x00, 0x00, 0x00, 0xB8, 0x39, 0xC7, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xB9, 0xD9, 0x10, 0x20, 0x00,
 0x00, 0x00, 0x00, 0xBA, 0x10, 0x6F, 0x20, 0x00, 0x00, 0x00, 0x00, 0xBB, 0xAF, 0xB7, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0xBB, 0xE7, 0x16, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xBD, 0x86, 0x5F, 0x20, 0x00,
+0x00, 0x00, 0x00, 0xBB, 0xDD, 0xDC, 0x20, 0x00, 0x00, 0x00, 0x00, 0xBD, 0x86, 0x5F, 0x20, 0x00,
 0x00, 0x00, 0x00, 0xBD, 0xB4, 0x83, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xBF, 0x53, 0xCC, 0x20, 0x00,
 0x00, 0x00, 0x00, 0xBF, 0x8B, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x2A, 0x73, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0xC1, 0x58, 0x98, 0x20, 0x00, 0x00, 0x00, 0x00, 0xC2, 0xF7, 0xE0, 0xA0, 0x00,
@@ -1004,15 +1007,15 @@
 0x00, 0x00, 0x00, 0xC5, 0x05, 0xE7, 0x20, 0x00, 0x00, 0x00, 0x00, 0xC6, 0xA5, 0x2F, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0xC6, 0xD3, 0x54, 0x20, 0x00, 0x00, 0x00, 0x00, 0xC8, 0x72, 0x9C, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0xC8, 0xA9, 0xFB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xCA, 0x49, 0x44, 0x20, 0x00,
-0x00, 0x00, 0x00, 0xCA, 0x80, 0xA3, 0x20, 0x00, 0x00, 0x00, 0x00, 0xCC, 0x1F, 0xEB, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0xCA, 0x77, 0x68, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xCC, 0x1F, 0xEB, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0xCC, 0x4E, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00, 0xCD, 0xED, 0x58, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0xCE, 0x24, 0xB7, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xCF, 0xC4, 0x00, 0x20, 0x00,
 0x00, 0x00, 0x00, 0xCF, 0xF2, 0x24, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xD1, 0x91, 0x6D, 0x20, 0x00,
 0x00, 0x00, 0x00, 0xD1, 0xC8, 0xCC, 0x20, 0x00, 0x00, 0x00, 0x00, 0xD3, 0x68, 0x14, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0xD3, 0x9F, 0x73, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xD5, 0x3E, 0xBC, 0x20, 0x00,
+0x00, 0x00, 0x00, 0xD3, 0x96, 0x39, 0x20, 0x00, 0x00, 0x00, 0x00, 0xD5, 0x3E, 0xBC, 0x20, 0x00,
 0x00, 0x00, 0x00, 0xD5, 0x6C, 0xE0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xD7, 0x0C, 0x29, 0x20, 0x00,
 0x00, 0x00, 0x00, 0xD7, 0x43, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0xD8, 0xE2, 0xD0, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0xD9, 0x1A, 0x2F, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xDA, 0xB9, 0x78, 0x20, 0x00,
+0x00, 0x00, 0x00, 0xD9, 0x10, 0xF5, 0x20, 0x00, 0x00, 0x00, 0x00, 0xDA, 0xB9, 0x78, 0x20, 0x00,
 0x00, 0x00, 0x00, 0xDA, 0xE7, 0x9C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xDC, 0x86, 0xE5, 0x20, 0x00,
 0x00, 0x00, 0x00, 0xDC, 0xBE, 0x44, 0x20, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
@@ -1165,7 +1168,7 @@
 0x00, 0x00, 0x00, 0x5E, 0x9B, 0xB0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x5E, 0xD3, 0x0F, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0x60, 0x72, 0x58, 0x20, 0x00, 0x00, 0x00, 0x00, 0x60, 0xA0, 0x7C, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0x62, 0x3F, 0xC5, 0x20, 0x00, 0x00, 0x00, 0x00, 0x62, 0x77, 0x24, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x64, 0x16, 0x6C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x64, 0x4D, 0xCB, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0x64, 0x16, 0x6C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x64, 0x44, 0x91, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x65, 0xED, 0x14, 0x20, 0x00, 0x00, 0x00, 0x00, 0x66, 0x1B, 0x38, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0x67, 0xBA, 0x81, 0x20, 0x00, 0x00, 0x00, 0x00, 0x67, 0xF1, 0xE0, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x69, 0x91, 0x28, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x69, 0xBF, 0x4D, 0x20, 0x00,
@@ -1173,7 +1176,7 @@
 0x00, 0x00, 0x00, 0x6D, 0x35, 0x3D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x6C, 0x9C, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x6F, 0x0B, 0xE4, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x3A, 0x09, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x70, 0xD9, 0x51, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x71, 0x10, 0xB0, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x72, 0xAF, 0xF9, 0x20, 0x00, 0x00, 0x00, 0x00, 0x72, 0xE7, 0x58, 0x20, 0x00,
+0x00, 0x00, 0x00, 0x72, 0xAF, 0xF9, 0x20, 0x00, 0x00, 0x00, 0x00, 0x72, 0xDE, 0x1D, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0x74, 0x86, 0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x74, 0xB4, 0xC5, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x76, 0x54, 0x0D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x76, 0x8B, 0x6C, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0x78, 0x2A, 0xB5, 0x20, 0x00, 0x00, 0x00, 0x00, 0x78, 0x58, 0xD9, 0xA0, 0x00,
@@ -1181,7 +1184,7 @@
 0x00, 0x00, 0x00, 0x7B, 0xCE, 0xC9, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x06, 0x28, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0x7D, 0xA5, 0x71, 0x20, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xD3, 0x95, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0x7F, 0x72, 0xDE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x7F, 0xAA, 0x3D, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x81, 0x49, 0x85, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x81, 0x80, 0xE4, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0x81, 0x49, 0x85, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x81, 0x77, 0xAA, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x83, 0x20, 0x2D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x83, 0x4E, 0x51, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0x84, 0xED, 0x9A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x85, 0x24, 0xF9, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x86, 0xC4, 0x41, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x86, 0xF2, 0x66, 0x20, 0x00,
@@ -1189,7 +1192,7 @@
 0x00, 0x00, 0x00, 0x8A, 0x68, 0x56, 0x20, 0x00, 0x00, 0x00, 0x00, 0x8A, 0x9F, 0xB5, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x8C, 0x3E, 0xFD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x8C, 0x6D, 0x22, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x8E, 0x0C, 0x6A, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x8E, 0x43, 0xC9, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0x8F, 0xE3, 0x12, 0x20, 0x00, 0x00, 0x00, 0x00, 0x90, 0x1A, 0x71, 0x20, 0x00,
+0x00, 0x00, 0x00, 0x8F, 0xE3, 0x12, 0x20, 0x00, 0x00, 0x00, 0x00, 0x90, 0x11, 0x36, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0x91, 0xB9, 0xB9, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x91, 0xE7, 0xDE, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x93, 0x87, 0x26, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x93, 0xBE, 0x85, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0x95, 0x5D, 0xCE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x95, 0x8B, 0xF2, 0xA0, 0x00,
@@ -1197,7 +1200,7 @@
 0x00, 0x00, 0x00, 0x99, 0x01, 0xE2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x99, 0x39, 0x41, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0x9A, 0xD8, 0x8A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x9B, 0x06, 0xAE, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0x9C, 0xA5, 0xF7, 0x20, 0x00, 0x00, 0x00, 0x00, 0x9C, 0xDD, 0x56, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x9E, 0x7C, 0x9E, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x9E, 0xB3, 0xFD, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0x9E, 0x7C, 0x9E, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x9E, 0xAA, 0xC3, 0x20, 0x00,
 0x00, 0x00, 0x00, 0xA0, 0x53, 0x46, 0x20, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x81, 0x6A, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0xA2, 0x20, 0xB3, 0x20, 0x00, 0x00, 0x00, 0x00, 0xA2, 0x58, 0x12, 0x20, 0x00,
 0x00, 0x00, 0x00, 0xA3, 0xF7, 0x5A, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xA4, 0x25, 0x7F, 0x20, 0x00,
@@ -1205,7 +1208,7 @@
 0x00, 0x00, 0x00, 0xA7, 0x9B, 0x6F, 0x20, 0x00, 0x00, 0x00, 0x00, 0xA7, 0xD2, 0xCE, 0x20, 0x00,
 0x00, 0x00, 0x00, 0xA9, 0x72, 0x16, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xA9, 0xA0, 0x3B, 0x20, 0x00,
 0x00, 0x00, 0x00, 0xAB, 0x3F, 0x83, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xAB, 0x76, 0xE2, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0xAD, 0x16, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0xAD, 0x4D, 0x8A, 0x20, 0x00,
+0x00, 0x00, 0x00, 0xAD, 0x16, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0xAD, 0x44, 0x4F, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0xAE, 0xEC, 0xD2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xAF, 0x1A, 0xF7, 0x20, 0x00,
 0x00, 0x00, 0x00, 0xB0, 0xBA, 0x3F, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xB0, 0xF1, 0x9E, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0xB2, 0x90, 0xE7, 0x20, 0x00, 0x00, 0x00, 0x00, 0xB2, 0xBF, 0x0B, 0xA0, 0x00,
@@ -1213,7 +1216,7 @@
 0x00, 0x00, 0x00, 0xB6, 0x34, 0xFB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xB6, 0x6C, 0x5A, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0xB8, 0x0B, 0xA3, 0x20, 0x00, 0x00, 0x00, 0x00, 0xB8, 0x39, 0xC7, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0xB9, 0xD9, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00, 0xBA, 0x10, 0x6F, 0x20, 0x00,
-0x00, 0x00, 0x00, 0xBB, 0xAF, 0xB7, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xBB, 0xE7, 0x16, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0xBB, 0xAF, 0xB7, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xBB, 0xDD, 0xDC, 0x20, 0x00,
 0x00, 0x00, 0x00, 0xBD, 0x86, 0x5F, 0x20, 0x00, 0x00, 0x00, 0x00, 0xBD, 0xB4, 0x83, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0xBF, 0x53, 0xCC, 0x20, 0x00, 0x00, 0x00, 0x00, 0xBF, 0x8B, 0x2B, 0x20, 0x00,
 0x00, 0x00, 0x00, 0xC1, 0x2A, 0x73, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x58, 0x98, 0x20, 0x00,
@@ -1221,15 +1224,15 @@
 0x00, 0x00, 0x00, 0xC4, 0xCE, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0xC5, 0x05, 0xE7, 0x20, 0x00,
 0x00, 0x00, 0x00, 0xC6, 0xA5, 0x2F, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xC6, 0xD3, 0x54, 0x20, 0x00,
 0x00, 0x00, 0x00, 0xC8, 0x72, 0x9C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xC8, 0xA9, 0xFB, 0xA0, 0x00,
-0x00, 0x00, 0x00, 0xCA, 0x49, 0x44, 0x20, 0x00, 0x00, 0x00, 0x00, 0xCA, 0x80, 0xA3, 0x20, 0x00,
+0x00, 0x00, 0x00, 0xCA, 0x49, 0x44, 0x20, 0x00, 0x00, 0x00, 0x00, 0xCA, 0x77, 0x68, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0xCC, 0x1F, 0xEB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xCC, 0x4E, 0x10, 0x20, 0x00,
 0x00, 0x00, 0x00, 0xCD, 0xED, 0x58, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xCE, 0x24, 0xB7, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0xCF, 0xC4, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0xCF, 0xF2, 0x24, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0xD1, 0x91, 0x6D, 0x20, 0x00, 0x00, 0x00, 0x00, 0xD1, 0xC8, 0xCC, 0x20, 0x00,
-0x00, 0x00, 0x00, 0xD3, 0x68, 0x14, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xD3, 0x9F, 0x73, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0xD3, 0x68, 0x14, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xD3, 0x96, 0x39, 0x20, 0x00,
 0x00, 0x00, 0x00, 0xD5, 0x3E, 0xBC, 0x20, 0x00, 0x00, 0x00, 0x00, 0xD5, 0x6C, 0xE0, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0xD7, 0x0C, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0xD7, 0x43, 0x88, 0x20, 0x00,
-0x00, 0x00, 0x00, 0xD8, 0xE2, 0xD0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xD9, 0x1A, 0x2F, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0xD8, 0xE2, 0xD0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xD9, 0x10, 0xF5, 0x20, 0x00,
 0x00, 0x00, 0x00, 0xDA, 0xB9, 0x78, 0x20, 0x00, 0x00, 0x00, 0x00, 0xDA, 0xE7, 0x9C, 0xA0, 0x00,
 0x00, 0x00, 0x00, 0xDC, 0x86, 0xE5, 0x20, 0x00, 0x00, 0x00, 0x00, 0xDC, 0xBE, 0x44, 0x20, 0x01,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
@@ -1838,8 +1841,8 @@
 0x53, 0x54, 0x00, 0x42, 0x44, 0x54, 0x00, 0x41, 0x48, 0x53, 0x54, 0x00, 0x48, 0x44, 0x54, 0x00,
 0x0A, 0x48, 0x53, 0x54, 0x31, 0x30, 0x48, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30,
 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0xD8, 0x7D, 0xE0, 0x00, 0x05, 0x19,
-0x72, 0x00, 0x00, 0x00, 0x10, 0x41, 0x6C, 0x65, 0x75, 0x74, 0x69, 0x61, 0x6E, 0x20, 0x49, 0x73,
-0x6C, 0x61, 0x6E, 0x64, 0x73, 
+0x72, 0x00, 0x00, 0x00, 0x1A, 0x41, 0x6C, 0x61, 0x73, 0x6B, 0x61, 0x20, 0x2D, 0x20, 0x77, 0x65,
+0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x41, 0x6C, 0x65, 0x75, 0x74, 0x69, 0x61, 0x6E, 0x73, 
 
 /* America/Anchorage */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x55, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2853,9 +2856,8 @@
 0x8F, 0x80, 0x00, 0x10, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53,
 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x43, 0x44,
 0x54, 0x00, 0x0A, 0x43, 0x53, 0x54, 0x36, 0x0A, 0x00, 0xA9, 0x11, 0x40, 0x00, 0x72, 0x0F, 0x38,
-0x00, 0x00, 0x00, 0x20, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x54, 0x69, 0x6D, 0x65,
-0x20, 0x2D, 0x20, 0x42, 0x61, 0x68, 0x69, 0x61, 0x20, 0x64, 0x65, 0x20, 0x42, 0x61, 0x6E, 0x64,
-0x65, 0x72, 0x61, 0x73, 
+0x00, 0x00, 0x00, 0x11, 0x42, 0x61, 0x68, 0x69, 0x61, 0x20, 0x64, 0x65, 0x20, 0x42, 0x61, 0x6E,
+0x64, 0x65, 0x72, 0x61, 0x73, 
 
 /* America/Barbados */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -3033,7 +3035,7 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF,
 0xFF, 0xFF, 0xFF, 0x5E, 0x9C, 0x34, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0x98, 0x58, 0x55, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x2A, 0x03, 0x73, 0x50, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0x5D, 0x40, 0x01,
+0x00, 0x00, 0x00, 0x2A, 0x03, 0x73, 0x50, 0x00, 0x00, 0x00, 0x00, 0x2B, 0x74, 0x89, 0x40, 0x01,
 0x03, 0x02, 0x03, 0xFF, 0xFF, 0xBA, 0x90, 0x00, 0x00, 0xFF, 0xFF, 0xBA, 0x90, 0x00, 0x04, 0xFF,
 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x42,
 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x34, 0x00, 0x2D, 0x30, 0x35, 0x00, 0x0A, 0x3C, 0x2D, 0x30, 0x35,
@@ -3161,10 +3163,17 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x25, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x20, 0xFF,
 0xFF, 0xFF, 0xFF, 0xA1, 0xF2, 0xCD, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x0C, 0x90, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x18, 0x00, 0xFF,
-0xFF, 0xFF, 0xFF, 0xF7, 0x2F, 0x5A, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0x85, 0xF0, 0x00,
+0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x18, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x04, 0x61, 0x19, 0x90, 0x00, 0x00, 0x00, 0x00, 0x05, 0x50, 0xFC, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x06, 0x40, 0xFB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x07, 0x30, 0xDE, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x08, 0x20, 0xDD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x09, 0x10, 0xC0, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x0A, 0x00, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0, 0xA2, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x0B, 0xE0, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xBF, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x0D, 0xC0, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xA1, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x0F, 0xA9, 0xA0, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x83, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x11, 0x89, 0x82, 0x10, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x65, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x13, 0x69, 0x64, 0x10, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x47, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x15, 0x49, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x29, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x17, 0x29, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x45, 0x80, 0x00,
@@ -3193,20 +3202,20 @@
 0x00, 0x00, 0x00, 0x41, 0x84, 0x9B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0, 0x90, 0x00,
 0x00, 0x00, 0x00, 0x43, 0x64, 0x7D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x92, 0x90, 0x00,
 0x00, 0x00, 0x00, 0x45, 0x44, 0x5F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xC5, 0x10, 0x03,
-0x01, 0x02, 0x03, 0x04, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05,
-0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05,
-0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x07, 0x06, 0x08, 0x07,
-0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x08, 0xFF,
-0xFF, 0x9D, 0x90, 0x00, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x10, 0xFF, 0xFF, 0xAB, 0xA0, 0x01,
-0x15, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x19, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x1D, 0xFF, 0xFF, 0xB9,
-0xB0, 0x00, 0x21, 0x2D, 0x30, 0x30, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x4D, 0x50, 0x54, 0x00, 0x4D,
-0x53, 0x54, 0x00, 0x4D, 0x44, 0x44, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00,
-0x43, 0x53, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x4D, 0x44, 0x54,
-0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A,
-0x00, 0xF2, 0xC9, 0xDC, 0x00, 0x72, 0x5C, 0x42, 0x00, 0x00, 0x00, 0x14, 0x4D, 0x6F, 0x75, 0x6E,
-0x74, 0x61, 0x69, 0x6E, 0x20, 0x2D, 0x20, 0x4E, 0x55, 0x20, 0x28, 0x77, 0x65, 0x73, 0x74, 0x29,
-
+0x01, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x06, 0x05, 0x07, 0x06, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x08, 0xFF, 0xFF, 0x9D,
+0x90, 0x00, 0x0C, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x10, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x14, 0xFF,
+0xFF, 0xAB, 0xA0, 0x00, 0x18, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x1C, 0x2D, 0x30, 0x30, 0x00, 0x4D,
+0x57, 0x54, 0x00, 0x4D, 0x50, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x43,
+0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37,
+0x4D, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31,
+0x2E, 0x30, 0x0A, 0x00, 0xF2, 0xC9, 0xDC, 0x00, 0x72, 0x5C, 0x42, 0x00, 0x00, 0x00, 0x14, 0x4D,
+0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69, 0x6E, 0x20, 0x2D, 0x20, 0x4E, 0x55, 0x20, 0x28, 0x77, 0x65,
+0x73, 0x74, 0x29, 
 
 /* America/Campo_Grande */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x42, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -3306,10 +3315,8 @@
 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x00,
 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x45,
 0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x0A, 0x45, 0x53, 0x54, 0x35,
-0x0A, 0x00, 0xA9, 0x7F, 0xED, 0x00, 0x8E, 0x43, 0x45, 0x00, 0x00, 0x00, 0x24, 0x45, 0x61, 0x73,
-0x74, 0x65, 0x72, 0x6E, 0x20, 0x53, 0x74, 0x61, 0x6E, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69,
-0x6D, 0x65, 0x20, 0x2D, 0x20, 0x51, 0x75, 0x69, 0x6E, 0x74, 0x61, 0x6E, 0x61, 0x20, 0x52, 0x6F,
-0x6F, 
+0x0A, 0x00, 0xA9, 0x7F, 0xED, 0x00, 0x8E, 0x43, 0x45, 0x00, 0x00, 0x00, 0x0C, 0x51, 0x75, 0x69,
+0x6E, 0x74, 0x61, 0x6E, 0x61, 0x20, 0x52, 0x6F, 0x6F, 
 
 /* America/Caracas */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x56, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -3558,11 +3565,60 @@
 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB,
 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54,
 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x0A, 0x43, 0x53,
-0x54, 0x36, 0x0A, 0x00, 0xB5, 0x05, 0x25, 0x00, 0x70, 0xC9, 0xB2, 0x00, 0x00, 0x00, 0x26, 0x4D,
-0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x43,
+0x54, 0x36, 0x0A, 0x00, 0xB5, 0x05, 0x25, 0x00, 0x70, 0xC9, 0xB2, 0x00, 0x00, 0x00, 0x16, 0x43,
 0x68, 0x69, 0x68, 0x75, 0x61, 0x68, 0x75, 0x61, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x61,
 0x72, 0x65, 0x61, 0x73, 0x29, 
 
+/* America/Ciudad_Juarez */
+0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF,
+0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xF7, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xD9, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x3A, 0xF5, 0x12, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xB6, 0xD1, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x9D, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x7F, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x9B, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x7D, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x44, 0x2F, 0x92, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x5F, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x46, 0x0F, 0x74, 0x90, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x41, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x47, 0xF8, 0x91, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x23, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x49, 0xD8, 0x73, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE4, 0x05, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x4B, 0x9C, 0xA5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x5C, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x4D, 0x7C, 0x87, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x3E, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x4F, 0x5C, 0x69, 0x90, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x20, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x51, 0x3C, 0x4B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76, 0x02, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x53, 0x1C, 0x2D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xE4, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x54, 0xFC, 0x0F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xC6, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x56, 0xE5, 0x2C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xE3, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x58, 0xC5, 0x0E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xC5, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x5A, 0xA4, 0xF0, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0xA7, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x5C, 0x84, 0xD2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x89, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x5E, 0x64, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x6B, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x60, 0x4D, 0xD0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x87, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x62, 0x2D, 0xB2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5E, 0x2F, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x63, 0x86, 0xF1, 0x60, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x04, 0x02, 0x04,
+0x02, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03,
+0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03,
+0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03,
+0x01, 0x03, 0x02, 0x01, 0xFF, 0xFF, 0x9C, 0x2C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04,
+0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0,
+0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44,
+0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x4D, 0x44, 0x54, 0x2C, 0x4D,
+0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0xB9,
+0xC0, 0x15, 0x00, 0x70, 0x2D, 0x72, 0x00, 0x00, 0x00, 0x1C, 0x43, 0x68, 0x69, 0x68, 0x75, 0x61,
+0x68, 0x75, 0x61, 0x20, 0x28, 0x55, 0x53, 0x20, 0x62, 0x6F, 0x72, 0x64, 0x65, 0x72, 0x20, 0x2D,
+0x20, 0x77, 0x65, 0x73, 0x74, 0x29, 
+
 /* America/Coral_Harbour */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -4085,9 +4141,9 @@
 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x4D, 0x50,
 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x4D, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E,
 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0xDB, 0x0A, 0x38, 0x00, 0x65,
-0x85, 0x95, 0x00, 0x00, 0x00, 0x1D, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69, 0x6E, 0x20, 0x2D,
-0x20, 0x41, 0x42, 0x3B, 0x20, 0x42, 0x43, 0x20, 0x28, 0x45, 0x29, 0x3B, 0x20, 0x53, 0x4B, 0x20,
-0x28, 0x57, 0x29, 
+0x85, 0x95, 0x00, 0x00, 0x00, 0x25, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69, 0x6E, 0x20, 0x2D,
+0x20, 0x41, 0x42, 0x3B, 0x20, 0x42, 0x43, 0x20, 0x28, 0x45, 0x29, 0x3B, 0x20, 0x4E, 0x54, 0x20,
+0x28, 0x45, 0x29, 0x3B, 0x20, 0x53, 0x4B, 0x20, 0x28, 0x57, 0x29, 
 
 /* America/Eirunepe */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x42, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -4434,7 +4490,7 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x59, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0C, 0xFF,
 0xFF, 0xFF, 0xFF, 0x9B, 0x80, 0x68, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x7C, 0x50, 0x00,
 0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00,
 0x00, 0x00, 0x00, 0x16, 0x13, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00,
@@ -4451,14 +4507,46 @@
 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00,
 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00,
 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x01,
+0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x32, 0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x34, 0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x36, 0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x38, 0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x39, 0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3B, 0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x3D, 0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x3F, 0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x41, 0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x43, 0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x45, 0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x47, 0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x49, 0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x4A, 0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x4C, 0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x4E, 0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x50, 0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x52, 0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x54, 0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x56, 0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x58, 0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x59, 0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x5B, 0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5D, 0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5F, 0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x61, 0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x63, 0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x65, 0x3D, 0xAE, 0x90, 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, 0xFF, 0xFF, 0xCF, 0x80, 0x00, 0x00, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF, 0xE3,
-0xE0, 0x01, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x33, 0x00, 0x2D, 0x30, 0x32, 0x00, 0x0A,
-0x3C, 0x2D, 0x30, 0x33, 0x3E, 0x33, 0x3C, 0x2D, 0x30, 0x32, 0x3E, 0x2C, 0x4D, 0x33, 0x2E, 0x35,
-0x2E, 0x30, 0x2F, 0x2D, 0x32, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x2D, 0x31,
-0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+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, 0x03,
+0xFF, 0xFF, 0xCF, 0x80, 0x00, 0x00, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF, 0xE3, 0xE0,
+0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x33, 0x00,
+0x2D, 0x30, 0x32, 0x00, 0x0A, 0x3C, 0x2D, 0x30, 0x32, 0x3E, 0x32, 0x3C, 0x2D, 0x30, 0x31, 0x3E,
+0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x2D, 0x31, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35,
+0x2E, 0x30, 0x2F, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 
 
 /* America/Goose_Bay */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -4893,9 +4981,8 @@
 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF,
 0x8F, 0x80, 0x00, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00,
 0x4D, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x0A, 0x00, 0xB5,
-0xAE, 0x6A, 0x00, 0x69, 0x56, 0x25, 0x00, 0x00, 0x00, 0x1F, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61,
-0x69, 0x6E, 0x20, 0x53, 0x74, 0x61, 0x6E, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6D, 0x65,
-0x20, 0x2D, 0x20, 0x53, 0x6F, 0x6E, 0x6F, 0x72, 0x61, 
+0xAE, 0x6A, 0x00, 0x69, 0x56, 0x25, 0x00, 0x00, 0x00, 0x06, 0x53, 0x6F, 0x6E, 0x6F, 0x72, 0x61,
+
 
 /* America/Indiana/Indianapolis */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x55, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -5280,47 +5367,55 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3B, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x15, 0xFF,
-0xFF, 0xFF, 0xFF, 0xE0, 0x06, 0x4E, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x2F, 0x68, 0x80, 0xFF,
-0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x90, 0x20, 0x00,
-0x00, 0x00, 0x00, 0x13, 0x69, 0x64, 0x10, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x47, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x15, 0x49, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x29, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x17, 0x29, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x45, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x19, 0x09, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x27, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x1A, 0xF2, 0x26, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x09, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x1C, 0xD2, 0x08, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xEB, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x1E, 0xB1, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xCD, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x20, 0x76, 0x1D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xAF, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x22, 0x55, 0xFF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xCC, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x24, 0x35, 0xE1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xAE, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x26, 0x15, 0xC3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x90, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x27, 0xFE, 0xDF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x72, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x29, 0xDE, 0xC1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x54, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x2B, 0xBE, 0xA3, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x70, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x2D, 0x9E, 0x85, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x52, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x2F, 0x7E, 0x67, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x34, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xF7, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xD9, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x3A, 0xC6, 0xEE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xBB, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x9D, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x7F, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x9B, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x7D, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x44, 0x2F, 0x92, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x5F, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x45, 0xF3, 0xC5, 0x10, 0x02, 0x01, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x04, 0xFF, 0xFF,
-0x8F, 0x80, 0x00, 0x09, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x0D, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x11,
-0x2D, 0x30, 0x30, 0x00, 0x50, 0x44, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x4D, 0x53, 0x54,
-0x00, 0x4D, 0x44, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x4D, 0x44, 0x54, 0x2C, 0x4D, 0x33,
-0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0xF1, 0x9F,
-0x5C, 0x00, 0x46, 0x9F, 0x6D, 0x00, 0x00, 0x00, 0x14, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69,
-0x6E, 0x20, 0x2D, 0x20, 0x4E, 0x54, 0x20, 0x28, 0x77, 0x65, 0x73, 0x74, 0x29, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE0, 0x06, 0x4E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x04, 0x61, 0x27, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0x05, 0x51, 0x0A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x06, 0x41, 0x09, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0x07, 0x30, 0xEC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x08, 0x20, 0xEB, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0x09, 0x10, 0xCE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0xCD, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0x0A, 0xF0, 0xB0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0xAF, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0x0C, 0xD9, 0xCD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x91, 0xA0, 0x00,
+0x00, 0x00, 0x00, 0x0E, 0xB9, 0xAF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0xAE, 0x20, 0x00,
+0x00, 0x00, 0x00, 0x10, 0x99, 0x91, 0x10, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x90, 0x20, 0x00,
+0x00, 0x00, 0x00, 0x12, 0x79, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x64, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x14, 0x59, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x46, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x16, 0x39, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x28, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x18, 0x22, 0x45, 0x80, 0x00, 0x00, 0x00, 0x00, 0x19, 0x09, 0x0A, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0x02, 0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x26, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1B, 0xE2, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD2, 0x08, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1D, 0xC1, 0xEB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xEA, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x1F, 0xA1, 0xCD, 0x80, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x1D, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x21, 0x81, 0xAF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xFF, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x23, 0x6A, 0xCC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xE1, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x25, 0x4A, 0xAE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xC3, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x27, 0x2A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xDF, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x29, 0x0A, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xC1, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2A, 0xEA, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0xA3, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2C, 0xD3, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x85, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x2E, 0xB3, 0x52, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x67, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x30, 0x93, 0x34, 0x80, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x38, 0x1B, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x39, 0xFB, 0xD9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xEE, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3B, 0xDB, 0xBB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x3D, 0xBB, 0x9D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x3F, 0x9B, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x41, 0x84, 0x9B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x43, 0x64, 0x7D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x92, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x45, 0x44, 0x5F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xC5, 0x10, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x9D,
+0x90, 0x01, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x0C, 0xFF,
+0xFF, 0xAB, 0xA0, 0x01, 0x10, 0x2D, 0x30, 0x30, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54,
+0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x4D, 0x44,
+0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30,
+0x0A, 0x00, 0xF1, 0x9F, 0x5C, 0x00, 0x46, 0x9F, 0x6D, 0x00, 0x00, 0x00, 0x14, 0x4D, 0x6F, 0x75,
+0x6E, 0x74, 0x61, 0x69, 0x6E, 0x20, 0x2D, 0x20, 0x4E, 0x54, 0x20, 0x28, 0x77, 0x65, 0x73, 0x74,
+0x29, 
 
 /* America/Iqaluit */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -5328,10 +5423,17 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x21, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4A, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x1C, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCC, 0x6C, 0xA1, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD2, 0x60, 0xFB, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x2F, 0x3E, 0x50, 0xFF,
-0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0x69, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x47, 0xF0, 0x00,
+0xFF, 0xFF, 0xFF, 0xD2, 0x60, 0xFB, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x04, 0x60, 0xFD, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x05, 0x50, 0xE0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xDF, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x07, 0x30, 0xC2, 0x60, 0x00, 0x00, 0x00, 0x00, 0x08, 0x20, 0xC1, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x09, 0x10, 0xA4, 0x60, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0xA3, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x0A, 0xF0, 0x86, 0x60, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0x85, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x0C, 0xD9, 0xA2, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x67, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x0E, 0xB9, 0x84, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0x83, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x10, 0x99, 0x66, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x65, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x12, 0x79, 0x48, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x47, 0xF0, 0x00,
 0x00, 0x00, 0x00, 0x14, 0x59, 0x2A, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x29, 0xF0, 0x00,
 0x00, 0x00, 0x00, 0x16, 0x39, 0x0C, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x0B, 0xF0, 0x00,
 0x00, 0x00, 0x00, 0x18, 0x22, 0x29, 0x60, 0x00, 0x00, 0x00, 0x00, 0x19, 0x08, 0xED, 0xF0, 0x00,
@@ -5358,20 +5460,20 @@
 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x62, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xB2, 0x70, 0x00,
 0x00, 0x00, 0x00, 0x41, 0x84, 0x7F, 0x60, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0x94, 0x70, 0x00,
 0x00, 0x00, 0x00, 0x43, 0x64, 0x61, 0x60, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x76, 0x70, 0x00,
-0x00, 0x00, 0x00, 0x45, 0x44, 0x43, 0x60, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xA8, 0xF0, 0x05,
-0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
-0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
-0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x06, 0x07, 0x02, 0x04, 0x02,
-0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08, 0xFF, 0xFF, 0xD5,
-0xD0, 0x01, 0x0C, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x11, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x15, 0xFF,
-0xFF, 0xAB, 0xA0, 0x00, 0x19, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x1D, 0x2D, 0x30, 0x30, 0x00, 0x45,
-0x50, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x45, 0x44, 0x44, 0x54, 0x00, 0x45, 0x44, 0x54, 0x00,
-0x45, 0x57, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x0A, 0x45, 0x53, 0x54,
-0x35, 0x45, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E,
-0x31, 0x2E, 0x30, 0x0A, 0x00, 0xEA, 0x94, 0x15, 0x00, 0xAA, 0x2F, 0xB5, 0x00, 0x00, 0x00, 0x1E,
-0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x2D, 0x20, 0x4E, 0x55, 0x20, 0x28, 0x6D, 0x6F,
-0x73, 0x74, 0x20, 0x65, 0x61, 0x73, 0x74, 0x20, 0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 
+0x00, 0x00, 0x00, 0x45, 0x44, 0x43, 0x60, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xA8, 0xF0, 0x04,
+0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x05, 0x06, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
+0xFF, 0xC7, 0xC0, 0x01, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08, 0xFF, 0xFF, 0xC7, 0xC0, 0x01,
+0x0C, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x10, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x14, 0xFF, 0xFF, 0xB9,
+0xB0, 0x01, 0x18, 0x2D, 0x30, 0x30, 0x00, 0x45, 0x50, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x45,
+0x44, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x0A,
+0x45, 0x53, 0x54, 0x35, 0x45, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D,
+0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0xEA, 0x94, 0x15, 0x00, 0xAA, 0x2F, 0xB5, 0x00,
+0x00, 0x00, 0x19, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x2D, 0x20, 0x4E, 0x55, 0x20,
+0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 
 
 /* America/Jamaica */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4A, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -6097,10 +6199,9 @@
 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x0A, 0x43, 0x53,
 0x54, 0x36, 0x43, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31,
 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0xB0, 0xBF, 0x65, 0x00, 0x7D, 0xE2, 0x90, 0x00, 0x00, 0x00,
-0x3E, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x55, 0x53,
-0x20, 0x2D, 0x20, 0x43, 0x6F, 0x61, 0x68, 0x75, 0x69, 0x6C, 0x61, 0x2C, 0x20, 0x4E, 0x75, 0x65,
-0x76, 0x6F, 0x20, 0x4C, 0x65, 0x6F, 0x6E, 0x2C, 0x20, 0x54, 0x61, 0x6D, 0x61, 0x75, 0x6C, 0x69,
-0x70, 0x61, 0x73, 0x20, 0x28, 0x55, 0x53, 0x20, 0x62, 0x6F, 0x72, 0x64, 0x65, 0x72, 0x29, 
+0x2C, 0x43, 0x6F, 0x61, 0x68, 0x75, 0x69, 0x6C, 0x61, 0x2C, 0x20, 0x4E, 0x75, 0x65, 0x76, 0x6F,
+0x20, 0x4C, 0x65, 0x6F, 0x6E, 0x2C, 0x20, 0x54, 0x61, 0x6D, 0x61, 0x75, 0x6C, 0x69, 0x70, 0x61,
+0x73, 0x20, 0x28, 0x55, 0x53, 0x20, 0x62, 0x6F, 0x72, 0x64, 0x65, 0x72, 0x29, 
 
 /* America/Mazatlan */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -6148,10 +6249,10 @@
 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF,
 0x8F, 0x80, 0x00, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00,
 0x4D, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x0A, 0x00, 0xAC,
-0xC1, 0x42, 0x00, 0x70, 0x47, 0x7D, 0x00, 0x00, 0x00, 0x35, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61,
-0x69, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x42, 0x61, 0x6A, 0x61, 0x20, 0x43,
+0xC1, 0x42, 0x00, 0x70, 0x47, 0x7D, 0x00, 0x00, 0x00, 0x32, 0x42, 0x61, 0x6A, 0x61, 0x20, 0x43,
 0x61, 0x6C, 0x69, 0x66, 0x6F, 0x72, 0x6E, 0x69, 0x61, 0x20, 0x53, 0x75, 0x72, 0x2C, 0x20, 0x4E,
-0x61, 0x79, 0x61, 0x72, 0x69, 0x74, 0x2C, 0x20, 0x53, 0x69, 0x6E, 0x61, 0x6C, 0x6F, 0x61, 
+0x61, 0x79, 0x61, 0x72, 0x69, 0x74, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x61, 0x72, 0x65,
+0x61, 0x73, 0x29, 0x2C, 0x20, 0x53, 0x69, 0x6E, 0x61, 0x6C, 0x6F, 0x61, 
 
 /* America/Mendoza */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -6306,9 +6407,8 @@
 0xFF, 0xFF, 0xAB, 0xFC, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0,
 0x00, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00,
 0x45, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x0A, 0x43, 0x53, 0x54, 0x36, 0x0A, 0x00, 0xA9,
-0x52, 0x5A, 0x00, 0x89, 0xE9, 0xFD, 0x00, 0x00, 0x00, 0x20, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61,
-0x6C, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x43, 0x61, 0x6D, 0x70, 0x65, 0x63, 0x68,
-0x65, 0x2C, 0x20, 0x59, 0x75, 0x63, 0x61, 0x74, 0x61, 0x6E, 
+0x52, 0x5A, 0x00, 0x89, 0xE9, 0xFD, 0x00, 0x00, 0x00, 0x11, 0x43, 0x61, 0x6D, 0x70, 0x65, 0x63,
+0x68, 0x65, 0x2C, 0x20, 0x59, 0x75, 0x63, 0x61, 0x74, 0x61, 0x6E, 
 
 /* America/Metlakatla */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x55, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -6402,7 +6502,7 @@
 0x10, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43,
 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x57, 0x54, 0x00, 0x0A,
 0x43, 0x53, 0x54, 0x36, 0x0A, 0x00, 0xA6, 0xEE, 0x60, 0x00, 0x7B, 0x5E, 0x07, 0x00, 0x00, 0x00,
-0x0C, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x54, 0x69, 0x6D, 0x65, 
+0x0E, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x4D, 0x65, 0x78, 0x69, 0x63, 0x6F, 
 
 /* America/Miquelon */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x50, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -6581,12 +6681,11 @@
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
 0xFF, 0xFF, 0xA1, 0xF4, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0,
 0x01, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x0A, 0x43,
-0x53, 0x54, 0x36, 0x0A, 0x00, 0xB0, 0x7E, 0x4A, 0x00, 0x79, 0x96, 0x4D, 0x00, 0x00, 0x00, 0x45,
-0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x44,
-0x75, 0x72, 0x61, 0x6E, 0x67, 0x6F, 0x3B, 0x20, 0x43, 0x6F, 0x61, 0x68, 0x75, 0x69, 0x6C, 0x61,
-0x2C, 0x20, 0x4E, 0x75, 0x65, 0x76, 0x6F, 0x20, 0x4C, 0x65, 0x6F, 0x6E, 0x2C, 0x20, 0x54, 0x61,
-0x6D, 0x61, 0x75, 0x6C, 0x69, 0x70, 0x61, 0x73, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x61,
-0x72, 0x65, 0x61, 0x73, 0x29, 
+0x53, 0x54, 0x36, 0x0A, 0x00, 0xB0, 0x7E, 0x4A, 0x00, 0x79, 0x96, 0x4D, 0x00, 0x00, 0x00, 0x36,
+0x44, 0x75, 0x72, 0x61, 0x6E, 0x67, 0x6F, 0x3B, 0x20, 0x43, 0x6F, 0x61, 0x68, 0x75, 0x69, 0x6C,
+0x61, 0x2C, 0x20, 0x4E, 0x75, 0x65, 0x76, 0x6F, 0x20, 0x4C, 0x65, 0x6F, 0x6E, 0x2C, 0x20, 0x54,
+0x61, 0x6D, 0x61, 0x75, 0x6C, 0x69, 0x70, 0x61, 0x73, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20,
+0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 
 
 /* America/Montevideo */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x55, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -7374,7 +7473,7 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x59, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0C, 0xFF,
 0xFF, 0xFF, 0xFF, 0x9B, 0x80, 0x68, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x7C, 0x50, 0x00,
 0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00,
 0x00, 0x00, 0x00, 0x16, 0x13, 0xDC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00,
@@ -7391,16 +7490,47 @@
 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00,
 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00,
 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00,
-0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x01,
+0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x32, 0x72, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x34, 0x52, 0x96, 0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x36, 0x32, 0x78, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x38, 0x1B, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x39, 0xFB, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x3B, 0xDB, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x3D, 0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x3F, 0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x41, 0x84, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x43, 0x64, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x45, 0x43, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x47, 0x23, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x49, 0x03, 0xC1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x4A, 0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x4C, 0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x4E, 0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x50, 0x8C, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x52, 0x6C, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x54, 0x4C, 0x47, 0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x56, 0x2C, 0x29, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x58, 0x15, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x59, 0xF5, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00,
+0x00, 0x00, 0x00, 0x5B, 0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5D, 0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x5F, 0x94, 0xCE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x61, 0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x63, 0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10, 0x00,
+0x00, 0x00, 0x00, 0x65, 0x3D, 0xAE, 0x90, 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, 0xFF, 0xFF, 0xCF, 0x80, 0x00, 0x00, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF, 0xE3,
-0xE0, 0x01, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x33, 0x00, 0x2D, 0x30, 0x32, 0x00, 0x0A,
-0x3C, 0x2D, 0x30, 0x33, 0x3E, 0x33, 0x3C, 0x2D, 0x30, 0x32, 0x3E, 0x2C, 0x4D, 0x33, 0x2E, 0x35,
-0x2E, 0x30, 0x2F, 0x2D, 0x32, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x2D, 0x31,
-0x0A, 0x00, 0xEB, 0x43, 0xDD, 0x00, 0xC3, 0xB8, 0x2A, 0x00, 0x00, 0x00, 0x16, 0x47, 0x72, 0x65,
-0x65, 0x6E, 0x6C, 0x61, 0x6E, 0x64, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x61, 0x72, 0x65,
-0x61, 0x73, 0x29, 
+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, 0x03,
+0xFF, 0xFF, 0xCF, 0x80, 0x00, 0x00, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF, 0xE3, 0xE0,
+0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x33, 0x00,
+0x2D, 0x30, 0x32, 0x00, 0x0A, 0x3C, 0x2D, 0x30, 0x32, 0x3E, 0x32, 0x3C, 0x2D, 0x30, 0x31, 0x3E,
+0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x2D, 0x31, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35,
+0x2E, 0x30, 0x2F, 0x30, 0x0A, 0x00, 0xEB, 0x43, 0xDD, 0x00, 0xC3, 0xB8, 0x2A, 0x00, 0x00, 0x00,
+0x11, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6F, 0x66, 0x20, 0x47, 0x72, 0x65, 0x65, 0x6E, 0x6C, 0x61,
+0x6E, 0x64, 
 
 /* America/Ojinaga */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -7446,10 +7576,10 @@
 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB,
 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54,
 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x0A, 0x43, 0x53,
-0x54, 0x36, 0x0A, 0x00, 0xB6, 0x71, 0xBA, 0x00, 0x73, 0x54, 0xBD, 0x00, 0x00, 0x00, 0x28, 0x4D,
-0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x55, 0x53, 0x20,
-0x2D, 0x20, 0x43, 0x68, 0x69, 0x68, 0x75, 0x61, 0x68, 0x75, 0x61, 0x20, 0x28, 0x55, 0x53, 0x20,
-0x62, 0x6F, 0x72, 0x64, 0x65, 0x72, 0x29, 
+0x54, 0x36, 0x43, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31,
+0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0xB6, 0x71, 0xBA, 0x00, 0x73, 0x54, 0xBD, 0x00, 0x00, 0x00,
+0x1C, 0x43, 0x68, 0x69, 0x68, 0x75, 0x61, 0x68, 0x75, 0x61, 0x20, 0x28, 0x55, 0x53, 0x20, 0x62,
+0x6F, 0x72, 0x64, 0x65, 0x72, 0x20, 0x2D, 0x20, 0x65, 0x61, 0x73, 0x74, 0x29, 
 
 /* America/Panama */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x50, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -7465,57 +7595,61 @@
 0x00, 
 
 /* America/Pangnirtung */
-0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x29, 0xFF,
-0xFF, 0xFF, 0xFF, 0xA3, 0xD5, 0x52, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x88, 0xE2, 0x60, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x60, 0xED, 0xD0, 0xFF,
-0xFF, 0xFF, 0xFF, 0xF7, 0x2F, 0x30, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0x5B, 0xC0, 0x00,
-0x00, 0x00, 0x00, 0x13, 0x69, 0x39, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x1C, 0xD0, 0x00,
-0x00, 0x00, 0x00, 0x15, 0x49, 0x1B, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x38, 0xFE, 0xD0, 0x00,
-0x00, 0x00, 0x00, 0x17, 0x28, 0xFD, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x1B, 0x50, 0x00,
-0x00, 0x00, 0x00, 0x19, 0x08, 0xDF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x01, 0xFD, 0x50, 0x00,
-0x00, 0x00, 0x00, 0x1A, 0xF1, 0xFC, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE1, 0xDF, 0x50, 0x00,
-0x00, 0x00, 0x00, 0x1C, 0xD1, 0xDE, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xC1, 0x50, 0x00,
-0x00, 0x00, 0x00, 0x1E, 0xB1, 0xC0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xA3, 0x50, 0x00,
-0x00, 0x00, 0x00, 0x20, 0x75, 0xF2, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0x85, 0x50, 0x00,
-0x00, 0x00, 0x00, 0x22, 0x55, 0xD4, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xA1, 0xD0, 0x00,
-0x00, 0x00, 0x00, 0x24, 0x35, 0xB6, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0x83, 0xD0, 0x00,
-0x00, 0x00, 0x00, 0x26, 0x15, 0x98, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x65, 0xD0, 0x00,
-0x00, 0x00, 0x00, 0x27, 0xFE, 0xB5, 0x60, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x47, 0xD0, 0x00,
-0x00, 0x00, 0x00, 0x29, 0xDE, 0x97, 0x60, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x29, 0xD0, 0x00,
-0x00, 0x00, 0x00, 0x2B, 0xBE, 0x79, 0x60, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x46, 0x50, 0x00,
-0x00, 0x00, 0x00, 0x2D, 0x9E, 0x5B, 0x60, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x28, 0x50, 0x00,
-0x00, 0x00, 0x00, 0x2F, 0x7E, 0x3D, 0x60, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x18, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x31, 0x67, 0x67, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0xFA, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x33, 0x47, 0x49, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xDC, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x35, 0x27, 0x2B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xBE, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x37, 0x07, 0x0D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xDA, 0xE0, 0x00,
-0x00, 0x00, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00,
-0x00, 0x00, 0x00, 0x3A, 0xC6, 0xD1, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x9E, 0xE0, 0x00,
-0x00, 0x00, 0x00, 0x3C, 0xAF, 0xEE, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x80, 0xE0, 0x00,
-0x00, 0x00, 0x00, 0x3E, 0x8F, 0xD0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x62, 0xE0, 0x00,
-0x00, 0x00, 0x00, 0x40, 0x6F, 0xB2, 0x70, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x7F, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x42, 0x4F, 0x94, 0x70, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x61, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x44, 0x2F, 0x76, 0x70, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x43, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x45, 0xF3, 0xA8, 0xF0, 0x03, 0x01, 0x02, 0x03, 0x04, 0x03, 0x05, 0x03, 0x05,
-0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05,
-0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x06, 0x07, 0x06, 0x07, 0x06,
-0x07, 0x06, 0x07, 0x06, 0x08, 0x09, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06,
-0x07, 0x06, 0x07, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x04,
-0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x08, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x0C, 0xFF, 0xFF, 0xE3, 0xE0,
-0x01, 0x10, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x15, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x19, 0xFF, 0xFF,
-0xB9, 0xB0, 0x00, 0x1D, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x21, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x25,
-0x2D, 0x30, 0x30, 0x00, 0x41, 0x57, 0x54, 0x00, 0x41, 0x50, 0x54, 0x00, 0x41, 0x53, 0x54, 0x00,
-0x41, 0x44, 0x44, 0x54, 0x00, 0x41, 0x44, 0x54, 0x00, 0x45, 0x44, 0x54, 0x00, 0x45, 0x53, 0x54,
-0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x0A, 0x45, 0x53, 0x54, 0x35, 0x45, 0x44,
-0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30,
-0x0A, 0x00, 0xEE, 0x3D, 0x95, 0x00, 0xAE, 0x5B, 0x6A, 0x00, 0x00, 0x00, 0x1A, 0x45, 0x61, 0x73,
-0x74, 0x65, 0x72, 0x6E, 0x20, 0x2D, 0x20, 0x4E, 0x55, 0x20, 0x28, 0x50, 0x61, 0x6E, 0x67, 0x6E,
-0x69, 0x72, 0x74, 0x75, 0x6E, 0x67, 0x29, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4A, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x1C, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCC, 0x6C, 0xA1, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x60, 0xFB, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x04, 0x60, 0xFD, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x05, 0x50, 0xE0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xDF, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x07, 0x30, 0xC2, 0x60, 0x00, 0x00, 0x00, 0x00, 0x08, 0x20, 0xC1, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x09, 0x10, 0xA4, 0x60, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0xA3, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x0A, 0xF0, 0x86, 0x60, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0x85, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x0C, 0xD9, 0xA2, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x67, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x0E, 0xB9, 0x84, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0x83, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x10, 0x99, 0x66, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x65, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x12, 0x79, 0x48, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x47, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x14, 0x59, 0x2A, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x29, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x16, 0x39, 0x0C, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x0B, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x18, 0x22, 0x29, 0x60, 0x00, 0x00, 0x00, 0x00, 0x19, 0x08, 0xED, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0x02, 0x0B, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x0A, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x1B, 0xE1, 0xED, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD1, 0xEC, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x1D, 0xC1, 0xCF, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xCE, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x1F, 0xA1, 0xB1, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x00, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x21, 0x81, 0x93, 0x60, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xE2, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x23, 0x6A, 0xAF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xC4, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x25, 0x4A, 0x91, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xA6, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x27, 0x2A, 0x73, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xC3, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x29, 0x0A, 0x55, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xA5, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x2A, 0xEA, 0x37, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0x87, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x2C, 0xD3, 0x54, 0x60, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x69, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x2E, 0xB3, 0x36, 0x60, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x4B, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x30, 0x93, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x67, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x32, 0x72, 0xFA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x49, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x34, 0x52, 0xDC, 0x60, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x2B, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x36, 0x32, 0xBE, 0x60, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x0D, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x38, 0x1B, 0xDA, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xD1, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x3B, 0xDB, 0x9E, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xEE, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x3D, 0xBB, 0x80, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xD0, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x3F, 0x9B, 0x62, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xB2, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x41, 0x84, 0x7F, 0x60, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0x94, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x43, 0x64, 0x61, 0x60, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x76, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x45, 0x44, 0x43, 0x60, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xA8, 0xF0, 0x04,
+0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x05, 0x06, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
+0xFF, 0xC7, 0xC0, 0x01, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08, 0xFF, 0xFF, 0xC7, 0xC0, 0x01,
+0x0C, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x10, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x14, 0xFF, 0xFF, 0xB9,
+0xB0, 0x01, 0x18, 0x2D, 0x30, 0x30, 0x00, 0x45, 0x50, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x45,
+0x44, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x0A,
+0x45, 0x53, 0x54, 0x35, 0x45, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D,
+0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 
 
 /* America/Paramaribo */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x53, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -7548,9 +7682,9 @@
 0x01, 0x02, 0xFF, 0xFF, 0x96, 0xEE, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x04, 0xFF, 0xFF,
 0x9D, 0x90, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x44,
 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x0A,
-0x00, 0xBC, 0x5E, 0x01, 0x00, 0x67, 0xA5, 0xDA, 0x00, 0x00, 0x00, 0x1D, 0x4D, 0x53, 0x54, 0x20,
-0x2D, 0x20, 0x41, 0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x61, 0x20, 0x28, 0x65, 0x78, 0x63, 0x65, 0x70,
-0x74, 0x20, 0x4E, 0x61, 0x76, 0x61, 0x6A, 0x6F, 0x29, 
+0x00, 0xBC, 0x5E, 0x01, 0x00, 0x67, 0xA5, 0xDA, 0x00, 0x00, 0x00, 0x18, 0x4D, 0x53, 0x54, 0x20,
+0x2D, 0x20, 0x41, 0x5A, 0x20, 0x28, 0x65, 0x78, 0x63, 0x65, 0x70, 0x74, 0x20, 0x4E, 0x61, 0x76,
+0x61, 0x6A, 0x6F, 0x29, 
 
 /* America/Port-au-Prince */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x48, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -7844,9 +7978,16 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x15, 0xFF,
-0xFF, 0xFF, 0xFF, 0xE7, 0x8C, 0x6E, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x2F, 0x4C, 0x60, 0xFF,
-0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0x77, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x56, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE7, 0x8C, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x61, 0x0B, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x05, 0x50, 0xEE, 0x70, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xED, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x07, 0x30, 0xD0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x08, 0x20, 0xCF, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x09, 0x10, 0xB2, 0x70, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0xB1, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x0A, 0xF0, 0x94, 0x70, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0x93, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x0C, 0xD9, 0xB0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x75, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x0E, 0xB9, 0x92, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0x92, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x10, 0x99, 0x74, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x74, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x12, 0x79, 0x56, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x56, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x14, 0x59, 0x38, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x38, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x16, 0x39, 0x1A, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x1A, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x18, 0x22, 0x37, 0x70, 0x00, 0x00, 0x00, 0x00, 0x19, 0x08, 0xFC, 0x00, 0x00,
@@ -7874,17 +8015,17 @@
 0x00, 0x00, 0x00, 0x41, 0x84, 0x8D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xA2, 0x80, 0x00,
 0x00, 0x00, 0x00, 0x43, 0x64, 0x6F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x84, 0x80, 0x00,
 0x00, 0x00, 0x00, 0x45, 0x44, 0x51, 0x70, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xB7, 0x00, 0x02,
-0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x04, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
-0xFF, 0xC7, 0xC0, 0x01, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x09, 0xFF, 0xFF, 0xB9, 0xB0, 0x01,
-0x0D, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x11, 0x2D, 0x30, 0x30, 0x00, 0x43, 0x44, 0x44, 0x54, 0x00,
-0x43, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x0A, 0x43, 0x53, 0x54,
-0x36, 0x43, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E,
-0x31, 0x2E, 0x30, 0x0A, 0x00, 0xE9, 0x2E, 0x02, 0x00, 0x86, 0x26, 0x8E, 0x00, 0x00, 0x00, 0x16,
-0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x2D, 0x20, 0x4E, 0x55, 0x20, 0x28, 0x63, 0x65,
-0x6E, 0x74, 0x72, 0x61, 0x6C, 0x29, 
+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, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xB9,
+0xB0, 0x01, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0x2D,
+0x30, 0x30, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x0A,
+0x43, 0x53, 0x54, 0x36, 0x43, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D,
+0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0xE9, 0x2E, 0x02, 0x00, 0x86, 0x26, 0x8E, 0x00,
+0x00, 0x00, 0x16, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x2D, 0x20, 0x4E, 0x55, 0x20,
+0x28, 0x63, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x29, 
 
 /* America/Recife */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x42, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -7970,9 +8111,16 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x15, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD5, 0xFB, 0x81, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x2F, 0x4C, 0x60, 0xFF,
-0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0x77, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x56, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD5, 0xFB, 0x81, 0x80, 0x00, 0x00, 0x00, 0x00, 0x04, 0x61, 0x0B, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x05, 0x50, 0xEE, 0x70, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xED, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x07, 0x30, 0xD0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x08, 0x20, 0xCF, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x09, 0x10, 0xB2, 0x70, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0xB1, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x0A, 0xF0, 0x94, 0x70, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0x93, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x0C, 0xD9, 0xB0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x75, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x0E, 0xB9, 0x92, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0x92, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x10, 0x99, 0x74, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x74, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x12, 0x79, 0x56, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x56, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x14, 0x59, 0x38, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x38, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x16, 0x39, 0x1A, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x1A, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x18, 0x22, 0x37, 0x70, 0x00, 0x00, 0x00, 0x00, 0x19, 0x08, 0xFC, 0x00, 0x00,
@@ -8000,17 +8148,17 @@
 0x00, 0x00, 0x00, 0x41, 0x84, 0x8D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xA2, 0x80, 0x00,
 0x00, 0x00, 0x00, 0x43, 0x64, 0x6F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x84, 0x80, 0x00,
 0x00, 0x00, 0x00, 0x45, 0x44, 0x51, 0x70, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xB7, 0x00, 0x02,
-0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x04, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
-0xFF, 0xC7, 0xC0, 0x01, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x09, 0xFF, 0xFF, 0xB9, 0xB0, 0x01,
-0x0D, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x11, 0x2D, 0x30, 0x30, 0x00, 0x43, 0x44, 0x44, 0x54, 0x00,
-0x43, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x0A, 0x43, 0x53, 0x54,
-0x36, 0x43, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E,
-0x31, 0x2E, 0x30, 0x0A, 0x00, 0xFB, 0x4E, 0x33, 0x00, 0x81, 0xF5, 0xDB, 0x00, 0x00, 0x00, 0x17,
-0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x2D, 0x20, 0x4E, 0x55, 0x20, 0x28, 0x52, 0x65,
-0x73, 0x6F, 0x6C, 0x75, 0x74, 0x65, 0x29, 
+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, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xB9,
+0xB0, 0x01, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0x2D,
+0x30, 0x30, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x0A,
+0x43, 0x53, 0x54, 0x36, 0x43, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D,
+0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0xFB, 0x4E, 0x33, 0x00, 0x81, 0xF5, 0xDB, 0x00,
+0x00, 0x00, 0x17, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x2D, 0x20, 0x4E, 0x55, 0x20,
+0x28, 0x52, 0x65, 0x73, 0x6F, 0x6C, 0x75, 0x74, 0x65, 0x29, 
 
 /* America/Rio_Branco */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x42, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -8273,8 +8421,8 @@
 0x00, 0x2D, 0x30, 0x34, 0x00, 0x2D, 0x30, 0x33, 0x00, 0x0A, 0x3C, 0x2D, 0x30, 0x34, 0x3E, 0x34,
 0x3C, 0x2D, 0x30, 0x33, 0x3E, 0x2C, 0x4D, 0x39, 0x2E, 0x31, 0x2E, 0x36, 0x2F, 0x32, 0x34, 0x2C,
 0x4D, 0x34, 0x2E, 0x31, 0x2E, 0x36, 0x2F, 0x32, 0x34, 0x0A, 0x00, 0x56, 0x49, 0xD8, 0x00, 0xA6,
-0xD4, 0x55, 0x00, 0x00, 0x00, 0x12, 0x43, 0x68, 0x69, 0x6C, 0x65, 0x20, 0x28, 0x6D, 0x6F, 0x73,
-0x74, 0x20, 0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 
+0xD4, 0x55, 0x00, 0x00, 0x00, 0x0D, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6F, 0x66, 0x20, 0x43, 0x68,
+0x69, 0x6C, 0x65, 
 
 /* America/Santo_Domingo */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x44, 0x4F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -8968,9 +9116,8 @@
 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x50, 0x44, 0x54,
 0x00, 0x50, 0x57, 0x54, 0x00, 0x50, 0x50, 0x54, 0x00, 0x0A, 0x50, 0x53, 0x54, 0x38, 0x50, 0x44,
 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30,
-0x0A, 0x00, 0xBA, 0xF8, 0x95, 0x00, 0x60, 0x1A, 0xDD, 0x00, 0x00, 0x00, 0x21, 0x50, 0x61, 0x63,
-0x69, 0x66, 0x69, 0x63, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x55, 0x53, 0x20, 0x2D, 0x20, 0x42,
-0x61, 0x6A, 0x61, 0x20, 0x43, 0x61, 0x6C, 0x69, 0x66, 0x6F, 0x72, 0x6E, 0x69, 0x61, 
+0x0A, 0x00, 0xBA, 0xF8, 0x95, 0x00, 0x60, 0x1A, 0xDD, 0x00, 0x00, 0x00, 0x0F, 0x42, 0x61, 0x6A,
+0x61, 0x20, 0x43, 0x61, 0x6C, 0x69, 0x66, 0x6F, 0x72, 0x6E, 0x69, 0x61, 
 
 /* America/Toronto */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -9209,7 +9356,7 @@
 0xFF, 0xFF, 0xFF, 0xA1, 0xA2, 0xD2, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x28, 0xB0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x34, 0x20, 0xFF,
 0xFF, 0xFF, 0xFF, 0xF7, 0x2F, 0x76, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0xA2, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFB, 0x1D, 0x5F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00,
+0xFF, 0xFF, 0xFF, 0xF8, 0xC5, 0x84, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x14, 0x59, 0x55, 0x10, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x16, 0x39, 0x37, 0x10, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x18, 0x22, 0x53, 0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0x09, 0x18, 0x20, 0x00,
@@ -9416,15 +9563,29 @@
 0x61, 0x73, 0x6B, 0x61, 0x20, 0x2D, 0x20, 0x59, 0x61, 0x6B, 0x75, 0x74, 0x61, 0x74, 
 
 /* America/Yellowknife */
-0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x19, 0xFF,
-0xFF, 0xFF, 0xFF, 0xBE, 0x2A, 0x18, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x0C, 0x90, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x59, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xFF,
+0xFF, 0xFF, 0xFF, 0x88, 0xDE, 0xCE, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xB8, 0xAF, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0x9F, 0xBB, 0x07, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x98, 0x91, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA0, 0xD2, 0x85, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0x8A, 0xE8, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA3, 0x84, 0x06, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x6A, 0xCA, 0x90, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA5, 0x35, 0xC3, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA6, 0x53, 0xE7, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA7, 0x15, 0xA5, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x33, 0xC9, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xA8, 0xFE, 0xC2, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x0C, 0x90, 0xFF,
 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x18, 0x00, 0xFF,
-0xFF, 0xFF, 0xFF, 0xF7, 0x2F, 0x5A, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0x85, 0xF0, 0x00,
+0xFF, 0xFF, 0xFF, 0xD5, 0x55, 0xE3, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xD6, 0x20, 0xDC, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x04, 0x61, 0x19, 0x90, 0x00, 0x00, 0x00, 0x00, 0x05, 0x50, 0xFC, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x06, 0x40, 0xFB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x07, 0x30, 0xDE, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x08, 0x20, 0xDD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x09, 0x10, 0xC0, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x0A, 0x00, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0, 0xA2, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x0B, 0xE0, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xBF, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x0D, 0xC0, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xA1, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x0F, 0xA9, 0xA0, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x83, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x11, 0x89, 0x82, 0x10, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x65, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x13, 0x69, 0x64, 0x10, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x47, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x15, 0x49, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x29, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x17, 0x29, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x45, 0x80, 0x00,
@@ -9452,18 +9613,18 @@
 0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x9B, 0x80, 0x00,
 0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x7D, 0x80, 0x00,
 0x00, 0x00, 0x00, 0x44, 0x2F, 0x92, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x5F, 0x80, 0x00,
-0x00, 0x00, 0x00, 0x45, 0xF3, 0xC5, 0x10, 0x03, 0x01, 0x02, 0x03, 0x04, 0x03, 0x05, 0x03, 0x05,
-0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05,
-0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05,
-0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05,
-0x03, 0x05, 0x03, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x04,
-0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0,
-0x01, 0x10, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x15, 0x2D, 0x30, 0x30, 0x00, 0x4D, 0x57, 0x54, 0x00,
-0x4D, 0x50, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x44, 0x54, 0x00, 0x4D, 0x44, 0x54,
-0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x4D, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30,
-0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0xE8, 0x9E, 0xC7, 0x00, 0x64, 0x2C,
-0x88, 0x00, 0x00, 0x00, 0x17, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69, 0x6E, 0x20, 0x2D, 0x20,
-0x4E, 0x54, 0x20, 0x28, 0x63, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x29, 
+0x00, 0x00, 0x00, 0x45, 0xF3, 0xC5, 0x10, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x03, 0x04, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0xFF, 0xFF, 0x95, 0xA0, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x04, 0xFF, 0xFF, 0x9D, 0x90,
+0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x10, 0x4C, 0x4D,
+0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x4D, 0x50,
+0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x4D, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E,
+0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Antarctica/Casey */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x41, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -9922,9 +10083,8 @@
 0x00, 0x00, 0x46, 0x50, 0x00, 0x04, 0x00, 0x00, 0x62, 0x70, 0x01, 0x08, 0x00, 0x00, 0x54, 0x60,
 0x00, 0x0C, 0x00, 0x00, 0x54, 0x60, 0x01, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x35, 0x00,
 0x2B, 0x30, 0x37, 0x00, 0x2B, 0x30, 0x36, 0x00, 0x0A, 0x3C, 0x2B, 0x30, 0x36, 0x3E, 0x2D, 0x36,
-0x0A, 0x00, 0xCB, 0x52, 0xC8, 0x01, 0x88, 0x13, 0x18, 0x00, 0x00, 0x00, 0x17, 0x4B, 0x61, 0x7A,
-0x61, 0x6B, 0x68, 0x73, 0x74, 0x61, 0x6E, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x61, 0x72,
-0x65, 0x61, 0x73, 0x29, 
+0x0A, 0x00, 0xCB, 0x52, 0xC8, 0x01, 0x88, 0x13, 0x18, 0x00, 0x00, 0x00, 0x12, 0x6D, 0x6F, 0x73,
+0x74, 0x20, 0x6F, 0x66, 0x20, 0x4B, 0x61, 0x7A, 0x61, 0x6B, 0x68, 0x73, 0x74, 0x61, 0x6E, 
 
 /* Asia/Amman */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4A, 0x4F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -10918,7 +11078,7 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x15, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x15, 0xFF,
 0xFF, 0xFF, 0xFF, 0x7D, 0xBD, 0x4A, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x59, 0xCF, 0x00, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC8, 0xFA, 0xA6, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x38, 0x9C, 0x80, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCC, 0xE5, 0xEB, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xAC, 0xFE, 0x00, 0xFF,
@@ -10978,7 +11138,77 @@
 0x00, 0x00, 0x00, 0x5C, 0x9D, 0x43, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xB3, 0x62, 0x50, 0x00,
 0x00, 0x00, 0x00, 0x5E, 0x7E, 0x77, 0x60, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x93, 0x52, 0x60, 0x00,
 0x00, 0x00, 0x00, 0x60, 0x5E, 0x59, 0x60, 0x00, 0x00, 0x00, 0x00, 0x61, 0x7B, 0x1D, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x62, 0x3F, 0x8C, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5C, 0x5E, 0xF0, 0x02,
+0x00, 0x00, 0x00, 0x62, 0x3F, 0x8C, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5C, 0x5E, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x64, 0x4C, 0x5E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x65, 0x3C, 0x40, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x66, 0x19, 0xCB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x67, 0x1C, 0x22, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x67, 0xF0, 0x72, 0x80, 0x00, 0x00, 0x00, 0x00, 0x68, 0xFC, 0x04, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x69, 0xC7, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xDB, 0xE6, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x6B, 0xA6, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xC5, 0x03, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x6D, 0x86, 0xDE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xA4, 0xE5, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x6F, 0x66, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x84, 0xC7, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x71, 0x4F, 0xDC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x72, 0x64, 0xA9, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x73, 0x2F, 0xBE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x74, 0x44, 0x8B, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x75, 0x0F, 0xA0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x76, 0x2D, 0xA7, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x76, 0xEF, 0x82, 0x80, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0D, 0x89, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x78, 0xCF, 0x64, 0x80, 0x00, 0x00, 0x00, 0x00, 0x79, 0xED, 0x6B, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x7A, 0xAF, 0x46, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xCD, 0x4D, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x7C, 0x98, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xA3, 0xF5, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x7E, 0x78, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x7A, 0x9C, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x80, 0x58, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x48, 0x09, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x82, 0x38, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x1E, 0xB1, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x83, 0x4C, 0xE4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x56, 0x10, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x84, 0x17, 0xEB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0xEC, 0x1E, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x85, 0x23, 0x8B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x85, 0x35, 0xF2, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x86, 0x01, 0x07, 0x80, 0x00, 0x00, 0x00, 0x00, 0x86, 0xC2, 0xC5, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x86, 0xF0, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x87, 0x15, 0xD4, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x87, 0xE0, 0xE9, 0x80, 0x00, 0x00, 0x00, 0x00, 0x88, 0x99, 0x6D, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x88, 0xC7, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0xF5, 0xB6, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x89, 0xC0, 0xCB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x8A, 0x66, 0xDA, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x8A, 0x9E, 0x47, 0x80, 0x00, 0x00, 0x00, 0x00, 0x8A, 0xD5, 0x98, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x8B, 0xA0, 0xAD, 0x80, 0x00, 0x00, 0x00, 0x00, 0x8C, 0x3D, 0x81, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x8C, 0x6B, 0xB4, 0x80, 0x00, 0x00, 0x00, 0x00, 0x8C, 0xBE, 0xB4, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x8D, 0x80, 0x8F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x8E, 0x14, 0x29, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x8E, 0x42, 0x5C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8E, 0x9E, 0x96, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x8F, 0x60, 0x71, 0x80, 0x00, 0x00, 0x00, 0x00, 0x8F, 0xE1, 0x96, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x90, 0x19, 0x03, 0x80, 0x00, 0x00, 0x00, 0x00, 0x90, 0x7E, 0x78, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x91, 0x49, 0x8E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x91, 0xB8, 0x3D, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x91, 0xE6, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x92, 0x5E, 0x5A, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x93, 0x29, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x93, 0x85, 0xAA, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x93, 0xBD, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x94, 0x3E, 0x3C, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x95, 0x09, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x95, 0x5C, 0x52, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x95, 0x8A, 0x85, 0x00, 0x00, 0x00, 0x00, 0x00, 0x96, 0x27, 0x59, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x96, 0xE9, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x97, 0x32, 0xF9, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x97, 0x61, 0x2C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x98, 0x07, 0x3B, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x98, 0xC9, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x99, 0x00, 0x66, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x99, 0x37, 0xD4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x99, 0xE7, 0x1D, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x9A, 0xB2, 0x32, 0x80, 0x00, 0x00, 0x00, 0x00, 0x9A, 0xD7, 0x0E, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x9B, 0x05, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9B, 0xC6, 0xFF, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x9C, 0x92, 0x14, 0x80, 0x00, 0x00, 0x00, 0x00, 0x9C, 0xA4, 0x7B, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x9C, 0xDB, 0xE8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x9D, 0xA6, 0xE1, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x9E, 0x71, 0xF6, 0x80, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x7B, 0x22, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x9E, 0xB2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9F, 0x86, 0xC3, 0x70, 0x00,
+0x00, 0x00, 0x00, 0xA0, 0x7F, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0x6F, 0xDF, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0xA2, 0x56, 0xA4, 0x80, 0x00, 0x00, 0x00, 0x00, 0xA3, 0x4F, 0xC1, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0xA4, 0x24, 0x11, 0x80, 0x00, 0x00, 0x00, 0x00, 0xA5, 0x2F, 0xA3, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0xA5, 0xFA, 0xB9, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA7, 0x0F, 0x85, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0xA7, 0xDA, 0x9B, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0xEF, 0x67, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0xA9, 0xBA, 0x7D, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xD8, 0x84, 0x70, 0x00,
+0x00, 0x00, 0x00, 0xAB, 0x9A, 0x5F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAC, 0xB8, 0x66, 0x70, 0x00,
+0x00, 0x00, 0x00, 0xAD, 0x7A, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAE, 0x98, 0x48, 0x70, 0x00,
+0x00, 0x00, 0x00, 0xAF, 0x5A, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB0, 0x78, 0x2A, 0x70, 0x00,
+0x00, 0x00, 0x00, 0xB1, 0x43, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0xB2, 0x58, 0x0C, 0x70, 0x00,
+0x00, 0x00, 0x00, 0xB3, 0x23, 0x21, 0x80, 0x00, 0x00, 0x00, 0x00, 0xB4, 0x37, 0xEE, 0x70, 0x00,
+0x00, 0x00, 0x00, 0xB5, 0x03, 0x03, 0x80, 0x00, 0x00, 0x00, 0x00, 0xB6, 0x21, 0x0A, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0xB6, 0xE2, 0xE5, 0x80, 0x00, 0x00, 0x00, 0x00, 0xB8, 0x00, 0xEC, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0xB8, 0xC2, 0xC7, 0x80, 0x00, 0x00, 0x00, 0x00, 0xB9, 0xD7, 0x94, 0x70, 0x00,
+0x00, 0x00, 0x00, 0xBA, 0xAB, 0xE4, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBB, 0xAE, 0x3B, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0xBC, 0x8B, 0xC6, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBD, 0x84, 0xE3, 0x70, 0x00,
+0x00, 0x00, 0x00, 0xBE, 0x6B, 0xA8, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0x52, 0x50, 0x70, 0x00,
+0x00, 0x00, 0x00, 0xC0, 0x4B, 0x8A, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x28, 0xF7, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0xC1, 0x57, 0x2A, 0x80, 0x00, 0x00, 0x00, 0x00, 0xC2, 0xFF, 0x9F, 0x70, 0x00,
+0x00, 0x00, 0x00, 0xC3, 0x2D, 0xD2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC4, 0xCD, 0x0C, 0x70, 0x00,
+0x00, 0x00, 0x00, 0xC5, 0x04, 0x79, 0x80, 0x00, 0x00, 0x00, 0x00, 0xC6, 0xA3, 0xB3, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0xC6, 0xD1, 0xE6, 0x80, 0x00, 0x00, 0x00, 0x00, 0xC7, 0x09, 0x37, 0x70, 0x02,
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
 0x01, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
@@ -10986,14 +11216,22 @@
 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, 0x00, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, 0x2A,
-0x30, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x0D, 0x00,
-0x00, 0x1C, 0x20, 0x00, 0x11, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45,
-0x54, 0x00, 0x49, 0x44, 0x54, 0x00, 0x49, 0x53, 0x54, 0x00, 0x0A, 0x45, 0x45, 0x54, 0x2D, 0x32,
-0x45, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x34, 0x2E, 0x34, 0x2F, 0x35, 0x30, 0x2C, 0x4D,
-0x31, 0x30, 0x2E, 0x34, 0x2E, 0x34, 0x2F, 0x35, 0x30, 0x0A, 0x00, 0xB9, 0x64, 0xF0, 0x01, 0x47,
-0x40, 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x47, 0x61, 0x7A, 0x61, 0x20, 0x53, 0x74, 0x72, 0x69, 0x70,
-
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x00, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x00,
+0x00, 0x1C, 0x20, 0x00, 0x09, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x0D, 0x00, 0x00, 0x1C, 0x20, 0x00,
+0x11, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x49, 0x44,
+0x54, 0x00, 0x49, 0x53, 0x54, 0x00, 0x0A, 0x45, 0x45, 0x54, 0x2D, 0x32, 0x45, 0x45, 0x53, 0x54,
+0x2C, 0x4D, 0x33, 0x2E, 0x34, 0x2E, 0x34, 0x2F, 0x35, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x34,
+0x2E, 0x34, 0x2F, 0x35, 0x30, 0x0A, 0x00, 0xB9, 0x64, 0xF0, 0x01, 0x47, 0x40, 0x0A, 0x00, 0x00,
+0x00, 0x0A, 0x47, 0x61, 0x7A, 0x61, 0x20, 0x53, 0x74, 0x72, 0x69, 0x70, 
 
 /* Asia/Harbin */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -11029,7 +11267,7 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x15, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x06, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x15, 0xFF,
 0xFF, 0xFF, 0xFF, 0x7D, 0xBD, 0x4A, 0x19, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x59, 0xCF, 0x00, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC8, 0xFA, 0xA6, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x38, 0x9C, 0x80, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCC, 0xE5, 0xEB, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xAC, 0xFE, 0x00, 0xFF,
@@ -11090,7 +11328,77 @@
 0x00, 0x00, 0x00, 0x5C, 0x9D, 0x43, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xB3, 0x62, 0x50, 0x00,
 0x00, 0x00, 0x00, 0x5E, 0x7E, 0x77, 0x60, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x93, 0x52, 0x60, 0x00,
 0x00, 0x00, 0x00, 0x60, 0x5E, 0x59, 0x60, 0x00, 0x00, 0x00, 0x00, 0x61, 0x7B, 0x1D, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x62, 0x3F, 0x8C, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5C, 0x5E, 0xF0, 0x02,
+0x00, 0x00, 0x00, 0x62, 0x3F, 0x8C, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5C, 0x5E, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x64, 0x4C, 0x5E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x65, 0x3C, 0x40, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x66, 0x19, 0xCB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x67, 0x1C, 0x22, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x67, 0xF0, 0x72, 0x80, 0x00, 0x00, 0x00, 0x00, 0x68, 0xFC, 0x04, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x69, 0xC7, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xDB, 0xE6, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x6B, 0xA6, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xC5, 0x03, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x6D, 0x86, 0xDE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xA4, 0xE5, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x6F, 0x66, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x84, 0xC7, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x71, 0x4F, 0xDC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x72, 0x64, 0xA9, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x73, 0x2F, 0xBE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x74, 0x44, 0x8B, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x75, 0x0F, 0xA0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x76, 0x2D, 0xA7, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x76, 0xEF, 0x82, 0x80, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0D, 0x89, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x78, 0xCF, 0x64, 0x80, 0x00, 0x00, 0x00, 0x00, 0x79, 0xED, 0x6B, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x7A, 0xAF, 0x46, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xCD, 0x4D, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x7C, 0x98, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xA3, 0xF5, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x7E, 0x78, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x7A, 0x9C, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x80, 0x58, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x48, 0x09, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x82, 0x38, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x1E, 0xB1, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x83, 0x4C, 0xE4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x56, 0x10, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x84, 0x17, 0xEB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0xEC, 0x1E, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x85, 0x23, 0x8B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x85, 0x35, 0xF2, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x86, 0x01, 0x07, 0x80, 0x00, 0x00, 0x00, 0x00, 0x86, 0xC2, 0xC5, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x86, 0xF0, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x87, 0x15, 0xD4, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x87, 0xE0, 0xE9, 0x80, 0x00, 0x00, 0x00, 0x00, 0x88, 0x99, 0x6D, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x88, 0xC7, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0xF5, 0xB6, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x89, 0xC0, 0xCB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x8A, 0x66, 0xDA, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x8A, 0x9E, 0x47, 0x80, 0x00, 0x00, 0x00, 0x00, 0x8A, 0xD5, 0x98, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x8B, 0xA0, 0xAD, 0x80, 0x00, 0x00, 0x00, 0x00, 0x8C, 0x3D, 0x81, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x8C, 0x6B, 0xB4, 0x80, 0x00, 0x00, 0x00, 0x00, 0x8C, 0xBE, 0xB4, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x8D, 0x80, 0x8F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x8E, 0x14, 0x29, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x8E, 0x42, 0x5C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8E, 0x9E, 0x96, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x8F, 0x60, 0x71, 0x80, 0x00, 0x00, 0x00, 0x00, 0x8F, 0xE1, 0x96, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x90, 0x19, 0x03, 0x80, 0x00, 0x00, 0x00, 0x00, 0x90, 0x7E, 0x78, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x91, 0x49, 0x8E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x91, 0xB8, 0x3D, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x91, 0xE6, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x92, 0x5E, 0x5A, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x93, 0x29, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x93, 0x85, 0xAA, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x93, 0xBD, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x94, 0x3E, 0x3C, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x95, 0x09, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x95, 0x5C, 0x52, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x95, 0x8A, 0x85, 0x00, 0x00, 0x00, 0x00, 0x00, 0x96, 0x27, 0x59, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x96, 0xE9, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x97, 0x32, 0xF9, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x97, 0x61, 0x2C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x98, 0x07, 0x3B, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x98, 0xC9, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x99, 0x00, 0x66, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x99, 0x37, 0xD4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x99, 0xE7, 0x1D, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x9A, 0xB2, 0x32, 0x80, 0x00, 0x00, 0x00, 0x00, 0x9A, 0xD7, 0x0E, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x9B, 0x05, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9B, 0xC6, 0xFF, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x9C, 0x92, 0x14, 0x80, 0x00, 0x00, 0x00, 0x00, 0x9C, 0xA4, 0x7B, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x9C, 0xDB, 0xE8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x9D, 0xA6, 0xE1, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x9E, 0x71, 0xF6, 0x80, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x7B, 0x22, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x9E, 0xB2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9F, 0x86, 0xC3, 0x70, 0x00,
+0x00, 0x00, 0x00, 0xA0, 0x7F, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0x6F, 0xDF, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0xA2, 0x56, 0xA4, 0x80, 0x00, 0x00, 0x00, 0x00, 0xA3, 0x4F, 0xC1, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0xA4, 0x24, 0x11, 0x80, 0x00, 0x00, 0x00, 0x00, 0xA5, 0x2F, 0xA3, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0xA5, 0xFA, 0xB9, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA7, 0x0F, 0x85, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0xA7, 0xDA, 0x9B, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0xEF, 0x67, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0xA9, 0xBA, 0x7D, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xD8, 0x84, 0x70, 0x00,
+0x00, 0x00, 0x00, 0xAB, 0x9A, 0x5F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAC, 0xB8, 0x66, 0x70, 0x00,
+0x00, 0x00, 0x00, 0xAD, 0x7A, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAE, 0x98, 0x48, 0x70, 0x00,
+0x00, 0x00, 0x00, 0xAF, 0x5A, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB0, 0x78, 0x2A, 0x70, 0x00,
+0x00, 0x00, 0x00, 0xB1, 0x43, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0xB2, 0x58, 0x0C, 0x70, 0x00,
+0x00, 0x00, 0x00, 0xB3, 0x23, 0x21, 0x80, 0x00, 0x00, 0x00, 0x00, 0xB4, 0x37, 0xEE, 0x70, 0x00,
+0x00, 0x00, 0x00, 0xB5, 0x03, 0x03, 0x80, 0x00, 0x00, 0x00, 0x00, 0xB6, 0x21, 0x0A, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0xB6, 0xE2, 0xE5, 0x80, 0x00, 0x00, 0x00, 0x00, 0xB8, 0x00, 0xEC, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0xB8, 0xC2, 0xC7, 0x80, 0x00, 0x00, 0x00, 0x00, 0xB9, 0xD7, 0x94, 0x70, 0x00,
+0x00, 0x00, 0x00, 0xBA, 0xAB, 0xE4, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBB, 0xAE, 0x3B, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0xBC, 0x8B, 0xC6, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBD, 0x84, 0xE3, 0x70, 0x00,
+0x00, 0x00, 0x00, 0xBE, 0x6B, 0xA8, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0x52, 0x50, 0x70, 0x00,
+0x00, 0x00, 0x00, 0xC0, 0x4B, 0x8A, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x28, 0xF7, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0xC1, 0x57, 0x2A, 0x80, 0x00, 0x00, 0x00, 0x00, 0xC2, 0xFF, 0x9F, 0x70, 0x00,
+0x00, 0x00, 0x00, 0xC3, 0x2D, 0xD2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC4, 0xCD, 0x0C, 0x70, 0x00,
+0x00, 0x00, 0x00, 0xC5, 0x04, 0x79, 0x80, 0x00, 0x00, 0x00, 0x00, 0xC6, 0xA3, 0xB3, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0xC6, 0xD1, 0xE6, 0x80, 0x00, 0x00, 0x00, 0x00, 0xC7, 0x09, 0x37, 0x70, 0x02,
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
 0x01, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
@@ -11098,14 +11406,22 @@
 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, 0x00, 0x00, 0x20, 0xE7, 0x00, 0x00, 0x00,
-0x00, 0x2A, 0x30, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x00, 0x00, 0x2A, 0x30, 0x01,
-0x0D, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x11, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00,
-0x45, 0x45, 0x54, 0x00, 0x49, 0x44, 0x54, 0x00, 0x49, 0x53, 0x54, 0x00, 0x0A, 0x45, 0x45, 0x54,
-0x2D, 0x32, 0x45, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x34, 0x2E, 0x34, 0x2F, 0x35, 0x30,
-0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x34, 0x2E, 0x34, 0x2F, 0x35, 0x30, 0x0A, 0x00, 0xB9, 0x71, 0xF5,
-0x01, 0x48, 0x35, 0x7C, 0x00, 0x00, 0x00, 0x09, 0x57, 0x65, 0x73, 0x74, 0x20, 0x42, 0x61, 0x6E,
-0x6B, 
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x20, 0xE7, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01,
+0x04, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x0D, 0x00, 0x00, 0x1C,
+0x20, 0x00, 0x11, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00,
+0x49, 0x44, 0x54, 0x00, 0x49, 0x53, 0x54, 0x00, 0x0A, 0x45, 0x45, 0x54, 0x2D, 0x32, 0x45, 0x45,
+0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x34, 0x2E, 0x34, 0x2F, 0x35, 0x30, 0x2C, 0x4D, 0x31, 0x30,
+0x2E, 0x34, 0x2E, 0x34, 0x2F, 0x35, 0x30, 0x0A, 0x00, 0xB9, 0x71, 0xF5, 0x01, 0x48, 0x35, 0x7C,
+0x00, 0x00, 0x00, 0x09, 0x57, 0x65, 0x73, 0x74, 0x20, 0x42, 0x61, 0x6E, 0x6B, 
 
 /* Asia/Ho_Chi_Minh */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x56, 0x4E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -11710,7 +12026,7 @@
 0xFF, 0xFF, 0xFF, 0x7E, 0x36, 0x55, 0xAA, 0xFF, 0xFF, 0xFF, 0xFF, 0x86, 0x83, 0x85, 0xA3, 0xFF,
 0xFF, 0xFF, 0xFF, 0xBA, 0x67, 0x4E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x0A, 0xE4, 0x60, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCA, 0xB3, 0xE5, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x91, 0x5F, 0x08, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD2, 0x48, 0x6D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x91, 0xF5, 0x08, 0x01,
+0xFF, 0xFF, 0xFF, 0xD2, 0x48, 0x6D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x91, 0xEE, 0x00, 0x01,
 0x02, 0x03, 0x04, 0x05, 0x06, 0x05, 0x07, 0x00, 0x00, 0x5F, 0x56, 0x00, 0x00, 0x00, 0x00, 0x61,
 0x5D, 0x00, 0x04, 0x00, 0x00, 0x62, 0x70, 0x00, 0x08, 0x00, 0x00, 0x67, 0x20, 0x01, 0x0C, 0x00,
 0x00, 0x67, 0x20, 0x00, 0x0C, 0x00, 0x00, 0x69, 0x78, 0x00, 0x12, 0x00, 0x00, 0x7E, 0x90, 0x00,
@@ -12003,8 +12319,7 @@
 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x0A, 0x45, 0x45, 0x54, 0x2D, 0x32, 0x45, 0x45, 0x53,
 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x33, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35,
 0x2E, 0x30, 0x2F, 0x34, 0x0A, 0x00, 0xBE, 0xFD, 0x3A, 0x01, 0x45, 0x92, 0x5A, 0x00, 0x00, 0x00,
-0x13, 0x43, 0x79, 0x70, 0x72, 0x75, 0x73, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x61, 0x72,
-0x65, 0x61, 0x73, 0x29, 
+0x0E, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6F, 0x66, 0x20, 0x43, 0x79, 0x70, 0x72, 0x75, 0x73, 
 
 /* Asia/Novokuznetsk */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x52, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -12544,7 +12859,7 @@
 0xFF, 0xFF, 0xFF, 0x7E, 0x36, 0x53, 0xA3, 0xFF, 0xFF, 0xFF, 0xFF, 0x86, 0x83, 0x85, 0xA3, 0xFF,
 0xFF, 0xFF, 0xFF, 0xBA, 0x67, 0x4E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x0A, 0xE4, 0x60, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCA, 0xB3, 0xE5, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x91, 0x5F, 0x08, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD2, 0x48, 0x6D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x91, 0xF5, 0x08, 0x01,
+0xFF, 0xFF, 0xFF, 0xD2, 0x48, 0x6D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x91, 0xEE, 0x00, 0x01,
 0x02, 0x03, 0x04, 0x05, 0x06, 0x05, 0x07, 0x00, 0x00, 0x61, 0x5D, 0x00, 0x00, 0x00, 0x00, 0x61,
 0x5D, 0x00, 0x04, 0x00, 0x00, 0x62, 0x70, 0x00, 0x08, 0x00, 0x00, 0x67, 0x20, 0x01, 0x0C, 0x00,
 0x00, 0x67, 0x20, 0x00, 0x0C, 0x00, 0x00, 0x69, 0x78, 0x00, 0x12, 0x00, 0x00, 0x7E, 0x90, 0x00,
@@ -12601,9 +12916,9 @@
 0x00, 0x00, 0x9A, 0xB0, 0x01, 0x0C, 0x00, 0x00, 0xA8, 0xC0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00,
 0x2B, 0x31, 0x30, 0x00, 0x2B, 0x31, 0x32, 0x00, 0x2B, 0x31, 0x31, 0x00, 0x0A, 0x3C, 0x2B, 0x31,
 0x31, 0x3E, 0x2D, 0x31, 0x31, 0x0A, 0x00, 0xF0, 0x46, 0x6A, 0x01, 0xFD, 0x36, 0x12, 0x00, 0x00,
-0x00, 0x22, 0x4D, 0x53, 0x4B, 0x2B, 0x30, 0x38, 0x20, 0x2D, 0x20, 0x53, 0x61, 0x6B, 0x68, 0x61,
-0x20, 0x28, 0x45, 0x29, 0x3B, 0x20, 0x4E, 0x6F, 0x72, 0x74, 0x68, 0x20, 0x4B, 0x75, 0x72, 0x69,
-0x6C, 0x20, 0x49, 0x73, 
+0x00, 0x1E, 0x4D, 0x53, 0x4B, 0x2B, 0x30, 0x38, 0x20, 0x2D, 0x20, 0x53, 0x61, 0x6B, 0x68, 0x61,
+0x20, 0x28, 0x45, 0x29, 0x3B, 0x20, 0x4E, 0x20, 0x4B, 0x75, 0x72, 0x69, 0x6C, 0x20, 0x49, 0x73,
+
 
 /* Asia/Taipei */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x54, 0x57, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -12981,9 +13296,8 @@
 0x03, 0x00, 0x00, 0x64, 0x34, 0x00, 0x00, 0x00, 0x00, 0x62, 0x70, 0x00, 0x04, 0x00, 0x00, 0x7E,
 0x90, 0x01, 0x08, 0x00, 0x00, 0x70, 0x80, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x37,
 0x00, 0x2B, 0x30, 0x39, 0x00, 0x2B, 0x30, 0x38, 0x00, 0x0A, 0x3C, 0x2B, 0x30, 0x38, 0x3E, 0x2D,
-0x38, 0x0A, 0x00, 0xD2, 0x71, 0xB2, 0x01, 0xB5, 0xBF, 0xCD, 0x00, 0x00, 0x00, 0x15, 0x4D, 0x6F,
-0x6E, 0x67, 0x6F, 0x6C, 0x69, 0x61, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x61, 0x72, 0x65,
-0x61, 0x73, 0x29, 
+0x38, 0x0A, 0x00, 0xD2, 0x71, 0xB2, 0x01, 0xB5, 0xBF, 0xCD, 0x00, 0x00, 0x00, 0x10, 0x6D, 0x6F,
+0x73, 0x74, 0x20, 0x6F, 0x66, 0x20, 0x4D, 0x6F, 0x6E, 0x67, 0x6F, 0x6C, 0x69, 0x61, 
 
 /* Asia/Ulan_Bator */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -15730,7 +16044,7 @@
 0xFF, 0xFF, 0xFF, 0xA1, 0xA2, 0xD2, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x28, 0xB0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x34, 0x20, 0xFF,
 0xFF, 0xFF, 0xFF, 0xF7, 0x2F, 0x76, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0xA2, 0x10, 0xFF,
-0xFF, 0xFF, 0xFF, 0xFB, 0x1D, 0x5F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00,
+0xFF, 0xFF, 0xFF, 0xF8, 0xC5, 0x84, 0x90, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x14, 0x59, 0x55, 0x10, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x16, 0x39, 0x37, 0x10, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00,
 0x00, 0x00, 0x00, 0x18, 0x22, 0x53, 0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0x09, 0x18, 0x20, 0x00,
@@ -16169,7 +16483,7 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0D, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0D, 0xFF,
 0xFF, 0xFF, 0xFF, 0x7D, 0xBD, 0x4D, 0xAB, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x93, 0xB4, 0xE0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xC8, 0xFA, 0x7B, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xFC, 0xEF, 0xE0, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCA, 0xC7, 0xE8, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xCB, 0xAE, 0x60, 0xFF,
@@ -16233,7 +16547,7 @@
 0x00, 0x00, 0x00, 0x4C, 0x61, 0xBD, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0x89, 0x58, 0xE0, 0x00,
 0x00, 0x00, 0x00, 0x4C, 0xA4, 0xFA, 0x50, 0x00, 0x00, 0x00, 0x00, 0x53, 0x75, 0x38, 0xE0, 0x00,
 0x00, 0x00, 0x00, 0x53, 0xAC, 0x89, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x53, 0xDA, 0xBC, 0x60, 0x00,
-0x00, 0x00, 0x00, 0x54, 0x24, 0x82, 0x50, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x00, 0x00, 0x00, 0x54, 0x24, 0x82, 0x50, 0x00, 0x00, 0x00, 0x00, 0x64, 0x4A, 0xF0, 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,
@@ -16241,10 +16555,12 @@
 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, 0x00, 0x00, 0x1D, 0x55, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30,
-0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54,
-0x00, 0x45, 0x45, 0x54, 0x00, 0x0A, 0x45, 0x45, 0x54, 0x2D, 0x32, 0x0A, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00,
+0x00, 0x1D, 0x55, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x00,
+0x09, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x0A, 0x45,
+0x45, 0x54, 0x2D, 0x32, 0x45, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x34, 0x2E, 0x35, 0x2E, 0x35, 0x2F,
+0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x34, 0x2F, 0x32, 0x34, 0x0A, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Eire */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -17141,9 +17457,8 @@
 0x30, 0x01, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00,
 0x43, 0x45, 0x4D, 0x54, 0x00, 0x0A, 0x43, 0x45, 0x54, 0x2D, 0x31, 0x43, 0x45, 0x53, 0x54, 0x2C,
 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x33,
-0x0A, 0x00, 0xD9, 0x70, 0x10, 0x01, 0x27, 0x0D, 0xDA, 0x00, 0x00, 0x00, 0x14, 0x47, 0x65, 0x72,
-0x6D, 0x61, 0x6E, 0x79, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x61, 0x72, 0x65, 0x61, 0x73,
-0x29, 
+0x0A, 0x00, 0xD9, 0x70, 0x10, 0x01, 0x27, 0x0D, 0xDA, 0x00, 0x00, 0x00, 0x0F, 0x6D, 0x6F, 0x73,
+0x74, 0x20, 0x6F, 0x66, 0x20, 0x47, 0x65, 0x72, 0x6D, 0x61, 0x6E, 0x79, 
 
 /* Europe/Bratislava */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x53, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -18192,7 +18507,7 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x18, 0xFF,
 0xFF, 0xFF, 0xFF, 0xA1, 0x00, 0x39, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB5, 0xA4, 0x0B, 0x50, 0x00,
 0x00, 0x00, 0x00, 0x15, 0x27, 0x99, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x18, 0xCE, 0x30, 0x00,
 0x00, 0x00, 0x00, 0x17, 0x08, 0xCD, 0x40, 0x00, 0x00, 0x00, 0x00, 0x17, 0xFA, 0x01, 0xB0, 0x00,
@@ -18225,15 +18540,16 @@
 0x00, 0x00, 0x00, 0x4A, 0xE3, 0x86, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0x8D, 0xF0, 0x00,
 0x00, 0x00, 0x00, 0x4C, 0xCC, 0xA3, 0x70, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x6F, 0xF0, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x4C, 0x1D, 0x60, 0x01, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x04, 0x01, 0x04, 0x01, 0x03, 0x04, 0x01,
-0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01,
-0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01,
-0x04, 0x01, 0x04, 0x01, 0x03, 0x01, 0x00, 0x00, 0x2E, 0x98, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x04, 0x05, 0x04, 0x05, 0x03, 0x04, 0x05,
+0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
+0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
+0x04, 0x05, 0x04, 0x05, 0x06, 0x05, 0x00, 0x00, 0x2E, 0x98, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30,
 0x00, 0x04, 0x00, 0x00, 0x46, 0x50, 0x01, 0x08, 0x00, 0x00, 0x38, 0x40, 0x00, 0x0C, 0x00, 0x00,
-0x38, 0x40, 0x01, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x33, 0x00, 0x2B, 0x30, 0x35, 0x00,
-0x2B, 0x30, 0x34, 0x00, 0x0A, 0x3C, 0x2B, 0x30, 0x33, 0x3E, 0x2D, 0x33, 0x0A, 0x00, 0xE2, 0xBE,
-0xE0, 0x01, 0x5E, 0x6B, 0x08, 0x00, 0x00, 0x00, 0x0E, 0x4D, 0x53, 0x4B, 0x2B, 0x30, 0x30, 0x20,
-0x2D, 0x20, 0x4B, 0x69, 0x72, 0x6F, 0x76, 
+0x38, 0x40, 0x01, 0x10, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x14, 0x00, 0x00, 0x38, 0x40, 0x00, 0x14,
+0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x33, 0x00, 0x2B, 0x30, 0x35, 0x00, 0x2B, 0x30, 0x34, 0x00,
+0x4D, 0x53, 0x44, 0x00, 0x4D, 0x53, 0x4B, 0x00, 0x0A, 0x4D, 0x53, 0x4B, 0x2D, 0x33, 0x0A, 0x00,
+0xE2, 0xBE, 0xE0, 0x01, 0x5E, 0x6B, 0x08, 0x00, 0x00, 0x00, 0x0E, 0x4D, 0x53, 0x4B, 0x2B, 0x30,
+0x30, 0x20, 0x2D, 0x20, 0x4B, 0x69, 0x72, 0x6F, 0x76, 
 
 /* Europe/Kyiv */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x55, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -18271,8 +18587,8 @@
 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 0x00, 0x4D, 0x53, 0x44, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00,
 0x0A, 0x45, 0x45, 0x54, 0x2D, 0x32, 0x45, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E,
 0x30, 0x2F, 0x33, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x34, 0x0A, 0x00, 0xD6,
-0x48, 0xC5, 0x01, 0x41, 0x39, 0x12, 0x00, 0x00, 0x00, 0x14, 0x55, 0x6B, 0x72, 0x61, 0x69, 0x6E,
-0x65, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 
+0x48, 0xC5, 0x01, 0x41, 0x39, 0x12, 0x00, 0x00, 0x00, 0x0F, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6F,
+0x66, 0x20, 0x55, 0x6B, 0x72, 0x61, 0x69, 0x6E, 0x65, 
 
 /* Europe/Lisbon */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -20045,7 +20361,7 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x18, 0xFF,
 0xFF, 0xFF, 0xFF, 0xA1, 0xF5, 0x46, 0xDC, 0xFF, 0xFF, 0xFF, 0xFF, 0xB5, 0xA4, 0x0B, 0x50, 0x00,
 0x00, 0x00, 0x00, 0x15, 0x27, 0x99, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x18, 0xCE, 0x30, 0x00,
 0x00, 0x00, 0x00, 0x17, 0x08, 0xCD, 0x40, 0x00, 0x00, 0x00, 0x00, 0x17, 0xFA, 0x01, 0xB0, 0x00,
@@ -20079,15 +20395,16 @@
 0x00, 0x00, 0x00, 0x4C, 0xCC, 0xA3, 0x70, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x6F, 0xF0, 0x00,
 0x00, 0x00, 0x00, 0x54, 0x4C, 0x1D, 0x60, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xD4, 0xED, 0xF0, 0x00,
 0x00, 0x00, 0x00, 0x5F, 0xE7, 0xB2, 0x60, 0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x02, 0x04, 0x01,
-0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01,
-0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01,
-0x04, 0x01, 0x04, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x29, 0xA4, 0x00, 0x00, 0x00, 0x00,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x02, 0x04, 0x05,
+0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
+0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05,
+0x04, 0x05, 0x04, 0x05, 0x06, 0x05, 0x02, 0x05, 0x00, 0x00, 0x29, 0xA4, 0x00, 0x00, 0x00, 0x00,
 0x2A, 0x30, 0x00, 0x04, 0x00, 0x00, 0x38, 0x40, 0x00, 0x08, 0x00, 0x00, 0x46, 0x50, 0x01, 0x0C,
-0x00, 0x00, 0x38, 0x40, 0x01, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x33, 0x00, 0x2B, 0x30,
-0x34, 0x00, 0x2B, 0x30, 0x35, 0x00, 0x0A, 0x3C, 0x2B, 0x30, 0x33, 0x3E, 0x2D, 0x33, 0x0A, 0x00,
-0xD3, 0xB0, 0xB5, 0x01, 0x56, 0x6E, 0xC2, 0x00, 0x00, 0x00, 0x12, 0x4D, 0x53, 0x4B, 0x2B, 0x30,
-0x30, 0x20, 0x2D, 0x20, 0x56, 0x6F, 0x6C, 0x67, 0x6F, 0x67, 0x72, 0x61, 0x64, 
+0x00, 0x00, 0x38, 0x40, 0x01, 0x10, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x14, 0x00, 0x00, 0x38, 0x40,
+0x00, 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x33, 0x00, 0x2B, 0x30, 0x34, 0x00, 0x2B, 0x30,
+0x35, 0x00, 0x4D, 0x53, 0x44, 0x00, 0x4D, 0x53, 0x4B, 0x00, 0x0A, 0x4D, 0x53, 0x4B, 0x2D, 0x33,
+0x0A, 0x00, 0xD3, 0xB0, 0xB5, 0x01, 0x56, 0x6E, 0xC2, 0x00, 0x00, 0x00, 0x12, 0x4D, 0x53, 0x4B,
+0x2B, 0x30, 0x30, 0x20, 0x2D, 0x20, 0x56, 0x6F, 0x6C, 0x67, 0x6F, 0x67, 0x72, 0x61, 0x64, 
 
 /* Europe/Warsaw */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x50, 0x4C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -21508,9 +21825,9 @@
 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x4E, 0x5A, 0x53, 0x54, 0x00, 0x4E, 0x5A, 0x4D, 0x54,
 0x00, 0x4E, 0x5A, 0x44, 0x54, 0x00, 0x0A, 0x4E, 0x5A, 0x53, 0x54, 0x2D, 0x31, 0x32, 0x4E, 0x5A,
 0x44, 0x54, 0x2C, 0x4D, 0x39, 0x2E, 0x35, 0x2E, 0x30, 0x2C, 0x4D, 0x34, 0x2E, 0x31, 0x2E, 0x30,
-0x2F, 0x33, 0x0A, 0x00, 0x51, 0x13, 0x35, 0x02, 0x1D, 0x54, 0xBA, 0x00, 0x00, 0x00, 0x18, 0x4E,
-0x65, 0x77, 0x20, 0x5A, 0x65, 0x61, 0x6C, 0x61, 0x6E, 0x64, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74,
-0x20, 0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 
+0x2F, 0x33, 0x0A, 0x00, 0x51, 0x13, 0x35, 0x02, 0x1D, 0x54, 0xBA, 0x00, 0x00, 0x00, 0x13, 0x6D,
+0x6F, 0x73, 0x74, 0x20, 0x6F, 0x66, 0x20, 0x4E, 0x65, 0x77, 0x20, 0x5A, 0x65, 0x61, 0x6C, 0x61,
+0x6E, 0x64, 
 
 /* Pacific/Bougainville */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x50, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -21949,9 +22266,8 @@
 0x00, 0x00, 0x8C, 0xA0, 0x00, 0x0C, 0x00, 0x00, 0xA8, 0xC0, 0x00, 0x10, 0x4C, 0x4D, 0x54, 0x00,
 0x2B, 0x31, 0x31, 0x00, 0x2B, 0x30, 0x39, 0x00, 0x2B, 0x31, 0x30, 0x00, 0x2B, 0x31, 0x32, 0x00,
 0x0A, 0x3C, 0x2B, 0x31, 0x32, 0x3E, 0x2D, 0x31, 0x32, 0x0A, 0x00, 0x94, 0x3D, 0x38, 0x02, 0x17,
-0xE3, 0x80, 0x00, 0x00, 0x00, 0x1D, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x6C, 0x20, 0x49,
-0x73, 0x6C, 0x61, 0x6E, 0x64, 0x73, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x61, 0x72, 0x65,
-0x61, 0x73, 0x29, 
+0xE3, 0x80, 0x00, 0x00, 0x00, 0x18, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6F, 0x66, 0x20, 0x4D, 0x61,
+0x72, 0x73, 0x68, 0x61, 0x6C, 0x6C, 0x20, 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64, 0x73, 
 
 /* Pacific/Marquesas */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x50, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -22123,9 +22439,8 @@
 0x02, 0x00, 0x00, 0x89, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x89, 0xF0, 0x00, 0x04, 0x00, 0x00, 0x8C,
 0xA0, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x50, 0x4D, 0x4D, 0x54, 0x00, 0x2B, 0x31, 0x30, 0x00,
 0x0A, 0x3C, 0x2B, 0x31, 0x30, 0x3E, 0x2D, 0x31, 0x30, 0x0A, 0x00, 0x7A, 0xD5, 0x50, 0x01, 0xF3,
-0x37, 0x7A, 0x00, 0x00, 0x00, 0x1D, 0x50, 0x61, 0x70, 0x75, 0x61, 0x20, 0x4E, 0x65, 0x77, 0x20,
-0x47, 0x75, 0x69, 0x6E, 0x65, 0x61, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x61, 0x72, 0x65,
-0x61, 0x73, 0x29, 
+0x37, 0x7A, 0x00, 0x00, 0x00, 0x18, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6F, 0x66, 0x20, 0x50, 0x61,
+0x70, 0x75, 0x61, 0x20, 0x4E, 0x65, 0x77, 0x20, 0x47, 0x75, 0x69, 0x6E, 0x65, 0x61, 
 
 /* Pacific/Rarotonga */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -22607,7 +22922,7 @@
 0xFF, 0xFF, 0xFF, 0x7E, 0x36, 0x53, 0xA3, 0xFF, 0xFF, 0xFF, 0xFF, 0x86, 0x83, 0x85, 0xA3, 0xFF,
 0xFF, 0xFF, 0xFF, 0xBA, 0x67, 0x4E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x0A, 0xE4, 0x60, 0xFF,
 0xFF, 0xFF, 0xFF, 0xCA, 0xB3, 0xE5, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x91, 0x5F, 0x08, 0xFF,
-0xFF, 0xFF, 0xFF, 0xD2, 0x48, 0x6D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x91, 0xF5, 0x08, 0x01,
+0xFF, 0xFF, 0xFF, 0xD2, 0x48, 0x6D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x91, 0xEE, 0x00, 0x01,
 0x02, 0x03, 0x04, 0x05, 0x06, 0x05, 0x07, 0x00, 0x00, 0x61, 0x5D, 0x00, 0x00, 0x00, 0x00, 0x61,
 0x5D, 0x00, 0x04, 0x00, 0x00, 0x62, 0x70, 0x00, 0x08, 0x00, 0x00, 0x67, 0x20, 0x01, 0x0C, 0x00,
 0x00, 0x67, 0x20, 0x00, 0x0C, 0x00, 0x00, 0x69, 0x78, 0x00, 0x12, 0x00, 0x00, 0x7E, 0x90, 0x00,
@@ -23543,7 +23858,7 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 };
 #else
-const timelib_tzdb_index_entry timezonedb_idx_builtin596 = {
+const timelib_tzdb_index_entry timezonedb_idx_builtin597 = {
 	{ (char*) "Africa/Abidjan"                    , 0x000000 },
 	{ (char*) "Africa/Accra"                      , 0x0000A0 },
 	{ (char*) "Africa/Addis_Ababa"                , 0x0004D0 },
@@ -23558,592 +23873,593 @@
 	{ (char*) "Africa/Brazzaville"                , 0x000E79 },
 	{ (char*) "Africa/Bujumbura"                  , 0x000F1A },
 	{ (char*) "Africa/Cairo"                      , 0x000FBB },
-	{ (char*) "Africa/Casablanca"                 , 0x00176A },
-	{ (char*) "Africa/Ceuta"                      , 0x0020F3 },
-	{ (char*) "Africa/Conakry"                    , 0x002911 },
-	{ (char*) "Africa/Dakar"                      , 0x0029ED },
-	{ (char*) "Africa/Dar_es_Salaam"              , 0x002AAF },
-	{ (char*) "Africa/Djibouti"                   , 0x002B90 },
-	{ (char*) "Africa/Douala"                     , 0x002C31 },
-	{ (char*) "Africa/El_Aaiun"                   , 0x002CD2 },
-	{ (char*) "Africa/Freetown"                   , 0x0035D5 },
-	{ (char*) "Africa/Gaborone"                   , 0x0037B1 },
-	{ (char*) "Africa/Harare"                     , 0x0038A8 },
-	{ (char*) "Africa/Johannesburg"               , 0x003949 },
-	{ (char*) "Africa/Juba"                       , 0x003A4B },
-	{ (char*) "Africa/Kampala"                    , 0x003CFE },
-	{ (char*) "Africa/Khartoum"                   , 0x003E05 },
-	{ (char*) "Africa/Kigali"                     , 0x0040B8 },
-	{ (char*) "Africa/Kinshasa"                   , 0x004159 },
-	{ (char*) "Africa/Lagos"                      , 0x004213 },
-	{ (char*) "Africa/Libreville"                 , 0x00430A },
-	{ (char*) "Africa/Lome"                       , 0x0043AB },
-	{ (char*) "Africa/Luanda"                     , 0x00444B },
-	{ (char*) "Africa/Lubumbashi"                 , 0x004512 },
-	{ (char*) "Africa/Lusaka"                     , 0x0045EE },
-	{ (char*) "Africa/Malabo"                     , 0x00468F },
-	{ (char*) "Africa/Maputo"                     , 0x004752 },
-	{ (char*) "Africa/Maseru"                     , 0x0047F3 },
-	{ (char*) "Africa/Mbabane"                    , 0x0048BF },
-	{ (char*) "Africa/Mogadishu"                  , 0x004963 },
-	{ (char*) "Africa/Monrovia"                   , 0x004A44 },
-	{ (char*) "Africa/Nairobi"                    , 0x004B20 },
-	{ (char*) "Africa/Ndjamena"                   , 0x004C35 },
-	{ (char*) "Africa/Niamey"                     , 0x004D08 },
-	{ (char*) "Africa/Nouakchott"                 , 0x004DED },
-	{ (char*) "Africa/Ouagadougou"                , 0x004EC9 },
-	{ (char*) "Africa/Porto-Novo"                 , 0x004F69 },
-	{ (char*) "Africa/Sao_Tome"                   , 0x00502C },
-	{ (char*) "Africa/Timbuktu"                   , 0x005136 },
-	{ (char*) "Africa/Tripoli"                    , 0x0051D6 },
-	{ (char*) "Africa/Tunis"                      , 0x005453 },
-	{ (char*) "Africa/Windhoek"                   , 0x005710 },
-	{ (char*) "America/Adak"                      , 0x005AD7 },
-	{ (char*) "America/Anchorage"                 , 0x006427 },
-	{ (char*) "America/Anguilla"                  , 0x006D89 },
-	{ (char*) "America/Antigua"                   , 0x006E29 },
-	{ (char*) "America/Araguaina"                 , 0x006EEB },
-	{ (char*) "America/Argentina/Buenos_Aires"    , 0x007266 },
-	{ (char*) "America/Argentina/Catamarca"       , 0x0076AD },
-	{ (char*) "America/Argentina/ComodRivadavia"  , 0x007AFA },
-	{ (char*) "America/Argentina/Cordoba"         , 0x007F2C },
-	{ (char*) "America/Argentina/Jujuy"           , 0x008394 },
-	{ (char*) "America/Argentina/La_Rioja"        , 0x0087B4 },
-	{ (char*) "America/Argentina/Mendoza"         , 0x008C01 },
-	{ (char*) "America/Argentina/Rio_Gallegos"    , 0x00903F },
-	{ (char*) "America/Argentina/Salta"           , 0x009480 },
-	{ (char*) "America/Argentina/San_Juan"        , 0x0098AC },
-	{ (char*) "America/Argentina/San_Luis"        , 0x009CF9 },
-	{ (char*) "America/Argentina/Tucuman"         , 0x00A152 },
-	{ (char*) "America/Argentina/Ushuaia"         , 0x00A5AC },
-	{ (char*) "America/Aruba"                     , 0x00A9F3 },
-	{ (char*) "America/Asuncion"                  , 0x00AAB9 },
-	{ (char*) "America/Atikokan"                  , 0x00B2B3 },
-	{ (char*) "America/Atka"                      , 0x00B430 },
-	{ (char*) "America/Bahia"                     , 0x00BD70 },
-	{ (char*) "America/Bahia_Banderas"            , 0x00C173 },
-	{ (char*) "America/Barbados"                  , 0x00C61F },
-	{ (char*) "America/Belem"                     , 0x00C7DF },
-	{ (char*) "America/Belize"                    , 0x00CA2F },
-	{ (char*) "America/Blanc-Sablon"              , 0x00D089 },
-	{ (char*) "America/Boa_Vista"                 , 0x00D1DB },
-	{ (char*) "America/Bogota"                    , 0x00D458 },
-	{ (char*) "America/Boise"                     , 0x00D54C },
-	{ (char*) "America/Buenos_Aires"              , 0x00DEE2 },
-	{ (char*) "America/Cambridge_Bay"             , 0x00E314 },
-	{ (char*) "America/Campo_Grande"              , 0x00EB58 },
-	{ (char*) "America/Cancun"                    , 0x00F10C },
-	{ (char*) "America/Caracas"                   , 0x00F47E },
-	{ (char*) "America/Catamarca"                 , 0x00F584 },
-	{ (char*) "America/Cayenne"                   , 0x00F9B6 },
-	{ (char*) "America/Cayman"                    , 0x00FA7A },
-	{ (char*) "America/Chicago"                   , 0x00FB3C },
-	{ (char*) "America/Chihuahua"                 , 0x010964 },
-	{ (char*) "America/Coral_Harbour"             , 0x010DE4 },
-	{ (char*) "America/Cordoba"                   , 0x010EA6 },
-	{ (char*) "America/Costa_Rica"                , 0x0112D8 },
-	{ (char*) "America/Creston"                   , 0x011420 },
-	{ (char*) "America/Cuiaba"                    , 0x01150E },
-	{ (char*) "America/Curacao"                   , 0x011A9F },
-	{ (char*) "America/Danmarkshavn"              , 0x011B65 },
-	{ (char*) "America/Dawson"                    , 0x011E45 },
-	{ (char*) "America/Dawson_Creek"              , 0x0124B1 },
-	{ (char*) "America/Denver"                    , 0x0128F7 },
-	{ (char*) "America/Detroit"                   , 0x0132B4 },
-	{ (char*) "America/Dominica"                  , 0x013B8F },
-	{ (char*) "America/Edmonton"                  , 0x013C2F },
-	{ (char*) "America/Eirunepe"                  , 0x014574 },
-	{ (char*) "America/El_Salvador"               , 0x014811 },
-	{ (char*) "America/Ensenada"                  , 0x0148FD },
-	{ (char*) "America/Fort_Nelson"               , 0x01524F },
-	{ (char*) "America/Fort_Wayne"                , 0x015B2F },
-	{ (char*) "America/Fortaleza"                 , 0x0161CD },
-	{ (char*) "America/Glace_Bay"                 , 0x0164BD },
-	{ (char*) "America/Godthab"                   , 0x016D74 },
-	{ (char*) "America/Goose_Bay"                 , 0x0174C8 },
-	{ (char*) "America/Grand_Turk"                , 0x01817E },
-	{ (char*) "America/Grenada"                   , 0x0188B4 },
-	{ (char*) "America/Guadeloupe"                , 0x018954 },
-	{ (char*) "America/Guatemala"                 , 0x0189F4 },
-	{ (char*) "America/Guayaquil"                 , 0x018B18 },
-	{ (char*) "America/Guyana"                    , 0x018C1E },
-	{ (char*) "America/Halifax"                   , 0x018D22 },
-	{ (char*) "America/Havana"                    , 0x019AAC },
-	{ (char*) "America/Hermosillo"                , 0x01A428 },
-	{ (char*) "America/Indiana/Indianapolis"      , 0x01A61B },
-	{ (char*) "America/Indiana/Knox"              , 0x01ACD2 },
-	{ (char*) "America/Indiana/Marengo"           , 0x01B67F },
-	{ (char*) "America/Indiana/Petersburg"        , 0x01BD6C },
-	{ (char*) "America/Indiana/Tell_City"         , 0x01C50B },
-	{ (char*) "America/Indiana/Vevay"             , 0x01CBCF },
-	{ (char*) "America/Indiana/Vincennes"         , 0x01D18B },
-	{ (char*) "America/Indiana/Winamac"           , 0x01D861 },
-	{ (char*) "America/Indianapolis"              , 0x01DF85 },
-	{ (char*) "America/Inuvik"                    , 0x01E623 },
-	{ (char*) "America/Iqaluit"                   , 0x01EDA9 },
-	{ (char*) "America/Jamaica"                   , 0x01F5C3 },
-	{ (char*) "America/Jujuy"                     , 0x01F7B1 },
-	{ (char*) "America/Juneau"                    , 0x01FBC7 },
-	{ (char*) "America/Kentucky/Louisville"       , 0x020518 },
-	{ (char*) "America/Kentucky/Monticello"       , 0x021026 },
-	{ (char*) "America/Knox_IN"                   , 0x021986 },
-	{ (char*) "America/Kralendijk"                , 0x02231E },
-	{ (char*) "America/La_Paz"                    , 0x022420 },
-	{ (char*) "America/Lima"                      , 0x022506 },
-	{ (char*) "America/Los_Angeles"               , 0x02269A },
-	{ (char*) "America/Louisville"                , 0x0231D1 },
-	{ (char*) "America/Lower_Princes"             , 0x023CC1 },
-	{ (char*) "America/Maceio"                    , 0x023DC3 },
-	{ (char*) "America/Managua"                   , 0x0240B9 },
-	{ (char*) "America/Manaus"                    , 0x024273 },
-	{ (char*) "America/Marigot"                   , 0x0244DC },
-	{ (char*) "America/Martinique"                , 0x0245DE },
-	{ (char*) "America/Matamoros"                 , 0x0246D2 },
-	{ (char*) "America/Mazatlan"                  , 0x024CA6 },
-	{ (char*) "America/Mendoza"                   , 0x02514F },
-	{ (char*) "America/Menominee"                 , 0x025581 },
-	{ (char*) "America/Merida"                    , 0x025E8E },
-	{ (char*) "America/Metlakatla"                , 0x0262A6 },
-	{ (char*) "America/Mexico_City"               , 0x026858 },
-	{ (char*) "America/Miquelon"                  , 0x026D36 },
-	{ (char*) "America/Moncton"                   , 0x0273B6 },
-	{ (char*) "America/Monterrey"                 , 0x02802C },
-	{ (char*) "America/Montevideo"                , 0x028451 },
-	{ (char*) "America/Montreal"                  , 0x028A35 },
-	{ (char*) "America/Montserrat"                , 0x0297E7 },
-	{ (char*) "America/Nassau"                    , 0x029887 },
-	{ (char*) "America/New_York"                  , 0x02A1E7 },
-	{ (char*) "America/Nipigon"                   , 0x02AFE7 },
-	{ (char*) "America/Nome"                      , 0x02BD99 },
-	{ (char*) "America/Noronha"                   , 0x02C6F1 },
-	{ (char*) "America/North_Dakota/Beulah"       , 0x02C9CB },
-	{ (char*) "America/North_Dakota/Center"       , 0x02D348 },
-	{ (char*) "America/North_Dakota/New_Salem"    , 0x02DCC5 },
-	{ (char*) "America/Nuuk"                      , 0x02E648 },
-	{ (char*) "America/Ojinaga"                   , 0x02EDB2 },
-	{ (char*) "America/Panama"                    , 0x02F234 },
-	{ (char*) "America/Pangnirtung"               , 0x02F2F6 },
-	{ (char*) "America/Paramaribo"                , 0x02FB4A },
-	{ (char*) "America/Phoenix"                   , 0x02FC4E },
-	{ (char*) "America/Port-au-Prince"            , 0x02FDDF },
-	{ (char*) "America/Port_of_Spain"             , 0x030385 },
-	{ (char*) "America/Porto_Acre"                , 0x030425 },
-	{ (char*) "America/Porto_Velho"               , 0x030697 },
-	{ (char*) "America/Puerto_Rico"               , 0x0308DD },
-	{ (char*) "America/Punta_Arenas"              , 0x0309DF },
-	{ (char*) "America/Rainy_River"               , 0x03116D },
-	{ (char*) "America/Rankin_Inlet"              , 0x031CAD },
-	{ (char*) "America/Recife"                    , 0x032433 },
-	{ (char*) "America/Regina"                    , 0x032707 },
-	{ (char*) "America/Resolute"                  , 0x032AFC },
-	{ (char*) "America/Rio_Branco"                , 0x033283 },
-	{ (char*) "America/Rosario"                   , 0x0334F9 },
-	{ (char*) "America/Santa_Isabel"              , 0x03392B },
-	{ (char*) "America/Santarem"                  , 0x03427D },
-	{ (char*) "America/Santiago"                  , 0x0344E0 },
-	{ (char*) "America/Santo_Domingo"             , 0x034ED1 },
-	{ (char*) "America/Sao_Paulo"                 , 0x0350A7 },
-	{ (char*) "America/Scoresbysund"              , 0x03567F },
-	{ (char*) "America/Shiprock"                  , 0x035E16 },
-	{ (char*) "America/Sitka"                     , 0x0367BE },
-	{ (char*) "America/St_Barthelemy"             , 0x0370F6 },
-	{ (char*) "America/St_Johns"                  , 0x0371F8 },
-	{ (char*) "America/St_Kitts"                  , 0x03806D },
-	{ (char*) "America/St_Lucia"                  , 0x03810D },
-	{ (char*) "America/St_Thomas"                 , 0x0381CF },
-	{ (char*) "America/St_Vincent"                , 0x03826F },
-	{ (char*) "America/Swift_Current"             , 0x038331 },
-	{ (char*) "America/Tegucigalpa"               , 0x03857F },
-	{ (char*) "America/Thule"                     , 0x038687 },
-	{ (char*) "America/Thunder_Bay"               , 0x038C7F },
-	{ (char*) "America/Tijuana"                   , 0x039A31 },
-	{ (char*) "America/Toronto"                   , 0x03A3A4 },
-	{ (char*) "America/Tortola"                   , 0x03B173 },
-	{ (char*) "America/Vancouver"                 , 0x03B213 },
-	{ (char*) "America/Virgin"                    , 0x03BD84 },
-	{ (char*) "America/Whitehorse"                , 0x03BE86 },
-	{ (char*) "America/Winnipeg"                  , 0x03C4F2 },
-	{ (char*) "America/Yakutat"                   , 0x03D04F },
-	{ (char*) "America/Yellowknife"               , 0x03D96C },
-	{ (char*) "Antarctica/Casey"                  , 0x03E13D },
-	{ (char*) "Antarctica/Davis"                  , 0x03E2C0 },
-	{ (char*) "Antarctica/DumontDUrville"         , 0x03E3EC },
-	{ (char*) "Antarctica/Macquarie"              , 0x03E4BC },
-	{ (char*) "Antarctica/Mawson"                 , 0x03EDAC },
-	{ (char*) "Antarctica/McMurdo"                , 0x03EE77 },
-	{ (char*) "Antarctica/Palmer"                 , 0x03F672 },
-	{ (char*) "Antarctica/Rothera"                , 0x03FC00 },
-	{ (char*) "Antarctica/South_Pole"             , 0x03FCA9 },
-	{ (char*) "Antarctica/Syowa"                  , 0x04063A },
-	{ (char*) "Antarctica/Troll"                  , 0x0406E2 },
-	{ (char*) "Antarctica/Vostok"                 , 0x040B6F },
-	{ (char*) "Arctic/Longyearbyen"               , 0x040C18 },
-	{ (char*) "Asia/Aden"                         , 0x04151E },
-	{ (char*) "Asia/Almaty"                       , 0x0415C1 },
-	{ (char*) "Asia/Amman"                        , 0x0419BB },
-	{ (char*) "Asia/Anadyr"                       , 0x041F60 },
-	{ (char*) "Asia/Aqtau"                        , 0x042415 },
-	{ (char*) "Asia/Aqtobe"                       , 0x0427FF },
-	{ (char*) "Asia/Ashgabat"                     , 0x042BFD },
-	{ (char*) "Asia/Ashkhabad"                    , 0x042E66 },
-	{ (char*) "Asia/Atyrau"                       , 0x0430CF },
-	{ (char*) "Asia/Baghdad"                      , 0x0434C1 },
-	{ (char*) "Asia/Bahrain"                      , 0x043896 },
-	{ (char*) "Asia/Baku"                         , 0x043981 },
-	{ (char*) "Asia/Bangkok"                      , 0x043E4A },
-	{ (char*) "Asia/Barnaul"                      , 0x043F0F },
-	{ (char*) "Asia/Beirut"                       , 0x0443E0 },
-	{ (char*) "Asia/Bishkek"                      , 0x044C56 },
-	{ (char*) "Asia/Brunei"                       , 0x04502B },
-	{ (char*) "Asia/Calcutta"                     , 0x0450F4 },
-	{ (char*) "Asia/Chita"                        , 0x04521D },
-	{ (char*) "Asia/Choibalsan"                   , 0x0456F4 },
-	{ (char*) "Asia/Chongqing"                    , 0x045AB9 },
-	{ (char*) "Asia/Chungking"                    , 0x045CF6 },
-	{ (char*) "Asia/Colombo"                      , 0x045F33 },
-	{ (char*) "Asia/Dacca"                        , 0x0460A5 },
-	{ (char*) "Asia/Damascus"                     , 0x0461F4 },
-	{ (char*) "Asia/Dhaka"                        , 0x046951 },
-	{ (char*) "Asia/Dili"                         , 0x046AA0 },
-	{ (char*) "Asia/Dubai"                        , 0x046B81 },
-	{ (char*) "Asia/Dushanbe"                     , 0x046C24 },
-	{ (char*) "Asia/Famagusta"                    , 0x046E71 },
-	{ (char*) "Asia/Gaza"                         , 0x047678 },
-	{ (char*) "Asia/Harbin"                       , 0x048004 },
-	{ (char*) "Asia/Hebron"                       , 0x048241 },
-	{ (char*) "Asia/Ho_Chi_Minh"                  , 0x048BE8 },
-	{ (char*) "Asia/Hong_Kong"                    , 0x048D45 },
-	{ (char*) "Asia/Hovd"                         , 0x049222 },
-	{ (char*) "Asia/Irkutsk"                      , 0x0495C6 },
-	{ (char*) "Asia/Istanbul"                     , 0x049AB9 },
-	{ (char*) "Asia/Jakarta"                      , 0x04A252 },
-	{ (char*) "Asia/Jayapura"                     , 0x04A3EA },
-	{ (char*) "Asia/Jerusalem"                    , 0x04A509 },
-	{ (char*) "Asia/Kabul"                        , 0x04AE69 },
-	{ (char*) "Asia/Kamchatka"                    , 0x04AF37 },
-	{ (char*) "Asia/Karachi"                      , 0x04B3D5 },
-	{ (char*) "Asia/Kashgar"                      , 0x04B55C },
-	{ (char*) "Asia/Kathmandu"                    , 0x04B5FF },
-	{ (char*) "Asia/Katmandu"                     , 0x04B6D1 },
-	{ (char*) "Asia/Khandyga"                     , 0x04B7A3 },
-	{ (char*) "Asia/Kolkata"                      , 0x04BCB6 },
-	{ (char*) "Asia/Krasnoyarsk"                  , 0x04BDDF },
-	{ (char*) "Asia/Kuala_Lumpur"                 , 0x04C2AD },
-	{ (char*) "Asia/Kuching"                      , 0x04C43E },
-	{ (char*) "Asia/Kuwait"                       , 0x04C62D },
-	{ (char*) "Asia/Macao"                        , 0x04C6D0 },
-	{ (char*) "Asia/Macau"                        , 0x04CBA7 },
-	{ (char*) "Asia/Magadan"                      , 0x04D07E },
-	{ (char*) "Asia/Makassar"                     , 0x04D552 },
-	{ (char*) "Asia/Manila"                       , 0x04D6A5 },
-	{ (char*) "Asia/Muscat"                       , 0x04D7F9 },
-	{ (char*) "Asia/Nicosia"                      , 0x04D89C },
-	{ (char*) "Asia/Novokuznetsk"                 , 0x04E08D },
-	{ (char*) "Asia/Novosibirsk"                  , 0x04E529 },
-	{ (char*) "Asia/Omsk"                         , 0x04EA00 },
-	{ (char*) "Asia/Oral"                         , 0x04EEC2 },
-	{ (char*) "Asia/Phnom_Penh"                   , 0x04F2BC },
-	{ (char*) "Asia/Pontianak"                    , 0x04F3E1 },
-	{ (char*) "Asia/Pyongyang"                    , 0x04F564 },
-	{ (char*) "Asia/Qatar"                        , 0x04F65D },
-	{ (char*) "Asia/Qostanay"                     , 0x04F722 },
-	{ (char*) "Asia/Qyzylorda"                    , 0x04FB2D },
-	{ (char*) "Asia/Rangoon"                      , 0x04FF49 },
-	{ (char*) "Asia/Riyadh"                       , 0x050053 },
-	{ (char*) "Asia/Saigon"                       , 0x0500F6 },
-	{ (char*) "Asia/Sakhalin"                     , 0x050253 },
-	{ (char*) "Asia/Samarkand"                    , 0x05071B },
-	{ (char*) "Asia/Seoul"                        , 0x05096B },
-	{ (char*) "Asia/Shanghai"                     , 0x050BE0 },
-	{ (char*) "Asia/Singapore"                    , 0x050E29 },
-	{ (char*) "Asia/Srednekolymsk"                , 0x050FA6 },
-	{ (char*) "Asia/Taipei"                       , 0x05147E },
-	{ (char*) "Asia/Tashkent"                     , 0x051783 },
-	{ (char*) "Asia/Tbilisi"                      , 0x0519E1 },
-	{ (char*) "Asia/Tehran"                       , 0x051DEA },
-	{ (char*) "Asia/Tel_Aviv"                     , 0x0522D6 },
-	{ (char*) "Asia/Thimbu"                       , 0x052C36 },
-	{ (char*) "Asia/Thimphu"                      , 0x052CFF },
-	{ (char*) "Asia/Tokyo"                        , 0x052DC8 },
-	{ (char*) "Asia/Tomsk"                        , 0x052F09 },
-	{ (char*) "Asia/Ujung_Pandang"                , 0x0533DA },
-	{ (char*) "Asia/Ulaanbaatar"                  , 0x0534E4 },
-	{ (char*) "Asia/Ulan_Bator"                   , 0x053872 },
-	{ (char*) "Asia/Urumqi"                       , 0x053BEB },
-	{ (char*) "Asia/Ust-Nera"                     , 0x053C9B },
-	{ (char*) "Asia/Vientiane"                    , 0x054191 },
-	{ (char*) "Asia/Vladivostok"                  , 0x0542D2 },
-	{ (char*) "Asia/Yakutsk"                      , 0x05479B },
-	{ (char*) "Asia/Yangon"                       , 0x054C63 },
-	{ (char*) "Asia/Yekaterinburg"                , 0x054D6D },
-	{ (char*) "Asia/Yerevan"                      , 0x055254 },
-	{ (char*) "Atlantic/Azores"                   , 0x0556D1 },
-	{ (char*) "Atlantic/Bermuda"                  , 0x05648D },
-	{ (char*) "Atlantic/Canary"                   , 0x056DF5 },
-	{ (char*) "Atlantic/Cape_Verde"               , 0x057578 },
-	{ (char*) "Atlantic/Faeroe"                   , 0x057684 },
-	{ (char*) "Atlantic/Faroe"                    , 0x057DA7 },
-	{ (char*) "Atlantic/Jan_Mayen"                , 0x0584CA },
-	{ (char*) "Atlantic/Madeira"                  , 0x058DD0 },
-	{ (char*) "Atlantic/Reykjavik"                , 0x059B9A },
-	{ (char*) "Atlantic/South_Georgia"            , 0x05A030 },
-	{ (char*) "Atlantic/St_Helena"                , 0x05A0D2 },
-	{ (char*) "Atlantic/Stanley"                  , 0x05A194 },
-	{ (char*) "Australia/ACT"                     , 0x05A650 },
-	{ (char*) "Australia/Adelaide"                , 0x05AEEA },
-	{ (char*) "Australia/Brisbane"                , 0x05B7A5 },
-	{ (char*) "Australia/Broken_Hill"             , 0x05B96B },
-	{ (char*) "Australia/Canberra"                , 0x05C248 },
-	{ (char*) "Australia/Currie"                  , 0x05CAE2 },
-	{ (char*) "Australia/Darwin"                  , 0x05D424 },
-	{ (char*) "Australia/Eucla"                   , 0x05D587 },
-	{ (char*) "Australia/Hobart"                  , 0x05D774 },
-	{ (char*) "Australia/LHI"                     , 0x05E0BE },
-	{ (char*) "Australia/Lindeman"                , 0x05E800 },
-	{ (char*) "Australia/Lord_Howe"               , 0x05EA06 },
-	{ (char*) "Australia/Melbourne"               , 0x05F158 },
-	{ (char*) "Australia/North"                   , 0x05F9FA },
-	{ (char*) "Australia/NSW"                     , 0x05FB4B },
-	{ (char*) "Australia/Perth"                   , 0x0603E5 },
-	{ (char*) "Australia/Queensland"              , 0x0605CD },
-	{ (char*) "Australia/South"                   , 0x06077C },
-	{ (char*) "Australia/Sydney"                  , 0x061028 },
-	{ (char*) "Australia/Tasmania"                , 0x0618DE },
-	{ (char*) "Australia/Victoria"                , 0x062220 },
-	{ (char*) "Australia/West"                    , 0x062ABA },
-	{ (char*) "Australia/Yancowinna"              , 0x062C84 },
-	{ (char*) "Brazil/Acre"                       , 0x063545 },
-	{ (char*) "Brazil/DeNoronha"                  , 0x0637B7 },
-	{ (char*) "Brazil/East"                       , 0x063A81 },
-	{ (char*) "Brazil/West"                       , 0x064023 },
-	{ (char*) "Canada/Atlantic"                   , 0x06427D },
-	{ (char*) "Canada/Central"                    , 0x064FE9 },
-	{ (char*) "Canada/Eastern"                    , 0x065B29 },
-	{ (char*) "Canada/Mountain"                   , 0x0668DB },
-	{ (char*) "Canada/Newfoundland"               , 0x067203 },
-	{ (char*) "Canada/Pacific"                    , 0x068056 },
-	{ (char*) "Canada/Saskatchewan"               , 0x068BAE },
-	{ (char*) "Canada/Yukon"                      , 0x068F8E },
-	{ (char*) "CET"                               , 0x0695E8 },
-	{ (char*) "Chile/Continental"                 , 0x069E22 },
-	{ (char*) "Chile/EasterIsland"                , 0x06A801 },
-	{ (char*) "CST6CDT"                           , 0x06B0B8 },
-	{ (char*) "Cuba"                              , 0x06B9CA },
-	{ (char*) "EET"                               , 0x06C346 },
-	{ (char*) "Egypt"                             , 0x06CAC6 },
-	{ (char*) "Eire"                              , 0x06D275 },
-	{ (char*) "EST"                               , 0x06E025 },
-	{ (char*) "EST5EDT"                           , 0x06E0A3 },
-	{ (char*) "Etc/GMT"                           , 0x06E9B5 },
-	{ (char*) "Etc/GMT+0"                         , 0x06EA33 },
-	{ (char*) "Etc/GMT+1"                         , 0x06EAB1 },
-	{ (char*) "Etc/GMT+10"                        , 0x06EB31 },
-	{ (char*) "Etc/GMT+11"                        , 0x06EBB2 },
-	{ (char*) "Etc/GMT+12"                        , 0x06EC33 },
-	{ (char*) "Etc/GMT+2"                         , 0x06ECB4 },
-	{ (char*) "Etc/GMT+3"                         , 0x06ED34 },
-	{ (char*) "Etc/GMT+4"                         , 0x06EDB4 },
-	{ (char*) "Etc/GMT+5"                         , 0x06EE34 },
-	{ (char*) "Etc/GMT+6"                         , 0x06EEB4 },
-	{ (char*) "Etc/GMT+7"                         , 0x06EF34 },
-	{ (char*) "Etc/GMT+8"                         , 0x06EFB4 },
-	{ (char*) "Etc/GMT+9"                         , 0x06F034 },
-	{ (char*) "Etc/GMT-0"                         , 0x06F0B4 },
-	{ (char*) "Etc/GMT-1"                         , 0x06F132 },
-	{ (char*) "Etc/GMT-10"                        , 0x06F1B3 },
-	{ (char*) "Etc/GMT-11"                        , 0x06F235 },
-	{ (char*) "Etc/GMT-12"                        , 0x06F2B7 },
-	{ (char*) "Etc/GMT-13"                        , 0x06F339 },
-	{ (char*) "Etc/GMT-14"                        , 0x06F3BB },
-	{ (char*) "Etc/GMT-2"                         , 0x06F43D },
-	{ (char*) "Etc/GMT-3"                         , 0x06F4BE },
-	{ (char*) "Etc/GMT-4"                         , 0x06F53F },
-	{ (char*) "Etc/GMT-5"                         , 0x06F5C0 },
-	{ (char*) "Etc/GMT-6"                         , 0x06F641 },
-	{ (char*) "Etc/GMT-7"                         , 0x06F6C2 },
-	{ (char*) "Etc/GMT-8"                         , 0x06F743 },
-	{ (char*) "Etc/GMT-9"                         , 0x06F7C4 },
-	{ (char*) "Etc/GMT0"                          , 0x06F845 },
-	{ (char*) "Etc/Greenwich"                     , 0x06F8C3 },
-	{ (char*) "Etc/UCT"                           , 0x06F941 },
-	{ (char*) "Etc/Universal"                     , 0x06F9BF },
-	{ (char*) "Etc/UTC"                           , 0x06FA3D },
-	{ (char*) "Etc/Zulu"                          , 0x06FABB },
-	{ (char*) "Europe/Amsterdam"                  , 0x06FB39 },
-	{ (char*) "Europe/Andorra"                    , 0x0706A3 },
-	{ (char*) "Europe/Astrakhan"                  , 0x070D7D },
-	{ (char*) "Europe/Athens"                     , 0x07121A },
-	{ (char*) "Europe/Belfast"                    , 0x071AFC },
-	{ (char*) "Europe/Belgrade"                   , 0x072958 },
-	{ (char*) "Europe/Berlin"                     , 0x0730E4 },
-	{ (char*) "Europe/Bratislava"                 , 0x0739FE },
-	{ (char*) "Europe/Brussels"                   , 0x074307 },
-	{ (char*) "Europe/Bucharest"                  , 0x074E88 },
-	{ (char*) "Europe/Budapest"                   , 0x07571C },
-	{ (char*) "Europe/Busingen"                   , 0x076068 },
-	{ (char*) "Europe/Chisinau"                   , 0x0767F1 },
-	{ (char*) "Europe/Copenhagen"                 , 0x077153 },
-	{ (char*) "Europe/Dublin"                     , 0x0779B8 },
-	{ (char*) "Europe/Gibraltar"                  , 0x078768 },
-	{ (char*) "Europe/Guernsey"                   , 0x079370 },
-	{ (char*) "Europe/Helsinki"                   , 0x07A210 },
-	{ (char*) "Europe/Isle_of_Man"                , 0x07A988 },
-	{ (char*) "Europe/Istanbul"                   , 0x07B7D4 },
-	{ (char*) "Europe/Jersey"                     , 0x07BF6D },
-	{ (char*) "Europe/Kaliningrad"                , 0x07CE0D },
-	{ (char*) "Europe/Kiev"                       , 0x07D402 },
-	{ (char*) "Europe/Kirov"                      , 0x07DC56 },
-	{ (char*) "Europe/Kyiv"                       , 0x07E0E3 },
-	{ (char*) "Europe/Lisbon"                     , 0x07E94B },
-	{ (char*) "Europe/Ljubljana"                  , 0x07F713 },
-	{ (char*) "Europe/London"                     , 0x07FE9F },
-	{ (char*) "Europe/Luxembourg"                 , 0x080CFB },
-	{ (char*) "Europe/Madrid"                     , 0x081889 },
-	{ (char*) "Europe/Malta"                      , 0x0822DB },
-	{ (char*) "Europe/Mariehamn"                  , 0x082D23 },
-	{ (char*) "Europe/Minsk"                      , 0x08349B },
-	{ (char*) "Europe/Monaco"                     , 0x0839C2 },
-	{ (char*) "Europe/Moscow"                     , 0x08454E },
-	{ (char*) "Europe/Nicosia"                    , 0x084B6D },
-	{ (char*) "Europe/Oslo"                       , 0x08534B },
-	{ (char*) "Europe/Paris"                      , 0x085C0B },
-	{ (char*) "Europe/Podgorica"                  , 0x0867A9 },
-	{ (char*) "Europe/Prague"                     , 0x086F35 },
-	{ (char*) "Europe/Riga"                       , 0x08783E },
-	{ (char*) "Europe/Rome"                       , 0x0880E0 },
-	{ (char*) "Europe/Samara"                     , 0x088B3D },
-	{ (char*) "Europe/San_Marino"                 , 0x089013 },
-	{ (char*) "Europe/Sarajevo"                   , 0x089A70 },
-	{ (char*) "Europe/Saratov"                    , 0x08A1FC },
-	{ (char*) "Europe/Simferopol"                 , 0x08A6A9 },
-	{ (char*) "Europe/Skopje"                     , 0x08AC78 },
-	{ (char*) "Europe/Sofia"                      , 0x08B404 },
-	{ (char*) "Europe/Stockholm"                  , 0x08BC2D },
-	{ (char*) "Europe/Tallinn"                    , 0x08C3AE },
-	{ (char*) "Europe/Tirane"                     , 0x08CC1E },
-	{ (char*) "Europe/Tiraspol"                   , 0x08D44E },
-	{ (char*) "Europe/Ulyanovsk"                  , 0x08DDB0 },
-	{ (char*) "Europe/Uzhgorod"                   , 0x08E2B3 },
-	{ (char*) "Europe/Vaduz"                      , 0x08EB07 },
-	{ (char*) "Europe/Vatican"                    , 0x08F273 },
-	{ (char*) "Europe/Vienna"                     , 0x08FCD0 },
-	{ (char*) "Europe/Vilnius"                    , 0x090574 },
-	{ (char*) "Europe/Volgograd"                  , 0x090DF2 },
-	{ (char*) "Europe/Warsaw"                     , 0x09128F },
-	{ (char*) "Europe/Zagreb"                     , 0x091CF9 },
-	{ (char*) "Europe/Zaporozhye"                 , 0x092485 },
-	{ (char*) "Europe/Zurich"                     , 0x092CD9 },
-	{ (char*) "Factory"                           , 0x09345A },
-	{ (char*) "GB"                                , 0x0934DA },
-	{ (char*) "GB-Eire"                           , 0x094336 },
-	{ (char*) "GMT"                               , 0x095192 },
-	{ (char*) "GMT+0"                             , 0x095210 },
-	{ (char*) "GMT-0"                             , 0x09528E },
-	{ (char*) "GMT0"                              , 0x09530C },
-	{ (char*) "Greenwich"                         , 0x09538A },
-	{ (char*) "Hongkong"                          , 0x095408 },
-	{ (char*) "HST"                               , 0x0958E5 },
-	{ (char*) "Iceland"                           , 0x095964 },
-	{ (char*) "Indian/Antananarivo"               , 0x095A04 },
-	{ (char*) "Indian/Chagos"                     , 0x095AEB },
-	{ (char*) "Indian/Christmas"                  , 0x095BB0 },
-	{ (char*) "Indian/Cocos"                      , 0x095C53 },
-	{ (char*) "Indian/Comoro"                     , 0x095CFF },
-	{ (char*) "Indian/Kerguelen"                  , 0x095DA0 },
-	{ (char*) "Indian/Mahe"                       , 0x095E43 },
-	{ (char*) "Indian/Maldives"                   , 0x095EE6 },
-	{ (char*) "Indian/Mauritius"                  , 0x095FAB },
-	{ (char*) "Indian/Mayotte"                    , 0x09609A },
-	{ (char*) "Indian/Reunion"                    , 0x09613B },
-	{ (char*) "Iran"                              , 0x0961DE },
-	{ (char*) "Israel"                            , 0x0966CA },
-	{ (char*) "Jamaica"                           , 0x09702A },
-	{ (char*) "Japan"                             , 0x097218 },
-	{ (char*) "Kwajalein"                         , 0x097359 },
-	{ (char*) "Libya"                             , 0x097493 },
-	{ (char*) "MET"                               , 0x097710 },
-	{ (char*) "Mexico/BajaNorte"                  , 0x097F4A },
-	{ (char*) "Mexico/BajaSur"                    , 0x09889C },
-	{ (char*) "Mexico/General"                    , 0x098D10 },
-	{ (char*) "MST"                               , 0x0991E2 },
-	{ (char*) "MST7MDT"                           , 0x099260 },
-	{ (char*) "Navajo"                            , 0x099B72 },
-	{ (char*) "NZ"                                , 0x09A51A },
-	{ (char*) "NZ-CHAT"                           , 0x09AEAB },
-	{ (char*) "Pacific/Apia"                      , 0x09B6BD },
-	{ (char*) "Pacific/Auckland"                  , 0x09B91F },
-	{ (char*) "Pacific/Bougainville"              , 0x09C2C8 },
-	{ (char*) "Pacific/Chatham"                   , 0x09C3DE },
-	{ (char*) "Pacific/Chuuk"                     , 0x09CBFF },
-	{ (char*) "Pacific/Easter"                    , 0x09CD19 },
-	{ (char*) "Pacific/Efate"                     , 0x09D5DD },
-	{ (char*) "Pacific/Enderbury"                 , 0x09D7F5 },
-	{ (char*) "Pacific/Fakaofo"                   , 0x09D8DD },
-	{ (char*) "Pacific/Fiji"                      , 0x09D9A3 },
-	{ (char*) "Pacific/Funafuti"                  , 0x09DBE3 },
-	{ (char*) "Pacific/Galapagos"                 , 0x09DC87 },
-	{ (char*) "Pacific/Gambier"                   , 0x09DD84 },
-	{ (char*) "Pacific/Guadalcanal"               , 0x09DE35 },
-	{ (char*) "Pacific/Guam"                      , 0x09DED9 },
-	{ (char*) "Pacific/Honolulu"                  , 0x09E0D3 },
-	{ (char*) "Pacific/Johnston"                  , 0x09E22E },
-	{ (char*) "Pacific/Kanton"                    , 0x09E383 },
-	{ (char*) "Pacific/Kiritimati"                , 0x09E47A },
-	{ (char*) "Pacific/Kosrae"                    , 0x09E572 },
-	{ (char*) "Pacific/Kwajalein"                 , 0x09E6D5 },
-	{ (char*) "Pacific/Majuro"                    , 0x09E818 },
-	{ (char*) "Pacific/Marquesas"                 , 0x09E969 },
-	{ (char*) "Pacific/Midway"                    , 0x09EA25 },
-	{ (char*) "Pacific/Nauru"                     , 0x09EB18 },
-	{ (char*) "Pacific/Niue"                      , 0x09EC12 },
-	{ (char*) "Pacific/Norfolk"                   , 0x09ECDB },
-	{ (char*) "Pacific/Noumea"                    , 0x09F049 },
-	{ (char*) "Pacific/Pago_Pago"                 , 0x09F177 },
-	{ (char*) "Pacific/Palau"                     , 0x09F232 },
-	{ (char*) "Pacific/Pitcairn"                  , 0x09F2E4 },
-	{ (char*) "Pacific/Pohnpei"                   , 0x09F3AC },
-	{ (char*) "Pacific/Ponape"                    , 0x09F4E7 },
-	{ (char*) "Pacific/Port_Moresby"              , 0x09F58B },
-	{ (char*) "Pacific/Rarotonga"                 , 0x09F660 },
-	{ (char*) "Pacific/Saipan"                    , 0x09F8B9 },
-	{ (char*) "Pacific/Samoa"                     , 0x09FAA5 },
-	{ (char*) "Pacific/Tahiti"                    , 0x09FB60 },
-	{ (char*) "Pacific/Tarawa"                    , 0x09FC12 },
-	{ (char*) "Pacific/Tongatapu"                 , 0x09FCC5 },
-	{ (char*) "Pacific/Truk"                      , 0x09FE37 },
-	{ (char*) "Pacific/Wake"                      , 0x09FEEF },
-	{ (char*) "Pacific/Wallis"                    , 0x09FF9E },
-	{ (char*) "Pacific/Yap"                       , 0x0A0042 },
-	{ (char*) "Poland"                            , 0x0A00FA },
-	{ (char*) "Portugal"                          , 0x0A0B64 },
-	{ (char*) "PRC"                               , 0x0A1919 },
-	{ (char*) "PST8PDT"                           , 0x0A1B56 },
-	{ (char*) "ROC"                               , 0x0A2468 },
-	{ (char*) "ROK"                               , 0x0A276D },
-	{ (char*) "Singapore"                         , 0x0A29E2 },
-	{ (char*) "Turkey"                            , 0x0A2B5F },
-	{ (char*) "UCT"                               , 0x0A32F8 },
-	{ (char*) "Universal"                         , 0x0A3376 },
-	{ (char*) "US/Alaska"                         , 0x0A33F4 },
-	{ (char*) "US/Aleutian"                       , 0x0A3D43 },
-	{ (char*) "US/Arizona"                        , 0x0A4683 },
-	{ (char*) "US/Central"                        , 0x0A47F7 },
-	{ (char*) "US/East-Indiana"                   , 0x0A560B },
-	{ (char*) "US/Eastern"                        , 0x0A5CA9 },
-	{ (char*) "US/Hawaii"                         , 0x0A6A95 },
-	{ (char*) "US/Indiana-Starke"                 , 0x0A6BEA },
-	{ (char*) "US/Michigan"                       , 0x0A7582 },
-	{ (char*) "US/Mountain"                       , 0x0A7E44 },
-	{ (char*) "US/Pacific"                        , 0x0A87EC },
-	{ (char*) "US/Samoa"                          , 0x0A931C },
-	{ (char*) "UTC"                               , 0x0A93D7 },
-	{ (char*) "W-SU"                              , 0x0A9455 },
-	{ (char*) "WET"                               , 0x0A9A60 },
-	{ (char*) "Zulu"                              , 0x0AA1DD },
+	{ (char*) "Africa/Casablanca"                 , 0x001926 },
+	{ (char*) "Africa/Ceuta"                      , 0x0022AF },
+	{ (char*) "Africa/Conakry"                    , 0x002ACD },
+	{ (char*) "Africa/Dakar"                      , 0x002BA9 },
+	{ (char*) "Africa/Dar_es_Salaam"              , 0x002C6B },
+	{ (char*) "Africa/Djibouti"                   , 0x002D4C },
+	{ (char*) "Africa/Douala"                     , 0x002DED },
+	{ (char*) "Africa/El_Aaiun"                   , 0x002E8E },
+	{ (char*) "Africa/Freetown"                   , 0x003791 },
+	{ (char*) "Africa/Gaborone"                   , 0x00396D },
+	{ (char*) "Africa/Harare"                     , 0x003A64 },
+	{ (char*) "Africa/Johannesburg"               , 0x003B05 },
+	{ (char*) "Africa/Juba"                       , 0x003C07 },
+	{ (char*) "Africa/Kampala"                    , 0x003EBA },
+	{ (char*) "Africa/Khartoum"                   , 0x003FC1 },
+	{ (char*) "Africa/Kigali"                     , 0x004274 },
+	{ (char*) "Africa/Kinshasa"                   , 0x004315 },
+	{ (char*) "Africa/Lagos"                      , 0x0043CF },
+	{ (char*) "Africa/Libreville"                 , 0x0044C6 },
+	{ (char*) "Africa/Lome"                       , 0x004567 },
+	{ (char*) "Africa/Luanda"                     , 0x004607 },
+	{ (char*) "Africa/Lubumbashi"                 , 0x0046CE },
+	{ (char*) "Africa/Lusaka"                     , 0x0047AA },
+	{ (char*) "Africa/Malabo"                     , 0x00484B },
+	{ (char*) "Africa/Maputo"                     , 0x00490E },
+	{ (char*) "Africa/Maseru"                     , 0x0049AF },
+	{ (char*) "Africa/Mbabane"                    , 0x004A7B },
+	{ (char*) "Africa/Mogadishu"                  , 0x004B1F },
+	{ (char*) "Africa/Monrovia"                   , 0x004C00 },
+	{ (char*) "Africa/Nairobi"                    , 0x004CDC },
+	{ (char*) "Africa/Ndjamena"                   , 0x004DF1 },
+	{ (char*) "Africa/Niamey"                     , 0x004EC4 },
+	{ (char*) "Africa/Nouakchott"                 , 0x004FA9 },
+	{ (char*) "Africa/Ouagadougou"                , 0x005085 },
+	{ (char*) "Africa/Porto-Novo"                 , 0x005125 },
+	{ (char*) "Africa/Sao_Tome"                   , 0x0051E8 },
+	{ (char*) "Africa/Timbuktu"                   , 0x0052F2 },
+	{ (char*) "Africa/Tripoli"                    , 0x005392 },
+	{ (char*) "Africa/Tunis"                      , 0x00560F },
+	{ (char*) "Africa/Windhoek"                   , 0x0058CC },
+	{ (char*) "America/Adak"                      , 0x005C93 },
+	{ (char*) "America/Anchorage"                 , 0x0065ED },
+	{ (char*) "America/Anguilla"                  , 0x006F4F },
+	{ (char*) "America/Antigua"                   , 0x006FEF },
+	{ (char*) "America/Araguaina"                 , 0x0070B1 },
+	{ (char*) "America/Argentina/Buenos_Aires"    , 0x00742C },
+	{ (char*) "America/Argentina/Catamarca"       , 0x007873 },
+	{ (char*) "America/Argentina/ComodRivadavia"  , 0x007CC0 },
+	{ (char*) "America/Argentina/Cordoba"         , 0x0080F2 },
+	{ (char*) "America/Argentina/Jujuy"           , 0x00855A },
+	{ (char*) "America/Argentina/La_Rioja"        , 0x00897A },
+	{ (char*) "America/Argentina/Mendoza"         , 0x008DC7 },
+	{ (char*) "America/Argentina/Rio_Gallegos"    , 0x009205 },
+	{ (char*) "America/Argentina/Salta"           , 0x009646 },
+	{ (char*) "America/Argentina/San_Juan"        , 0x009A72 },
+	{ (char*) "America/Argentina/San_Luis"        , 0x009EBF },
+	{ (char*) "America/Argentina/Tucuman"         , 0x00A318 },
+	{ (char*) "America/Argentina/Ushuaia"         , 0x00A772 },
+	{ (char*) "America/Aruba"                     , 0x00ABB9 },
+	{ (char*) "America/Asuncion"                  , 0x00AC7F },
+	{ (char*) "America/Atikokan"                  , 0x00B479 },
+	{ (char*) "America/Atka"                      , 0x00B5F6 },
+	{ (char*) "America/Bahia"                     , 0x00BF36 },
+	{ (char*) "America/Bahia_Banderas"            , 0x00C339 },
+	{ (char*) "America/Barbados"                  , 0x00C7D6 },
+	{ (char*) "America/Belem"                     , 0x00C996 },
+	{ (char*) "America/Belize"                    , 0x00CBE6 },
+	{ (char*) "America/Blanc-Sablon"              , 0x00D240 },
+	{ (char*) "America/Boa_Vista"                 , 0x00D392 },
+	{ (char*) "America/Bogota"                    , 0x00D60F },
+	{ (char*) "America/Boise"                     , 0x00D703 },
+	{ (char*) "America/Buenos_Aires"              , 0x00E099 },
+	{ (char*) "America/Cambridge_Bay"             , 0x00E4CB },
+	{ (char*) "America/Campo_Grande"              , 0x00EDB9 },
+	{ (char*) "America/Cancun"                    , 0x00F36D },
+	{ (char*) "America/Caracas"                   , 0x00F6C7 },
+	{ (char*) "America/Catamarca"                 , 0x00F7CD },
+	{ (char*) "America/Cayenne"                   , 0x00FBFF },
+	{ (char*) "America/Cayman"                    , 0x00FCC3 },
+	{ (char*) "America/Chicago"                   , 0x00FD85 },
+	{ (char*) "America/Chihuahua"                 , 0x010BAD },
+	{ (char*) "America/Ciudad_Juarez"             , 0x01101D },
+	{ (char*) "America/Coral_Harbour"             , 0x011647 },
+	{ (char*) "America/Cordoba"                   , 0x011709 },
+	{ (char*) "America/Costa_Rica"                , 0x011B3B },
+	{ (char*) "America/Creston"                   , 0x011C83 },
+	{ (char*) "America/Cuiaba"                    , 0x011D71 },
+	{ (char*) "America/Curacao"                   , 0x012302 },
+	{ (char*) "America/Danmarkshavn"              , 0x0123C8 },
+	{ (char*) "America/Dawson"                    , 0x0126A8 },
+	{ (char*) "America/Dawson_Creek"              , 0x012D14 },
+	{ (char*) "America/Denver"                    , 0x01315A },
+	{ (char*) "America/Detroit"                   , 0x013B17 },
+	{ (char*) "America/Dominica"                  , 0x0143F2 },
+	{ (char*) "America/Edmonton"                  , 0x014492 },
+	{ (char*) "America/Eirunepe"                  , 0x014DDF },
+	{ (char*) "America/El_Salvador"               , 0x01507C },
+	{ (char*) "America/Ensenada"                  , 0x015168 },
+	{ (char*) "America/Fort_Nelson"               , 0x015ABA },
+	{ (char*) "America/Fort_Wayne"                , 0x01639A },
+	{ (char*) "America/Fortaleza"                 , 0x016A38 },
+	{ (char*) "America/Glace_Bay"                 , 0x016D28 },
+	{ (char*) "America/Godthab"                   , 0x0175DF },
+	{ (char*) "America/Goose_Bay"                 , 0x017D5A },
+	{ (char*) "America/Grand_Turk"                , 0x018A10 },
+	{ (char*) "America/Grenada"                   , 0x019146 },
+	{ (char*) "America/Guadeloupe"                , 0x0191E6 },
+	{ (char*) "America/Guatemala"                 , 0x019286 },
+	{ (char*) "America/Guayaquil"                 , 0x0193AA },
+	{ (char*) "America/Guyana"                    , 0x0194B0 },
+	{ (char*) "America/Halifax"                   , 0x0195B4 },
+	{ (char*) "America/Havana"                    , 0x01A33E },
+	{ (char*) "America/Hermosillo"                , 0x01ACBA },
+	{ (char*) "America/Indiana/Indianapolis"      , 0x01AE94 },
+	{ (char*) "America/Indiana/Knox"              , 0x01B54B },
+	{ (char*) "America/Indiana/Marengo"           , 0x01BEF8 },
+	{ (char*) "America/Indiana/Petersburg"        , 0x01C5E5 },
+	{ (char*) "America/Indiana/Tell_City"         , 0x01CD84 },
+	{ (char*) "America/Indiana/Vevay"             , 0x01D448 },
+	{ (char*) "America/Indiana/Vincennes"         , 0x01DA04 },
+	{ (char*) "America/Indiana/Winamac"           , 0x01E0DA },
+	{ (char*) "America/Indianapolis"              , 0x01E7FE },
+	{ (char*) "America/Inuvik"                    , 0x01EE9C },
+	{ (char*) "America/Iqaluit"                   , 0x01F6D6 },
+	{ (char*) "America/Jamaica"                   , 0x01FF95 },
+	{ (char*) "America/Jujuy"                     , 0x020183 },
+	{ (char*) "America/Juneau"                    , 0x020599 },
+	{ (char*) "America/Kentucky/Louisville"       , 0x020EEA },
+	{ (char*) "America/Kentucky/Monticello"       , 0x0219F8 },
+	{ (char*) "America/Knox_IN"                   , 0x022358 },
+	{ (char*) "America/Kralendijk"                , 0x022CF0 },
+	{ (char*) "America/La_Paz"                    , 0x022DF2 },
+	{ (char*) "America/Lima"                      , 0x022ED8 },
+	{ (char*) "America/Los_Angeles"               , 0x02306C },
+	{ (char*) "America/Louisville"                , 0x023BA3 },
+	{ (char*) "America/Lower_Princes"             , 0x024693 },
+	{ (char*) "America/Maceio"                    , 0x024795 },
+	{ (char*) "America/Managua"                   , 0x024A8B },
+	{ (char*) "America/Manaus"                    , 0x024C45 },
+	{ (char*) "America/Marigot"                   , 0x024EAE },
+	{ (char*) "America/Martinique"                , 0x024FB0 },
+	{ (char*) "America/Matamoros"                 , 0x0250A4 },
+	{ (char*) "America/Mazatlan"                  , 0x025666 },
+	{ (char*) "America/Mendoza"                   , 0x025B0C },
+	{ (char*) "America/Menominee"                 , 0x025F3E },
+	{ (char*) "America/Merida"                    , 0x02684B },
+	{ (char*) "America/Metlakatla"                , 0x026C54 },
+	{ (char*) "America/Mexico_City"               , 0x027206 },
+	{ (char*) "America/Miquelon"                  , 0x0276E6 },
+	{ (char*) "America/Moncton"                   , 0x027D66 },
+	{ (char*) "America/Monterrey"                 , 0x0289DC },
+	{ (char*) "America/Montevideo"                , 0x028DF2 },
+	{ (char*) "America/Montreal"                  , 0x0293D6 },
+	{ (char*) "America/Montserrat"                , 0x02A188 },
+	{ (char*) "America/Nassau"                    , 0x02A228 },
+	{ (char*) "America/New_York"                  , 0x02AB88 },
+	{ (char*) "America/Nipigon"                   , 0x02B988 },
+	{ (char*) "America/Nome"                      , 0x02C73A },
+	{ (char*) "America/Noronha"                   , 0x02D092 },
+	{ (char*) "America/North_Dakota/Beulah"       , 0x02D36C },
+	{ (char*) "America/North_Dakota/Center"       , 0x02DCE9 },
+	{ (char*) "America/North_Dakota/New_Salem"    , 0x02E666 },
+	{ (char*) "America/Nuuk"                      , 0x02EFE9 },
+	{ (char*) "America/Ojinaga"                   , 0x02F775 },
+	{ (char*) "America/Panama"                    , 0x02FD91 },
+	{ (char*) "America/Pangnirtung"               , 0x02FE53 },
+	{ (char*) "America/Paramaribo"                , 0x0306F9 },
+	{ (char*) "America/Phoenix"                   , 0x0307FD },
+	{ (char*) "America/Port-au-Prince"            , 0x030989 },
+	{ (char*) "America/Port_of_Spain"             , 0x030F2F },
+	{ (char*) "America/Porto_Acre"                , 0x030FCF },
+	{ (char*) "America/Porto_Velho"               , 0x031241 },
+	{ (char*) "America/Puerto_Rico"               , 0x031487 },
+	{ (char*) "America/Punta_Arenas"              , 0x031589 },
+	{ (char*) "America/Rainy_River"               , 0x031D17 },
+	{ (char*) "America/Rankin_Inlet"              , 0x032857 },
+	{ (char*) "America/Recife"                    , 0x03308B },
+	{ (char*) "America/Regina"                    , 0x03335F },
+	{ (char*) "America/Resolute"                  , 0x033754 },
+	{ (char*) "America/Rio_Branco"                , 0x033F89 },
+	{ (char*) "America/Rosario"                   , 0x0341FF },
+	{ (char*) "America/Santa_Isabel"              , 0x034631 },
+	{ (char*) "America/Santarem"                  , 0x034F83 },
+	{ (char*) "America/Santiago"                  , 0x0351E6 },
+	{ (char*) "America/Santo_Domingo"             , 0x035BD2 },
+	{ (char*) "America/Sao_Paulo"                 , 0x035DA8 },
+	{ (char*) "America/Scoresbysund"              , 0x036380 },
+	{ (char*) "America/Shiprock"                  , 0x036B17 },
+	{ (char*) "America/Sitka"                     , 0x0374BF },
+	{ (char*) "America/St_Barthelemy"             , 0x037DF7 },
+	{ (char*) "America/St_Johns"                  , 0x037EF9 },
+	{ (char*) "America/St_Kitts"                  , 0x038D6E },
+	{ (char*) "America/St_Lucia"                  , 0x038E0E },
+	{ (char*) "America/St_Thomas"                 , 0x038ED0 },
+	{ (char*) "America/St_Vincent"                , 0x038F70 },
+	{ (char*) "America/Swift_Current"             , 0x039032 },
+	{ (char*) "America/Tegucigalpa"               , 0x039280 },
+	{ (char*) "America/Thule"                     , 0x039388 },
+	{ (char*) "America/Thunder_Bay"               , 0x039980 },
+	{ (char*) "America/Tijuana"                   , 0x03A732 },
+	{ (char*) "America/Toronto"                   , 0x03B093 },
+	{ (char*) "America/Tortola"                   , 0x03BE62 },
+	{ (char*) "America/Vancouver"                 , 0x03BF02 },
+	{ (char*) "America/Virgin"                    , 0x03CA73 },
+	{ (char*) "America/Whitehorse"                , 0x03CB75 },
+	{ (char*) "America/Winnipeg"                  , 0x03D1E1 },
+	{ (char*) "America/Yakutat"                   , 0x03DD3E },
+	{ (char*) "America/Yellowknife"               , 0x03E65B },
+	{ (char*) "Antarctica/Casey"                  , 0x03EF83 },
+	{ (char*) "Antarctica/Davis"                  , 0x03F106 },
+	{ (char*) "Antarctica/DumontDUrville"         , 0x03F232 },
+	{ (char*) "Antarctica/Macquarie"              , 0x03F302 },
+	{ (char*) "Antarctica/Mawson"                 , 0x03FBF2 },
+	{ (char*) "Antarctica/McMurdo"                , 0x03FCBD },
+	{ (char*) "Antarctica/Palmer"                 , 0x0404B8 },
+	{ (char*) "Antarctica/Rothera"                , 0x040A46 },
+	{ (char*) "Antarctica/South_Pole"             , 0x040AEF },
+	{ (char*) "Antarctica/Syowa"                  , 0x041480 },
+	{ (char*) "Antarctica/Troll"                  , 0x041528 },
+	{ (char*) "Antarctica/Vostok"                 , 0x0419B5 },
+	{ (char*) "Arctic/Longyearbyen"               , 0x041A5E },
+	{ (char*) "Asia/Aden"                         , 0x042364 },
+	{ (char*) "Asia/Almaty"                       , 0x042407 },
+	{ (char*) "Asia/Amman"                        , 0x0427FC },
+	{ (char*) "Asia/Anadyr"                       , 0x042DA1 },
+	{ (char*) "Asia/Aqtau"                        , 0x043256 },
+	{ (char*) "Asia/Aqtobe"                       , 0x043640 },
+	{ (char*) "Asia/Ashgabat"                     , 0x043A3E },
+	{ (char*) "Asia/Ashkhabad"                    , 0x043CA7 },
+	{ (char*) "Asia/Atyrau"                       , 0x043F10 },
+	{ (char*) "Asia/Baghdad"                      , 0x044302 },
+	{ (char*) "Asia/Bahrain"                      , 0x0446D7 },
+	{ (char*) "Asia/Baku"                         , 0x0447C2 },
+	{ (char*) "Asia/Bangkok"                      , 0x044C8B },
+	{ (char*) "Asia/Barnaul"                      , 0x044D50 },
+	{ (char*) "Asia/Beirut"                       , 0x045221 },
+	{ (char*) "Asia/Bishkek"                      , 0x045A97 },
+	{ (char*) "Asia/Brunei"                       , 0x045E6C },
+	{ (char*) "Asia/Calcutta"                     , 0x045F35 },
+	{ (char*) "Asia/Chita"                        , 0x04605E },
+	{ (char*) "Asia/Choibalsan"                   , 0x046535 },
+	{ (char*) "Asia/Chongqing"                    , 0x0468FA },
+	{ (char*) "Asia/Chungking"                    , 0x046B37 },
+	{ (char*) "Asia/Colombo"                      , 0x046D74 },
+	{ (char*) "Asia/Dacca"                        , 0x046EE6 },
+	{ (char*) "Asia/Damascus"                     , 0x047035 },
+	{ (char*) "Asia/Dhaka"                        , 0x047792 },
+	{ (char*) "Asia/Dili"                         , 0x0478E1 },
+	{ (char*) "Asia/Dubai"                        , 0x0479C2 },
+	{ (char*) "Asia/Dushanbe"                     , 0x047A65 },
+	{ (char*) "Asia/Famagusta"                    , 0x047CB2 },
+	{ (char*) "Asia/Gaza"                         , 0x0484B9 },
+	{ (char*) "Asia/Harbin"                       , 0x0493AF },
+	{ (char*) "Asia/Hebron"                       , 0x0495EC },
+	{ (char*) "Asia/Ho_Chi_Minh"                  , 0x04A4FD },
+	{ (char*) "Asia/Hong_Kong"                    , 0x04A65A },
+	{ (char*) "Asia/Hovd"                         , 0x04AB37 },
+	{ (char*) "Asia/Irkutsk"                      , 0x04AEDB },
+	{ (char*) "Asia/Istanbul"                     , 0x04B3CE },
+	{ (char*) "Asia/Jakarta"                      , 0x04BB67 },
+	{ (char*) "Asia/Jayapura"                     , 0x04BCFF },
+	{ (char*) "Asia/Jerusalem"                    , 0x04BE1E },
+	{ (char*) "Asia/Kabul"                        , 0x04C77E },
+	{ (char*) "Asia/Kamchatka"                    , 0x04C84C },
+	{ (char*) "Asia/Karachi"                      , 0x04CCEA },
+	{ (char*) "Asia/Kashgar"                      , 0x04CE71 },
+	{ (char*) "Asia/Kathmandu"                    , 0x04CF14 },
+	{ (char*) "Asia/Katmandu"                     , 0x04CFE6 },
+	{ (char*) "Asia/Khandyga"                     , 0x04D0B8 },
+	{ (char*) "Asia/Kolkata"                      , 0x04D5CB },
+	{ (char*) "Asia/Krasnoyarsk"                  , 0x04D6F4 },
+	{ (char*) "Asia/Kuala_Lumpur"                 , 0x04DBC2 },
+	{ (char*) "Asia/Kuching"                      , 0x04DD73 },
+	{ (char*) "Asia/Kuwait"                       , 0x04DF62 },
+	{ (char*) "Asia/Macao"                        , 0x04E005 },
+	{ (char*) "Asia/Macau"                        , 0x04E4DC },
+	{ (char*) "Asia/Magadan"                      , 0x04E9B3 },
+	{ (char*) "Asia/Makassar"                     , 0x04EE87 },
+	{ (char*) "Asia/Manila"                       , 0x04EFDA },
+	{ (char*) "Asia/Muscat"                       , 0x04F12E },
+	{ (char*) "Asia/Nicosia"                      , 0x04F1D1 },
+	{ (char*) "Asia/Novokuznetsk"                 , 0x04F9BD },
+	{ (char*) "Asia/Novosibirsk"                  , 0x04FE59 },
+	{ (char*) "Asia/Omsk"                         , 0x050330 },
+	{ (char*) "Asia/Oral"                         , 0x0507F2 },
+	{ (char*) "Asia/Phnom_Penh"                   , 0x050BEC },
+	{ (char*) "Asia/Pontianak"                    , 0x050D11 },
+	{ (char*) "Asia/Pyongyang"                    , 0x050E94 },
+	{ (char*) "Asia/Qatar"                        , 0x050F8D },
+	{ (char*) "Asia/Qostanay"                     , 0x051052 },
+	{ (char*) "Asia/Qyzylorda"                    , 0x05145D },
+	{ (char*) "Asia/Rangoon"                      , 0x051879 },
+	{ (char*) "Asia/Riyadh"                       , 0x051983 },
+	{ (char*) "Asia/Saigon"                       , 0x051A26 },
+	{ (char*) "Asia/Sakhalin"                     , 0x051B83 },
+	{ (char*) "Asia/Samarkand"                    , 0x05204B },
+	{ (char*) "Asia/Seoul"                        , 0x05229B },
+	{ (char*) "Asia/Shanghai"                     , 0x052510 },
+	{ (char*) "Asia/Singapore"                    , 0x052759 },
+	{ (char*) "Asia/Srednekolymsk"                , 0x0528F6 },
+	{ (char*) "Asia/Taipei"                       , 0x052DCA },
+	{ (char*) "Asia/Tashkent"                     , 0x0530CF },
+	{ (char*) "Asia/Tbilisi"                      , 0x05332D },
+	{ (char*) "Asia/Tehran"                       , 0x053736 },
+	{ (char*) "Asia/Tel_Aviv"                     , 0x053C22 },
+	{ (char*) "Asia/Thimbu"                       , 0x054582 },
+	{ (char*) "Asia/Thimphu"                      , 0x05464B },
+	{ (char*) "Asia/Tokyo"                        , 0x054714 },
+	{ (char*) "Asia/Tomsk"                        , 0x054855 },
+	{ (char*) "Asia/Ujung_Pandang"                , 0x054D26 },
+	{ (char*) "Asia/Ulaanbaatar"                  , 0x054E30 },
+	{ (char*) "Asia/Ulan_Bator"                   , 0x0551B9 },
+	{ (char*) "Asia/Urumqi"                       , 0x055532 },
+	{ (char*) "Asia/Ust-Nera"                     , 0x0555E2 },
+	{ (char*) "Asia/Vientiane"                    , 0x055AD8 },
+	{ (char*) "Asia/Vladivostok"                  , 0x055C19 },
+	{ (char*) "Asia/Yakutsk"                      , 0x0560E2 },
+	{ (char*) "Asia/Yangon"                       , 0x0565AA },
+	{ (char*) "Asia/Yekaterinburg"                , 0x0566B4 },
+	{ (char*) "Asia/Yerevan"                      , 0x056B9B },
+	{ (char*) "Atlantic/Azores"                   , 0x057018 },
+	{ (char*) "Atlantic/Bermuda"                  , 0x057DD4 },
+	{ (char*) "Atlantic/Canary"                   , 0x05873C },
+	{ (char*) "Atlantic/Cape_Verde"               , 0x058EBF },
+	{ (char*) "Atlantic/Faeroe"                   , 0x058FCB },
+	{ (char*) "Atlantic/Faroe"                    , 0x0596EE },
+	{ (char*) "Atlantic/Jan_Mayen"                , 0x059E11 },
+	{ (char*) "Atlantic/Madeira"                  , 0x05A717 },
+	{ (char*) "Atlantic/Reykjavik"                , 0x05B4E1 },
+	{ (char*) "Atlantic/South_Georgia"            , 0x05B977 },
+	{ (char*) "Atlantic/St_Helena"                , 0x05BA19 },
+	{ (char*) "Atlantic/Stanley"                  , 0x05BADB },
+	{ (char*) "Australia/ACT"                     , 0x05BF97 },
+	{ (char*) "Australia/Adelaide"                , 0x05C831 },
+	{ (char*) "Australia/Brisbane"                , 0x05D0EC },
+	{ (char*) "Australia/Broken_Hill"             , 0x05D2B2 },
+	{ (char*) "Australia/Canberra"                , 0x05DB8F },
+	{ (char*) "Australia/Currie"                  , 0x05E429 },
+	{ (char*) "Australia/Darwin"                  , 0x05ED6B },
+	{ (char*) "Australia/Eucla"                   , 0x05EECE },
+	{ (char*) "Australia/Hobart"                  , 0x05F0BB },
+	{ (char*) "Australia/LHI"                     , 0x05FA05 },
+	{ (char*) "Australia/Lindeman"                , 0x060147 },
+	{ (char*) "Australia/Lord_Howe"               , 0x06034D },
+	{ (char*) "Australia/Melbourne"               , 0x060A9F },
+	{ (char*) "Australia/North"                   , 0x061341 },
+	{ (char*) "Australia/NSW"                     , 0x061492 },
+	{ (char*) "Australia/Perth"                   , 0x061D2C },
+	{ (char*) "Australia/Queensland"              , 0x061F14 },
+	{ (char*) "Australia/South"                   , 0x0620C3 },
+	{ (char*) "Australia/Sydney"                  , 0x06296F },
+	{ (char*) "Australia/Tasmania"                , 0x063225 },
+	{ (char*) "Australia/Victoria"                , 0x063B67 },
+	{ (char*) "Australia/West"                    , 0x064401 },
+	{ (char*) "Australia/Yancowinna"              , 0x0645CB },
+	{ (char*) "Brazil/Acre"                       , 0x064E8C },
+	{ (char*) "Brazil/DeNoronha"                  , 0x0650FE },
+	{ (char*) "Brazil/East"                       , 0x0653C8 },
+	{ (char*) "Brazil/West"                       , 0x06596A },
+	{ (char*) "Canada/Atlantic"                   , 0x065BC4 },
+	{ (char*) "Canada/Central"                    , 0x066930 },
+	{ (char*) "Canada/Eastern"                    , 0x067470 },
+	{ (char*) "Canada/Mountain"                   , 0x068222 },
+	{ (char*) "Canada/Newfoundland"               , 0x068B4A },
+	{ (char*) "Canada/Pacific"                    , 0x06999D },
+	{ (char*) "Canada/Saskatchewan"               , 0x06A4F5 },
+	{ (char*) "Canada/Yukon"                      , 0x06A8D5 },
+	{ (char*) "CET"                               , 0x06AF2F },
+	{ (char*) "Chile/Continental"                 , 0x06B769 },
+	{ (char*) "Chile/EasterIsland"                , 0x06C148 },
+	{ (char*) "CST6CDT"                           , 0x06C9FF },
+	{ (char*) "Cuba"                              , 0x06D311 },
+	{ (char*) "EET"                               , 0x06DC8D },
+	{ (char*) "Egypt"                             , 0x06E40D },
+	{ (char*) "Eire"                              , 0x06ED78 },
+	{ (char*) "EST"                               , 0x06FB28 },
+	{ (char*) "EST5EDT"                           , 0x06FBA6 },
+	{ (char*) "Etc/GMT"                           , 0x0704B8 },
+	{ (char*) "Etc/GMT+0"                         , 0x070536 },
+	{ (char*) "Etc/GMT+1"                         , 0x0705B4 },
+	{ (char*) "Etc/GMT+10"                        , 0x070634 },
+	{ (char*) "Etc/GMT+11"                        , 0x0706B5 },
+	{ (char*) "Etc/GMT+12"                        , 0x070736 },
+	{ (char*) "Etc/GMT+2"                         , 0x0707B7 },
+	{ (char*) "Etc/GMT+3"                         , 0x070837 },
+	{ (char*) "Etc/GMT+4"                         , 0x0708B7 },
+	{ (char*) "Etc/GMT+5"                         , 0x070937 },
+	{ (char*) "Etc/GMT+6"                         , 0x0709B7 },
+	{ (char*) "Etc/GMT+7"                         , 0x070A37 },
+	{ (char*) "Etc/GMT+8"                         , 0x070AB7 },
+	{ (char*) "Etc/GMT+9"                         , 0x070B37 },
+	{ (char*) "Etc/GMT-0"                         , 0x070BB7 },
+	{ (char*) "Etc/GMT-1"                         , 0x070C35 },
+	{ (char*) "Etc/GMT-10"                        , 0x070CB6 },
+	{ (char*) "Etc/GMT-11"                        , 0x070D38 },
+	{ (char*) "Etc/GMT-12"                        , 0x070DBA },
+	{ (char*) "Etc/GMT-13"                        , 0x070E3C },
+	{ (char*) "Etc/GMT-14"                        , 0x070EBE },
+	{ (char*) "Etc/GMT-2"                         , 0x070F40 },
+	{ (char*) "Etc/GMT-3"                         , 0x070FC1 },
+	{ (char*) "Etc/GMT-4"                         , 0x071042 },
+	{ (char*) "Etc/GMT-5"                         , 0x0710C3 },
+	{ (char*) "Etc/GMT-6"                         , 0x071144 },
+	{ (char*) "Etc/GMT-7"                         , 0x0711C5 },
+	{ (char*) "Etc/GMT-8"                         , 0x071246 },
+	{ (char*) "Etc/GMT-9"                         , 0x0712C7 },
+	{ (char*) "Etc/GMT0"                          , 0x071348 },
+	{ (char*) "Etc/Greenwich"                     , 0x0713C6 },
+	{ (char*) "Etc/UCT"                           , 0x071444 },
+	{ (char*) "Etc/Universal"                     , 0x0714C2 },
+	{ (char*) "Etc/UTC"                           , 0x071540 },
+	{ (char*) "Etc/Zulu"                          , 0x0715BE },
+	{ (char*) "Europe/Amsterdam"                  , 0x07163C },
+	{ (char*) "Europe/Andorra"                    , 0x0721A6 },
+	{ (char*) "Europe/Astrakhan"                  , 0x072880 },
+	{ (char*) "Europe/Athens"                     , 0x072D1D },
+	{ (char*) "Europe/Belfast"                    , 0x0735FF },
+	{ (char*) "Europe/Belgrade"                   , 0x07445B },
+	{ (char*) "Europe/Berlin"                     , 0x074BE7 },
+	{ (char*) "Europe/Bratislava"                 , 0x0754FC },
+	{ (char*) "Europe/Brussels"                   , 0x075E05 },
+	{ (char*) "Europe/Bucharest"                  , 0x076986 },
+	{ (char*) "Europe/Budapest"                   , 0x07721A },
+	{ (char*) "Europe/Busingen"                   , 0x077B66 },
+	{ (char*) "Europe/Chisinau"                   , 0x0782EF },
+	{ (char*) "Europe/Copenhagen"                 , 0x078C51 },
+	{ (char*) "Europe/Dublin"                     , 0x0794B6 },
+	{ (char*) "Europe/Gibraltar"                  , 0x07A266 },
+	{ (char*) "Europe/Guernsey"                   , 0x07AE6E },
+	{ (char*) "Europe/Helsinki"                   , 0x07BD0E },
+	{ (char*) "Europe/Isle_of_Man"                , 0x07C486 },
+	{ (char*) "Europe/Istanbul"                   , 0x07D2D2 },
+	{ (char*) "Europe/Jersey"                     , 0x07DA6B },
+	{ (char*) "Europe/Kaliningrad"                , 0x07E90B },
+	{ (char*) "Europe/Kiev"                       , 0x07EF00 },
+	{ (char*) "Europe/Kirov"                      , 0x07F754 },
+	{ (char*) "Europe/Kyiv"                       , 0x07FC0F },
+	{ (char*) "Europe/Lisbon"                     , 0x080472 },
+	{ (char*) "Europe/Ljubljana"                  , 0x08123A },
+	{ (char*) "Europe/London"                     , 0x0819C6 },
+	{ (char*) "Europe/Luxembourg"                 , 0x082822 },
+	{ (char*) "Europe/Madrid"                     , 0x0833B0 },
+	{ (char*) "Europe/Malta"                      , 0x083E02 },
+	{ (char*) "Europe/Mariehamn"                  , 0x08484A },
+	{ (char*) "Europe/Minsk"                      , 0x084FC2 },
+	{ (char*) "Europe/Monaco"                     , 0x0854E9 },
+	{ (char*) "Europe/Moscow"                     , 0x086075 },
+	{ (char*) "Europe/Nicosia"                    , 0x086694 },
+	{ (char*) "Europe/Oslo"                       , 0x086E72 },
+	{ (char*) "Europe/Paris"                      , 0x087732 },
+	{ (char*) "Europe/Podgorica"                  , 0x0882D0 },
+	{ (char*) "Europe/Prague"                     , 0x088A5C },
+	{ (char*) "Europe/Riga"                       , 0x089365 },
+	{ (char*) "Europe/Rome"                       , 0x089C07 },
+	{ (char*) "Europe/Samara"                     , 0x08A664 },
+	{ (char*) "Europe/San_Marino"                 , 0x08AB3A },
+	{ (char*) "Europe/Sarajevo"                   , 0x08B597 },
+	{ (char*) "Europe/Saratov"                    , 0x08BD23 },
+	{ (char*) "Europe/Simferopol"                 , 0x08C1D0 },
+	{ (char*) "Europe/Skopje"                     , 0x08C79F },
+	{ (char*) "Europe/Sofia"                      , 0x08CF2B },
+	{ (char*) "Europe/Stockholm"                  , 0x08D754 },
+	{ (char*) "Europe/Tallinn"                    , 0x08DED5 },
+	{ (char*) "Europe/Tirane"                     , 0x08E745 },
+	{ (char*) "Europe/Tiraspol"                   , 0x08EF75 },
+	{ (char*) "Europe/Ulyanovsk"                  , 0x08F8D7 },
+	{ (char*) "Europe/Uzhgorod"                   , 0x08FDDA },
+	{ (char*) "Europe/Vaduz"                      , 0x09062E },
+	{ (char*) "Europe/Vatican"                    , 0x090D9A },
+	{ (char*) "Europe/Vienna"                     , 0x0917F7 },
+	{ (char*) "Europe/Vilnius"                    , 0x09209B },
+	{ (char*) "Europe/Volgograd"                  , 0x092919 },
+	{ (char*) "Europe/Warsaw"                     , 0x092DE0 },
+	{ (char*) "Europe/Zagreb"                     , 0x09384A },
+	{ (char*) "Europe/Zaporozhye"                 , 0x093FD6 },
+	{ (char*) "Europe/Zurich"                     , 0x09482A },
+	{ (char*) "Factory"                           , 0x094FAB },
+	{ (char*) "GB"                                , 0x09502B },
+	{ (char*) "GB-Eire"                           , 0x095E87 },
+	{ (char*) "GMT"                               , 0x096CE3 },
+	{ (char*) "GMT+0"                             , 0x096D61 },
+	{ (char*) "GMT-0"                             , 0x096DDF },
+	{ (char*) "GMT0"                              , 0x096E5D },
+	{ (char*) "Greenwich"                         , 0x096EDB },
+	{ (char*) "Hongkong"                          , 0x096F59 },
+	{ (char*) "HST"                               , 0x097436 },
+	{ (char*) "Iceland"                           , 0x0974B5 },
+	{ (char*) "Indian/Antananarivo"               , 0x097555 },
+	{ (char*) "Indian/Chagos"                     , 0x09763C },
+	{ (char*) "Indian/Christmas"                  , 0x097701 },
+	{ (char*) "Indian/Cocos"                      , 0x0977A4 },
+	{ (char*) "Indian/Comoro"                     , 0x097850 },
+	{ (char*) "Indian/Kerguelen"                  , 0x0978F1 },
+	{ (char*) "Indian/Mahe"                       , 0x097994 },
+	{ (char*) "Indian/Maldives"                   , 0x097A37 },
+	{ (char*) "Indian/Mauritius"                  , 0x097AFC },
+	{ (char*) "Indian/Mayotte"                    , 0x097BEB },
+	{ (char*) "Indian/Reunion"                    , 0x097C8C },
+	{ (char*) "Iran"                              , 0x097D2F },
+	{ (char*) "Israel"                            , 0x09821B },
+	{ (char*) "Jamaica"                           , 0x098B7B },
+	{ (char*) "Japan"                             , 0x098D69 },
+	{ (char*) "Kwajalein"                         , 0x098EAA },
+	{ (char*) "Libya"                             , 0x098FE4 },
+	{ (char*) "MET"                               , 0x099261 },
+	{ (char*) "Mexico/BajaNorte"                  , 0x099A9B },
+	{ (char*) "Mexico/BajaSur"                    , 0x09A3ED },
+	{ (char*) "Mexico/General"                    , 0x09A861 },
+	{ (char*) "MST"                               , 0x09AD33 },
+	{ (char*) "MST7MDT"                           , 0x09ADB1 },
+	{ (char*) "Navajo"                            , 0x09B6C3 },
+	{ (char*) "NZ"                                , 0x09C06B },
+	{ (char*) "NZ-CHAT"                           , 0x09C9FC },
+	{ (char*) "Pacific/Apia"                      , 0x09D20E },
+	{ (char*) "Pacific/Auckland"                  , 0x09D470 },
+	{ (char*) "Pacific/Bougainville"              , 0x09DE14 },
+	{ (char*) "Pacific/Chatham"                   , 0x09DF2A },
+	{ (char*) "Pacific/Chuuk"                     , 0x09E74B },
+	{ (char*) "Pacific/Easter"                    , 0x09E865 },
+	{ (char*) "Pacific/Efate"                     , 0x09F129 },
+	{ (char*) "Pacific/Enderbury"                 , 0x09F341 },
+	{ (char*) "Pacific/Fakaofo"                   , 0x09F429 },
+	{ (char*) "Pacific/Fiji"                      , 0x09F4EF },
+	{ (char*) "Pacific/Funafuti"                  , 0x09F72F },
+	{ (char*) "Pacific/Galapagos"                 , 0x09F7D3 },
+	{ (char*) "Pacific/Gambier"                   , 0x09F8D0 },
+	{ (char*) "Pacific/Guadalcanal"               , 0x09F981 },
+	{ (char*) "Pacific/Guam"                      , 0x09FA25 },
+	{ (char*) "Pacific/Honolulu"                  , 0x09FC1F },
+	{ (char*) "Pacific/Johnston"                  , 0x09FD7A },
+	{ (char*) "Pacific/Kanton"                    , 0x09FECF },
+	{ (char*) "Pacific/Kiritimati"                , 0x09FFC6 },
+	{ (char*) "Pacific/Kosrae"                    , 0x0A00BE },
+	{ (char*) "Pacific/Kwajalein"                 , 0x0A0221 },
+	{ (char*) "Pacific/Majuro"                    , 0x0A0364 },
+	{ (char*) "Pacific/Marquesas"                 , 0x0A04B0 },
+	{ (char*) "Pacific/Midway"                    , 0x0A056C },
+	{ (char*) "Pacific/Nauru"                     , 0x0A065F },
+	{ (char*) "Pacific/Niue"                      , 0x0A0759 },
+	{ (char*) "Pacific/Norfolk"                   , 0x0A0822 },
+	{ (char*) "Pacific/Noumea"                    , 0x0A0B90 },
+	{ (char*) "Pacific/Pago_Pago"                 , 0x0A0CBE },
+	{ (char*) "Pacific/Palau"                     , 0x0A0D79 },
+	{ (char*) "Pacific/Pitcairn"                  , 0x0A0E2B },
+	{ (char*) "Pacific/Pohnpei"                   , 0x0A0EF3 },
+	{ (char*) "Pacific/Ponape"                    , 0x0A102E },
+	{ (char*) "Pacific/Port_Moresby"              , 0x0A10D2 },
+	{ (char*) "Pacific/Rarotonga"                 , 0x0A11A2 },
+	{ (char*) "Pacific/Saipan"                    , 0x0A13FB },
+	{ (char*) "Pacific/Samoa"                     , 0x0A15E7 },
+	{ (char*) "Pacific/Tahiti"                    , 0x0A16A2 },
+	{ (char*) "Pacific/Tarawa"                    , 0x0A1754 },
+	{ (char*) "Pacific/Tongatapu"                 , 0x0A1807 },
+	{ (char*) "Pacific/Truk"                      , 0x0A1979 },
+	{ (char*) "Pacific/Wake"                      , 0x0A1A31 },
+	{ (char*) "Pacific/Wallis"                    , 0x0A1AE0 },
+	{ (char*) "Pacific/Yap"                       , 0x0A1B84 },
+	{ (char*) "Poland"                            , 0x0A1C3C },
+	{ (char*) "Portugal"                          , 0x0A26A6 },
+	{ (char*) "PRC"                               , 0x0A345B },
+	{ (char*) "PST8PDT"                           , 0x0A3698 },
+	{ (char*) "ROC"                               , 0x0A3FAA },
+	{ (char*) "ROK"                               , 0x0A42AF },
+	{ (char*) "Singapore"                         , 0x0A4524 },
+	{ (char*) "Turkey"                            , 0x0A46C1 },
+	{ (char*) "UCT"                               , 0x0A4E5A },
+	{ (char*) "Universal"                         , 0x0A4ED8 },
+	{ (char*) "US/Alaska"                         , 0x0A4F56 },
+	{ (char*) "US/Aleutian"                       , 0x0A58A5 },
+	{ (char*) "US/Arizona"                        , 0x0A61E5 },
+	{ (char*) "US/Central"                        , 0x0A6359 },
+	{ (char*) "US/East-Indiana"                   , 0x0A716D },
+	{ (char*) "US/Eastern"                        , 0x0A780B },
+	{ (char*) "US/Hawaii"                         , 0x0A85F7 },
+	{ (char*) "US/Indiana-Starke"                 , 0x0A874C },
+	{ (char*) "US/Michigan"                       , 0x0A90E4 },
+	{ (char*) "US/Mountain"                       , 0x0A99A6 },
+	{ (char*) "US/Pacific"                        , 0x0AA34E },
+	{ (char*) "US/Samoa"                          , 0x0AAE7E },
+	{ (char*) "UTC"                               , 0x0AAF39 },
+	{ (char*) "W-SU"                              , 0x0AAFB7 },
+	{ (char*) "WET"                               , 0x0AB5C2 },
+	{ (char*) "Zulu"                              , 0x0ABD3F },
 };
 
 
-const unsigned char timelib_timezone_db_data_builtin696923 = {
+const unsigned char timelib_timezone_db_data_builtin703933 = {
 
 /* Africa/Abidjan */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -24434,7 +24750,7 @@
 /* Africa/Cairo */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x45, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x7F, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0D, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x9D, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0D, 0x80, 0x00, 0x00, 0x00,
 0xC8, 0x93, 0xB4, 0xE0, 0xC8, 0xFA, 0x7B, 0xD0, 0xC9, 0xFC, 0xEF, 0xE0, 0xCA, 0xC7, 0xE8, 0xD0,
 0xCB, 0xCB, 0xAE, 0x60, 0xCC, 0xDF, 0x29, 0xD0, 0xCD, 0xAC, 0xE1, 0xE0, 0xCE, 0xC6, 0xF4, 0xD0,
 0xCF, 0x8F, 0x66, 0xE0, 0xD0, 0xA9, 0x79, 0xD0, 0xD1, 0x84, 0x60, 0xE0, 0xD2, 0x8A, 0xAD, 0x50,
@@ -24466,95 +24782,123 @@
 0x46, 0x31, 0x20, 0xE0, 0x46, 0xE0, 0x6A, 0x50, 0x48, 0x11, 0x02, 0xE0, 0x48, 0xB7, 0x11, 0xD0,
 0x49, 0xF0, 0xE4, 0xE0, 0x4A, 0x8D, 0xB9, 0x50, 0x4B, 0xDA, 0x01, 0x60, 0x4C, 0x61, 0xBD, 0xD0,
 0x4C, 0x89, 0x58, 0xE0, 0x4C, 0xA4, 0xFA, 0x50, 0x53, 0x75, 0x38, 0xE0, 0x53, 0xAC, 0x89, 0xD0,
-0x53, 0xDA, 0xBC, 0x60, 0x54, 0x24, 0x82, 0x50, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x53, 0xDA, 0xBC, 0x60, 0x54, 0x24, 0x82, 0x50, 0x64, 0x4A, 0xF0, 0x60, 0x65, 0x3A, 0xD3, 0x50,
+0x66, 0x2A, 0xD2, 0x60, 0x67, 0x23, 0xEF, 0xD0, 0x68, 0x0A, 0xB4, 0x60, 0x69, 0x03, 0xD1, 0xD0,
+0x69, 0xEA, 0x96, 0x60, 0x6A, 0xE3, 0xB3, 0xD0, 0x6B, 0xD3, 0xB2, 0xE0, 0x6C, 0xC3, 0x95, 0xD0,
+0x6D, 0xB3, 0x94, 0xE0, 0x6E, 0xA3, 0x77, 0xD0, 0x6F, 0x93, 0x76, 0xE0, 0x70, 0x83, 0x59, 0xD0,
+0x71, 0x73, 0x58, 0xE0, 0x72, 0x6C, 0x76, 0x50, 0x73, 0x53, 0x3A, 0xE0, 0x74, 0x4C, 0x58, 0x50,
+0x75, 0x3C, 0x57, 0x60, 0x76, 0x2C, 0x3A, 0x50, 0x77, 0x1C, 0x39, 0x60, 0x78, 0x0C, 0x1C, 0x50,
+0x78, 0xFC, 0x1B, 0x60, 0x79, 0xEB, 0xFE, 0x50, 0x7A, 0xDB, 0xFD, 0x60, 0x7B, 0xCB, 0xE0, 0x50,
+0x7C, 0xBB, 0xDF, 0x60, 0x7D, 0xB4, 0xFC, 0xD0, 0x7E, 0x9B, 0xC1, 0x60, 0x7F, 0x94, 0xDE, 0xD0,
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 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, 0x00, 0x00, 0x1D,
+0x55, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x00,
+0x00, 0x2A, 0x30, 0x01, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45,
+0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9D, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,
+0x00, 0x0D, 0xFF, 0xFF, 0xFF, 0xFF, 0x7D, 0xBD, 0x4D, 0xAB, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x93,
+0xB4, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0xFA, 0x7B, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xFC,
+0xEF, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xC7, 0xE8, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xCB,
+0xAE, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xDF, 0x29, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xAC,
+0xE1, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0xC6, 0xF4, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x8F,
+0x66, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0xA9, 0x79, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x84,
+0x60, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x8A, 0xAD, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x36,
+0x63, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xF4, 0x2D, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0x0B,
+0xB9, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xD5, 0x60, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xEC,
+0xFA, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xB5, 0x6D, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xCF,
+0x7F, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x97, 0xF2, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0xB0,
+0xB3, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x79, 0x25, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF1, 0x91,
+0xE6, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x5A, 0x59, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xF3, 0x73,
+0x1A, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x3B, 0x8C, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x55,
+0x9F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x1E, 0x11, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x36,
+0xD2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0xFF, 0x45, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0x18,
+0x06, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0xE1, 0xCA, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xF9,
+0x39, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xC2, 0xFD, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xDB,
+0xBE, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xA5, 0x82, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xBC,
+0xF2, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x86, 0xB6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E,
+0x25, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x01, 0x67, 0xE9, 0x80, 0x00, 0x00, 0x00, 0x00, 0x02, 0x7F,
+0x59, 0x70, 0x00, 0x00, 0x00, 0x00, 0x03, 0x49, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x61,
+0xDE, 0x70, 0x00, 0x00, 0x00, 0x00, 0x05, 0x2B, 0xA2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x43,
+0x11, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0C, 0xD5, 0x80, 0x00, 0x00, 0x00, 0x00, 0x08, 0x24,
+0x45, 0x70, 0x00, 0x00, 0x00, 0x00, 0x08, 0xEE, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x05,
+0x78, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xCF, 0x3C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE7,
+0xFD, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xB1, 0xC1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC9,
+0x31, 0x70, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x92, 0xF5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xAA,
+0x64, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x10, 0x74, 0x28, 0x80, 0x00, 0x00, 0x00, 0x00, 0x11, 0x8B,
+0x98, 0x70, 0x00, 0x00, 0x00, 0x00, 0x12, 0x55, 0x5C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x6E,
+0x1D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x14, 0x37, 0xE1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x4F,
+0x50, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x19, 0x14, 0x80, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA0,
+0x93, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x17, 0xFA, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x70,
+0xA3, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x19, 0xDB, 0x7B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF4,
+0x3C, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBE, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD5,
+0x70, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9F, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB6,
+0xA3, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x80, 0x67, 0x80, 0x00, 0x00, 0x00, 0x00, 0x20, 0x97,
+0xD7, 0x70, 0x00, 0x00, 0x00, 0x00, 0x21, 0x61, 0x9B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x7A,
+0x5C, 0x70, 0x00, 0x00, 0x00, 0x00, 0x23, 0x44, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x62,
+0x27, 0x70, 0x00, 0x00, 0x00, 0x00, 0x25, 0x25, 0x53, 0x80, 0x00, 0x00, 0x00, 0x00, 0x26, 0x3C,
+0xC3, 0x70, 0x00, 0x00, 0x00, 0x00, 0x27, 0x06, 0x87, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x1D,
+0xF6, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE7, 0xBA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x00,
+0x7B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xCA, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xE1,
+0xAF, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xAB, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2D, 0xC2,
+0xE2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x8C, 0xA6, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2F, 0xA0,
+0x13, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x6B, 0x0C, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x31, 0x7F,
+0xF5, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x32, 0x4A, 0xEE, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x33, 0x5F,
+0xD7, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x34, 0x2A, 0xD0, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x35, 0x3F,
+0xB9, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x36, 0x0A, 0xB2, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x37, 0x28,
+0xD6, 0x60, 0x00, 0x00, 0x00, 0x00, 0x37, 0xF3, 0xCF, 0x50, 0x00, 0x00, 0x00, 0x00, 0x39, 0x08,
+0xB8, 0x60, 0x00, 0x00, 0x00, 0x00, 0x39, 0xD3, 0xB1, 0x50, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xE8,
+0x9A, 0x60, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xB3, 0x93, 0x50, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xC8,
+0x7C, 0x60, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x93, 0x75, 0x50, 0x00, 0x00, 0x00, 0x00, 0x3E, 0xA8,
+0x5E, 0x60, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x73, 0x57, 0x50, 0x00, 0x00, 0x00, 0x00, 0x40, 0x91,
+0x7A, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x5C, 0x73, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x42, 0x71,
+0x5C, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x3C, 0x55, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x44, 0x51,
+0x3E, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x12, 0xFD, 0x50, 0x00, 0x00, 0x00, 0x00, 0x46, 0x31,
+0x20, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x46, 0xE0, 0x6A, 0x50, 0x00, 0x00, 0x00, 0x00, 0x48, 0x11,
+0x02, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x48, 0xB7, 0x11, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x49, 0xF0,
+0xE4, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x4A, 0x8D, 0xB9, 0x50, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xDA,
+0x01, 0x60, 0x00, 0x00, 0x00, 0x00, 0x4C, 0x61, 0xBD, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0x89,
+0x58, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xA4, 0xFA, 0x50, 0x00, 0x00, 0x00, 0x00, 0x53, 0x75,
+0x38, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x53, 0xAC, 0x89, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x53, 0xDA,
+0xBC, 0x60, 0x00, 0x00, 0x00, 0x00, 0x54, 0x24, 0x82, 0x50, 0x00, 0x00, 0x00, 0x00, 0x64, 0x4A,
+0xF0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x65, 0x3A, 0xD3, 0x50, 0x00, 0x00, 0x00, 0x00, 0x66, 0x2A,
+0xD2, 0x60, 0x00, 0x00, 0x00, 0x00, 0x67, 0x23, 0xEF, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x68, 0x0A,
+0xB4, 0x60, 0x00, 0x00, 0x00, 0x00, 0x69, 0x03, 0xD1, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x69, 0xEA,
+0x96, 0x60, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE3, 0xB3, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xD3,
+0xB2, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xC3, 0x95, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x6D, 0xB3,
+0x94, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xA3, 0x77, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x93,
+0x76, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x70, 0x83, 0x59, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x71, 0x73,
+0x58, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6C, 0x76, 0x50, 0x00, 0x00, 0x00, 0x00, 0x73, 0x53,
+0x3A, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4C, 0x58, 0x50, 0x00, 0x00, 0x00, 0x00, 0x75, 0x3C,
+0x57, 0x60, 0x00, 0x00, 0x00, 0x00, 0x76, 0x2C, 0x3A, 0x50, 0x00, 0x00, 0x00, 0x00, 0x77, 0x1C,
+0x39, 0x60, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0C, 0x1C, 0x50, 0x00, 0x00, 0x00, 0x00, 0x78, 0xFC,
+0x1B, 0x60, 0x00, 0x00, 0x00, 0x00, 0x79, 0xEB, 0xFE, 0x50, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xDB,
+0xFD, 0x60, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xCB, 0xE0, 0x50, 0x00, 0x00, 0x00, 0x00, 0x7C, 0xBB,
+0xDF, 0x60, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB4, 0xFC, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x9B,
+0xC1, 0x60, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x94, 0xDE, 0xD0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 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, 0x00, 0x00, 0x1D, 0x55, 0x00, 0x00, 0x00, 0x00, 0x2A,
 0x30, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x4C,
 0x4D, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x7F, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0D, 0xFF, 0xFF, 0xFF, 0xFF,
-0x7D, 0xBD, 0x4D, 0xAB, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x93, 0xB4, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF,
-0xC8, 0xFA, 0x7B, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xFC, 0xEF, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF,
-0xCA, 0xC7, 0xE8, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xCB, 0xAE, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
-0xCC, 0xDF, 0x29, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xAC, 0xE1, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF,
-0xCE, 0xC6, 0xF4, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x8F, 0x66, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF,
-0xD0, 0xA9, 0x79, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x84, 0x60, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF,
-0xD2, 0x8A, 0xAD, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x36, 0x63, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
-0xE8, 0xF4, 0x2D, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0x0B, 0xB9, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
-0xEA, 0xD5, 0x60, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xEC, 0xFA, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
-0xEC, 0xB5, 0x6D, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xCF, 0x7F, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
-0xEE, 0x97, 0xF2, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0xB0, 0xB3, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
-0xF0, 0x79, 0x25, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF1, 0x91, 0xE6, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
-0xF2, 0x5A, 0x59, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xF3, 0x73, 0x1A, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
-0xF4, 0x3B, 0x8C, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x55, 0x9F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
-0xF6, 0x1E, 0x11, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x36, 0xD2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
-0xF7, 0xFF, 0x45, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0x18, 0x06, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
-0xF9, 0xE1, 0xCA, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xF9, 0x39, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
-0xFB, 0xC2, 0xFD, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xDB, 0xBE, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
-0xFD, 0xA5, 0x82, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xBC, 0xF2, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
-0xFF, 0x86, 0xB6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x25, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x67, 0xE9, 0x80, 0x00, 0x00, 0x00, 0x00, 0x02, 0x7F, 0x59, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x03, 0x49, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x61, 0xDE, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x05, 0x2B, 0xA2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x43, 0x11, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x07, 0x0C, 0xD5, 0x80, 0x00, 0x00, 0x00, 0x00, 0x08, 0x24, 0x45, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x08, 0xEE, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x05, 0x78, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x0A, 0xCF, 0x3C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE7, 0xFD, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x0C, 0xB1, 0xC1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC9, 0x31, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x0E, 0x92, 0xF5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xAA, 0x64, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x10, 0x74, 0x28, 0x80, 0x00, 0x00, 0x00, 0x00, 0x11, 0x8B, 0x98, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x12, 0x55, 0x5C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x6E, 0x1D, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x14, 0x37, 0xE1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x4F, 0x50, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x16, 0x19, 0x14, 0x80, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA0, 0x93, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x17, 0xFA, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x70, 0xA3, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x19, 0xDB, 0x7B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF4, 0x3C, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x1B, 0xBE, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD5, 0x70, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x1D, 0x9F, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB6, 0xA3, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x1F, 0x80, 0x67, 0x80, 0x00, 0x00, 0x00, 0x00, 0x20, 0x97, 0xD7, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x21, 0x61, 0x9B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x7A, 0x5C, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x23, 0x44, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x62, 0x27, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x25, 0x25, 0x53, 0x80, 0x00, 0x00, 0x00, 0x00, 0x26, 0x3C, 0xC3, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x27, 0x06, 0x87, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x1D, 0xF6, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x28, 0xE7, 0xBA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x00, 0x7B, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x2A, 0xCA, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xE1, 0xAF, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x2C, 0xAB, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2D, 0xC2, 0xE2, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x2E, 0x8C, 0xA6, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2F, 0xA0, 0x13, 0xE0, 0x00, 0x00, 0x00, 0x00,
-0x30, 0x6B, 0x0C, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x31, 0x7F, 0xF5, 0xE0, 0x00, 0x00, 0x00, 0x00,
-0x32, 0x4A, 0xEE, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x33, 0x5F, 0xD7, 0xE0, 0x00, 0x00, 0x00, 0x00,
-0x34, 0x2A, 0xD0, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x35, 0x3F, 0xB9, 0xE0, 0x00, 0x00, 0x00, 0x00,
-0x36, 0x0A, 0xB2, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x37, 0x28, 0xD6, 0x60, 0x00, 0x00, 0x00, 0x00,
-0x37, 0xF3, 0xCF, 0x50, 0x00, 0x00, 0x00, 0x00, 0x39, 0x08, 0xB8, 0x60, 0x00, 0x00, 0x00, 0x00,
-0x39, 0xD3, 0xB1, 0x50, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xE8, 0x9A, 0x60, 0x00, 0x00, 0x00, 0x00,
-0x3B, 0xB3, 0x93, 0x50, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xC8, 0x7C, 0x60, 0x00, 0x00, 0x00, 0x00,
-0x3D, 0x93, 0x75, 0x50, 0x00, 0x00, 0x00, 0x00, 0x3E, 0xA8, 0x5E, 0x60, 0x00, 0x00, 0x00, 0x00,
-0x3F, 0x73, 0x57, 0x50, 0x00, 0x00, 0x00, 0x00, 0x40, 0x91, 0x7A, 0xE0, 0x00, 0x00, 0x00, 0x00,
-0x41, 0x5C, 0x73, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x42, 0x71, 0x5C, 0xE0, 0x00, 0x00, 0x00, 0x00,
-0x43, 0x3C, 0x55, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x44, 0x51, 0x3E, 0xE0, 0x00, 0x00, 0x00, 0x00,
-0x45, 0x12, 0xFD, 0x50, 0x00, 0x00, 0x00, 0x00, 0x46, 0x31, 0x20, 0xE0, 0x00, 0x00, 0x00, 0x00,
-0x46, 0xE0, 0x6A, 0x50, 0x00, 0x00, 0x00, 0x00, 0x48, 0x11, 0x02, 0xE0, 0x00, 0x00, 0x00, 0x00,
-0x48, 0xB7, 0x11, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x49, 0xF0, 0xE4, 0xE0, 0x00, 0x00, 0x00, 0x00,
-0x4A, 0x8D, 0xB9, 0x50, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xDA, 0x01, 0x60, 0x00, 0x00, 0x00, 0x00,
-0x4C, 0x61, 0xBD, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0x89, 0x58, 0xE0, 0x00, 0x00, 0x00, 0x00,
-0x4C, 0xA4, 0xFA, 0x50, 0x00, 0x00, 0x00, 0x00, 0x53, 0x75, 0x38, 0xE0, 0x00, 0x00, 0x00, 0x00,
-0x53, 0xAC, 0x89, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x53, 0xDA, 0xBC, 0x60, 0x00, 0x00, 0x00, 0x00,
-0x54, 0x24, 0x82, 0x50, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x00, 0x00, 0x1D, 0x55, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x00,
-0x00, 0x1C, 0x20, 0x00, 0x09, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x45,
-0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0A, 0x45, 0x45, 0x54,
-0x2D, 0x32, 0x0A, 0x00, 0xB7, 0x2E, 0x88, 0x01, 0x42, 0x57, 0x88, 0x00, 0x00, 0x00, 0x00, 
+0x0A, 0x45, 0x45, 0x54, 0x2D, 0x32, 0x45, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x34, 0x2E, 0x35, 0x2E,
+0x35, 0x2F, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x34, 0x2F, 0x32, 0x34, 0x0A, 0x00,
+0xB7, 0x2E, 0x88, 0x01, 0x42, 0x57, 0x88, 0x00, 0x00, 0x00, 0x00, 
 
 /* Africa/Casablanca */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -24575,11 +24919,11 @@
 0x59, 0x58, 0x53, 0xA0, 0x59, 0xF5, 0x36, 0x20, 0x5A, 0xB7, 0x02, 0xA0, 0x5A, 0xF7, 0x9C, 0x20,
 0x5B, 0x25, 0xC0, 0xA0, 0x5B, 0xD5, 0x18, 0x20, 0x5C, 0xCE, 0x43, 0xA0, 0x5C, 0xFC, 0x68, 0x20,
 0x5E, 0x9B, 0xB0, 0xA0, 0x5E, 0xD3, 0x0F, 0xA0, 0x60, 0x72, 0x58, 0x20, 0x60, 0xA0, 0x7C, 0xA0,
-0x62, 0x3F, 0xC5, 0x20, 0x62, 0x77, 0x24, 0x20, 0x64, 0x16, 0x6C, 0xA0, 0x64, 0x4D, 0xCB, 0xA0,
+0x62, 0x3F, 0xC5, 0x20, 0x62, 0x77, 0x24, 0x20, 0x64, 0x16, 0x6C, 0xA0, 0x64, 0x44, 0x91, 0x20,
 0x65, 0xED, 0x14, 0x20, 0x66, 0x1B, 0x38, 0xA0, 0x67, 0xBA, 0x81, 0x20, 0x67, 0xF1, 0xE0, 0x20,
 0x69, 0x91, 0x28, 0xA0, 0x69, 0xBF, 0x4D, 0x20, 0x6B, 0x67, 0xD0, 0x20, 0x6B, 0x95, 0xF4, 0xA0,
 0x6D, 0x35, 0x3D, 0x20, 0x6D, 0x6C, 0x9C, 0x20, 0x6F, 0x0B, 0xE4, 0xA0, 0x6F, 0x3A, 0x09, 0x20,
-0x70, 0xD9, 0x51, 0xA0, 0x71, 0x10, 0xB0, 0xA0, 0x72, 0xAF, 0xF9, 0x20, 0x72, 0xE7, 0x58, 0x20,
+0x70, 0xD9, 0x51, 0xA0, 0x71, 0x10, 0xB0, 0xA0, 0x72, 0xAF, 0xF9, 0x20, 0x72, 0xDE, 0x1D, 0xA0,
 0x74, 0x86, 0xA0, 0xA0, 0x74, 0xB4, 0xC5, 0x20, 0x76, 0x54, 0x0D, 0xA0, 0x76, 0x8B, 0x6C, 0xA0,
 0x78, 0x2A, 0xB5, 0x20, 0x78, 0x58, 0xD9, 0xA0, 0x79, 0xF8, 0x22, 0x20, 0x7A, 0x2F, 0x81, 0x20,
 0x7B, 0xCE, 0xC9, 0xA0, 0x7C, 0x06, 0x28, 0xA0, 0x7D, 0xA5, 0x71, 0x20, 0x7D, 0xD3, 0x95, 0xA0,
@@ -24627,7 +24971,7 @@
 0x00, 0x5E, 0xD3, 0x0F, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x60, 0x72, 0x58, 0x20, 0x00, 0x00, 0x00,
 0x00, 0x60, 0xA0, 0x7C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xC5, 0x20, 0x00, 0x00, 0x00,
 0x00, 0x62, 0x77, 0x24, 0x20, 0x00, 0x00, 0x00, 0x00, 0x64, 0x16, 0x6C, 0xA0, 0x00, 0x00, 0x00,
-0x00, 0x64, 0x4D, 0xCB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x14, 0x20, 0x00, 0x00, 0x00,
+0x00, 0x64, 0x44, 0x91, 0x20, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x14, 0x20, 0x00, 0x00, 0x00,
 0x00, 0x66, 0x1B, 0x38, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x67, 0xBA, 0x81, 0x20, 0x00, 0x00, 0x00,
 0x00, 0x67, 0xF1, 0xE0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x69, 0x91, 0x28, 0xA0, 0x00, 0x00, 0x00,
 0x00, 0x69, 0xBF, 0x4D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x67, 0xD0, 0x20, 0x00, 0x00, 0x00,
@@ -24635,7 +24979,7 @@
 0x00, 0x6D, 0x6C, 0x9C, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x0B, 0xE4, 0xA0, 0x00, 0x00, 0x00,
 0x00, 0x6F, 0x3A, 0x09, 0x20, 0x00, 0x00, 0x00, 0x00, 0x70, 0xD9, 0x51, 0xA0, 0x00, 0x00, 0x00,
 0x00, 0x71, 0x10, 0xB0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x72, 0xAF, 0xF9, 0x20, 0x00, 0x00, 0x00,
-0x00, 0x72, 0xE7, 0x58, 0x20, 0x00, 0x00, 0x00, 0x00, 0x74, 0x86, 0xA0, 0xA0, 0x00, 0x00, 0x00,
+0x00, 0x72, 0xDE, 0x1D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x74, 0x86, 0xA0, 0xA0, 0x00, 0x00, 0x00,
 0x00, 0x74, 0xB4, 0xC5, 0x20, 0x00, 0x00, 0x00, 0x00, 0x76, 0x54, 0x0D, 0xA0, 0x00, 0x00, 0x00,
 0x00, 0x76, 0x8B, 0x6C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x78, 0x2A, 0xB5, 0x20, 0x00, 0x00, 0x00,
 0x00, 0x78, 0x58, 0xD9, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x22, 0x20, 0x00, 0x00, 0x00,
@@ -24643,7 +24987,7 @@
 0x00, 0x7C, 0x06, 0x28, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xA5, 0x71, 0x20, 0x00, 0x00, 0x00,
 0x00, 0x7D, 0xD3, 0x95, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x72, 0xDE, 0x20, 0x00, 0x00, 0x00,
 0x00, 0x7F, 0xAA, 0x3D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x81, 0x49, 0x85, 0xA0, 0x00, 0x00, 0x00,
-0x00, 0x81, 0x80, 0xE4, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x83, 0x20, 0x2D, 0x20, 0x00, 0x00, 0x00,
+0x00, 0x81, 0x77, 0xAA, 0x20, 0x00, 0x00, 0x00, 0x00, 0x83, 0x20, 0x2D, 0x20, 0x00, 0x00, 0x00,
 0x00, 0x83, 0x4E, 0x51, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x84, 0xED, 0x9A, 0x20, 0x00, 0x00, 0x00,
 0x00, 0x85, 0x24, 0xF9, 0x20, 0x00, 0x00, 0x00, 0x00, 0x86, 0xC4, 0x41, 0xA0, 0x00, 0x00, 0x00,
 0x00, 0x86, 0xF2, 0x66, 0x20, 0x00, 0x00, 0x00, 0x00, 0x88, 0x91, 0xAE, 0xA0, 0x00, 0x00, 0x00,
@@ -24651,7 +24995,7 @@
 0x00, 0x8A, 0x9F, 0xB5, 0x20, 0x00, 0x00, 0x00, 0x00, 0x8C, 0x3E, 0xFD, 0xA0, 0x00, 0x00, 0x00,
 0x00, 0x8C, 0x6D, 0x22, 0x20, 0x00, 0x00, 0x00, 0x00, 0x8E, 0x0C, 0x6A, 0xA0, 0x00, 0x00, 0x00,
 0x00, 0x8E, 0x43, 0xC9, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x8F, 0xE3, 0x12, 0x20, 0x00, 0x00, 0x00,
-0x00, 0x90, 0x1A, 0x71, 0x20, 0x00, 0x00, 0x00, 0x00, 0x91, 0xB9, 0xB9, 0xA0, 0x00, 0x00, 0x00,
+0x00, 0x90, 0x11, 0x36, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x91, 0xB9, 0xB9, 0xA0, 0x00, 0x00, 0x00,
 0x00, 0x91, 0xE7, 0xDE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x93, 0x87, 0x26, 0xA0, 0x00, 0x00, 0x00,
 0x00, 0x93, 0xBE, 0x85, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x95, 0x5D, 0xCE, 0x20, 0x00, 0x00, 0x00,
 0x00, 0x95, 0x8B, 0xF2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x97, 0x2B, 0x3B, 0x20, 0x00, 0x00, 0x00,
@@ -24659,7 +25003,7 @@
 0x00, 0x99, 0x39, 0x41, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x9A, 0xD8, 0x8A, 0x20, 0x00, 0x00, 0x00,
 0x00, 0x9B, 0x06, 0xAE, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x9C, 0xA5, 0xF7, 0x20, 0x00, 0x00, 0x00,
 0x00, 0x9C, 0xDD, 0x56, 0x20, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x7C, 0x9E, 0xA0, 0x00, 0x00, 0x00,
-0x00, 0x9E, 0xB3, 0xFD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x53, 0x46, 0x20, 0x00, 0x00, 0x00,
+0x00, 0x9E, 0xAA, 0xC3, 0x20, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x53, 0x46, 0x20, 0x00, 0x00, 0x00,
 0x00, 0xA0, 0x81, 0x6A, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xA2, 0x20, 0xB3, 0x20, 0x00, 0x00, 0x00,
 0x00, 0xA2, 0x58, 0x12, 0x20, 0x00, 0x00, 0x00, 0x00, 0xA3, 0xF7, 0x5A, 0xA0, 0x00, 0x00, 0x00,
 0x00, 0xA4, 0x25, 0x7F, 0x20, 0x00, 0x00, 0x00, 0x00, 0xA5, 0xC4, 0xC7, 0xA0, 0x00, 0x00, 0x00,
@@ -24667,7 +25011,7 @@
 0x00, 0xA7, 0xD2, 0xCE, 0x20, 0x00, 0x00, 0x00, 0x00, 0xA9, 0x72, 0x16, 0xA0, 0x00, 0x00, 0x00,
 0x00, 0xA9, 0xA0, 0x3B, 0x20, 0x00, 0x00, 0x00, 0x00, 0xAB, 0x3F, 0x83, 0xA0, 0x00, 0x00, 0x00,
 0x00, 0xAB, 0x76, 0xE2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xAD, 0x16, 0x2B, 0x20, 0x00, 0x00, 0x00,
-0x00, 0xAD, 0x4D, 0x8A, 0x20, 0x00, 0x00, 0x00, 0x00, 0xAE, 0xEC, 0xD2, 0xA0, 0x00, 0x00, 0x00,
+0x00, 0xAD, 0x44, 0x4F, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xAE, 0xEC, 0xD2, 0xA0, 0x00, 0x00, 0x00,
 0x00, 0xAF, 0x1A, 0xF7, 0x20, 0x00, 0x00, 0x00, 0x00, 0xB0, 0xBA, 0x3F, 0xA0, 0x00, 0x00, 0x00,
 0x00, 0xB0, 0xF1, 0x9E, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xB2, 0x90, 0xE7, 0x20, 0x00, 0x00, 0x00,
 0x00, 0xB2, 0xBF, 0x0B, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xB4, 0x5E, 0x54, 0x20, 0x00, 0x00, 0x00,
@@ -24675,7 +25019,7 @@
 0x00, 0xB6, 0x6C, 0x5A, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xB8, 0x0B, 0xA3, 0x20, 0x00, 0x00, 0x00,
 0x00, 0xB8, 0x39, 0xC7, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xB9, 0xD9, 0x10, 0x20, 0x00, 0x00, 0x00,
 0x00, 0xBA, 0x10, 0x6F, 0x20, 0x00, 0x00, 0x00, 0x00, 0xBB, 0xAF, 0xB7, 0xA0, 0x00, 0x00, 0x00,
-0x00, 0xBB, 0xE7, 0x16, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xBD, 0x86, 0x5F, 0x20, 0x00, 0x00, 0x00,
+0x00, 0xBB, 0xDD, 0xDC, 0x20, 0x00, 0x00, 0x00, 0x00, 0xBD, 0x86, 0x5F, 0x20, 0x00, 0x00, 0x00,
 0x00, 0xBD, 0xB4, 0x83, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xBF, 0x53, 0xCC, 0x20, 0x00, 0x00, 0x00,
 0x00, 0xBF, 0x8B, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x2A, 0x73, 0xA0, 0x00, 0x00, 0x00,
 0x00, 0xC1, 0x58, 0x98, 0x20, 0x00, 0x00, 0x00, 0x00, 0xC2, 0xF7, 0xE0, 0xA0, 0x00, 0x00, 0x00,
@@ -24683,15 +25027,15 @@
 0x00, 0xC5, 0x05, 0xE7, 0x20, 0x00, 0x00, 0x00, 0x00, 0xC6, 0xA5, 0x2F, 0xA0, 0x00, 0x00, 0x00,
 0x00, 0xC6, 0xD3, 0x54, 0x20, 0x00, 0x00, 0x00, 0x00, 0xC8, 0x72, 0x9C, 0xA0, 0x00, 0x00, 0x00,
 0x00, 0xC8, 0xA9, 0xFB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xCA, 0x49, 0x44, 0x20, 0x00, 0x00, 0x00,
-0x00, 0xCA, 0x80, 0xA3, 0x20, 0x00, 0x00, 0x00, 0x00, 0xCC, 0x1F, 0xEB, 0xA0, 0x00, 0x00, 0x00,
+0x00, 0xCA, 0x77, 0x68, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xCC, 0x1F, 0xEB, 0xA0, 0x00, 0x00, 0x00,
 0x00, 0xCC, 0x4E, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00, 0xCD, 0xED, 0x58, 0xA0, 0x00, 0x00, 0x00,
 0x00, 0xCE, 0x24, 0xB7, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xCF, 0xC4, 0x00, 0x20, 0x00, 0x00, 0x00,
 0x00, 0xCF, 0xF2, 0x24, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xD1, 0x91, 0x6D, 0x20, 0x00, 0x00, 0x00,
 0x00, 0xD1, 0xC8, 0xCC, 0x20, 0x00, 0x00, 0x00, 0x00, 0xD3, 0x68, 0x14, 0xA0, 0x00, 0x00, 0x00,
-0x00, 0xD3, 0x9F, 0x73, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xD5, 0x3E, 0xBC, 0x20, 0x00, 0x00, 0x00,
+0x00, 0xD3, 0x96, 0x39, 0x20, 0x00, 0x00, 0x00, 0x00, 0xD5, 0x3E, 0xBC, 0x20, 0x00, 0x00, 0x00,
 0x00, 0xD5, 0x6C, 0xE0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xD7, 0x0C, 0x29, 0x20, 0x00, 0x00, 0x00,
 0x00, 0xD7, 0x43, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0xD8, 0xE2, 0xD0, 0xA0, 0x00, 0x00, 0x00,
-0x00, 0xD9, 0x1A, 0x2F, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xDA, 0xB9, 0x78, 0x20, 0x00, 0x00, 0x00,
+0x00, 0xD9, 0x10, 0xF5, 0x20, 0x00, 0x00, 0x00, 0x00, 0xDA, 0xB9, 0x78, 0x20, 0x00, 0x00, 0x00,
 0x00, 0xDA, 0xE7, 0x9C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xDC, 0x86, 0xE5, 0x20, 0x00, 0x00, 0x00,
 0x00, 0xDC, 0xBE, 0x44, 0x20, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
@@ -24934,11 +25278,11 @@
 0x5A, 0xF7, 0x9C, 0x20, 0x5B, 0x25, 0xC0, 0xA0, 0x5B, 0xD5, 0x18, 0x20, 0x5C, 0xCE, 0x43, 0xA0,
 0x5C, 0xFC, 0x68, 0x20, 0x5E, 0x9B, 0xB0, 0xA0, 0x5E, 0xD3, 0x0F, 0xA0, 0x60, 0x72, 0x58, 0x20,
 0x60, 0xA0, 0x7C, 0xA0, 0x62, 0x3F, 0xC5, 0x20, 0x62, 0x77, 0x24, 0x20, 0x64, 0x16, 0x6C, 0xA0,
-0x64, 0x4D, 0xCB, 0xA0, 0x65, 0xED, 0x14, 0x20, 0x66, 0x1B, 0x38, 0xA0, 0x67, 0xBA, 0x81, 0x20,
+0x64, 0x44, 0x91, 0x20, 0x65, 0xED, 0x14, 0x20, 0x66, 0x1B, 0x38, 0xA0, 0x67, 0xBA, 0x81, 0x20,
 0x67, 0xF1, 0xE0, 0x20, 0x69, 0x91, 0x28, 0xA0, 0x69, 0xBF, 0x4D, 0x20, 0x6B, 0x67, 0xD0, 0x20,
 0x6B, 0x95, 0xF4, 0xA0, 0x6D, 0x35, 0x3D, 0x20, 0x6D, 0x6C, 0x9C, 0x20, 0x6F, 0x0B, 0xE4, 0xA0,
 0x6F, 0x3A, 0x09, 0x20, 0x70, 0xD9, 0x51, 0xA0, 0x71, 0x10, 0xB0, 0xA0, 0x72, 0xAF, 0xF9, 0x20,
-0x72, 0xE7, 0x58, 0x20, 0x74, 0x86, 0xA0, 0xA0, 0x74, 0xB4, 0xC5, 0x20, 0x76, 0x54, 0x0D, 0xA0,
+0x72, 0xDE, 0x1D, 0xA0, 0x74, 0x86, 0xA0, 0xA0, 0x74, 0xB4, 0xC5, 0x20, 0x76, 0x54, 0x0D, 0xA0,
 0x76, 0x8B, 0x6C, 0xA0, 0x78, 0x2A, 0xB5, 0x20, 0x78, 0x58, 0xD9, 0xA0, 0x79, 0xF8, 0x22, 0x20,
 0x7A, 0x2F, 0x81, 0x20, 0x7B, 0xCE, 0xC9, 0xA0, 0x7C, 0x06, 0x28, 0xA0, 0x7D, 0xA5, 0x71, 0x20,
 0x7D, 0xD3, 0x95, 0xA0, 0x7F, 0x72, 0xDE, 0x20, 0x7F, 0xAA, 0x3D, 0x20, 0x01, 0x03, 0x02, 0x03,
@@ -24979,7 +25323,7 @@
 0x00, 0x00, 0x00, 0x00, 0x5E, 0x9B, 0xB0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x5E, 0xD3, 0x0F, 0xA0,
 0x00, 0x00, 0x00, 0x00, 0x60, 0x72, 0x58, 0x20, 0x00, 0x00, 0x00, 0x00, 0x60, 0xA0, 0x7C, 0xA0,
 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xC5, 0x20, 0x00, 0x00, 0x00, 0x00, 0x62, 0x77, 0x24, 0x20,
-0x00, 0x00, 0x00, 0x00, 0x64, 0x16, 0x6C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x64, 0x4D, 0xCB, 0xA0,
+0x00, 0x00, 0x00, 0x00, 0x64, 0x16, 0x6C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x64, 0x44, 0x91, 0x20,
 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x14, 0x20, 0x00, 0x00, 0x00, 0x00, 0x66, 0x1B, 0x38, 0xA0,
 0x00, 0x00, 0x00, 0x00, 0x67, 0xBA, 0x81, 0x20, 0x00, 0x00, 0x00, 0x00, 0x67, 0xF1, 0xE0, 0x20,
 0x00, 0x00, 0x00, 0x00, 0x69, 0x91, 0x28, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x69, 0xBF, 0x4D, 0x20,
@@ -24987,7 +25331,7 @@
 0x00, 0x00, 0x00, 0x00, 0x6D, 0x35, 0x3D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x6C, 0x9C, 0x20,
 0x00, 0x00, 0x00, 0x00, 0x6F, 0x0B, 0xE4, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x3A, 0x09, 0x20,
 0x00, 0x00, 0x00, 0x00, 0x70, 0xD9, 0x51, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x71, 0x10, 0xB0, 0xA0,
-0x00, 0x00, 0x00, 0x00, 0x72, 0xAF, 0xF9, 0x20, 0x00, 0x00, 0x00, 0x00, 0x72, 0xE7, 0x58, 0x20,
+0x00, 0x00, 0x00, 0x00, 0x72, 0xAF, 0xF9, 0x20, 0x00, 0x00, 0x00, 0x00, 0x72, 0xDE, 0x1D, 0xA0,
 0x00, 0x00, 0x00, 0x00, 0x74, 0x86, 0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x74, 0xB4, 0xC5, 0x20,
 0x00, 0x00, 0x00, 0x00, 0x76, 0x54, 0x0D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x76, 0x8B, 0x6C, 0xA0,
 0x00, 0x00, 0x00, 0x00, 0x78, 0x2A, 0xB5, 0x20, 0x00, 0x00, 0x00, 0x00, 0x78, 0x58, 0xD9, 0xA0,
@@ -24995,7 +25339,7 @@
 0x00, 0x00, 0x00, 0x00, 0x7B, 0xCE, 0xC9, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x06, 0x28, 0xA0,
 0x00, 0x00, 0x00, 0x00, 0x7D, 0xA5, 0x71, 0x20, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xD3, 0x95, 0xA0,
 0x00, 0x00, 0x00, 0x00, 0x7F, 0x72, 0xDE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x7F, 0xAA, 0x3D, 0x20,
-0x00, 0x00, 0x00, 0x00, 0x81, 0x49, 0x85, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x81, 0x80, 0xE4, 0xA0,
+0x00, 0x00, 0x00, 0x00, 0x81, 0x49, 0x85, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x81, 0x77, 0xAA, 0x20,
 0x00, 0x00, 0x00, 0x00, 0x83, 0x20, 0x2D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x83, 0x4E, 0x51, 0xA0,
 0x00, 0x00, 0x00, 0x00, 0x84, 0xED, 0x9A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x85, 0x24, 0xF9, 0x20,
 0x00, 0x00, 0x00, 0x00, 0x86, 0xC4, 0x41, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x86, 0xF2, 0x66, 0x20,
@@ -25003,7 +25347,7 @@
 0x00, 0x00, 0x00, 0x00, 0x8A, 0x68, 0x56, 0x20, 0x00, 0x00, 0x00, 0x00, 0x8A, 0x9F, 0xB5, 0x20,
 0x00, 0x00, 0x00, 0x00, 0x8C, 0x3E, 0xFD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x8C, 0x6D, 0x22, 0x20,
 0x00, 0x00, 0x00, 0x00, 0x8E, 0x0C, 0x6A, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x8E, 0x43, 0xC9, 0xA0,
-0x00, 0x00, 0x00, 0x00, 0x8F, 0xE3, 0x12, 0x20, 0x00, 0x00, 0x00, 0x00, 0x90, 0x1A, 0x71, 0x20,
+0x00, 0x00, 0x00, 0x00, 0x8F, 0xE3, 0x12, 0x20, 0x00, 0x00, 0x00, 0x00, 0x90, 0x11, 0x36, 0xA0,
 0x00, 0x00, 0x00, 0x00, 0x91, 0xB9, 0xB9, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x91, 0xE7, 0xDE, 0x20,
 0x00, 0x00, 0x00, 0x00, 0x93, 0x87, 0x26, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x93, 0xBE, 0x85, 0xA0,
 0x00, 0x00, 0x00, 0x00, 0x95, 0x5D, 0xCE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x95, 0x8B, 0xF2, 0xA0,
@@ -25011,7 +25355,7 @@
 0x00, 0x00, 0x00, 0x00, 0x99, 0x01, 0xE2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x99, 0x39, 0x41, 0xA0,
 0x00, 0x00, 0x00, 0x00, 0x9A, 0xD8, 0x8A, 0x20, 0x00, 0x00, 0x00, 0x00, 0x9B, 0x06, 0xAE, 0xA0,
 0x00, 0x00, 0x00, 0x00, 0x9C, 0xA5, 0xF7, 0x20, 0x00, 0x00, 0x00, 0x00, 0x9C, 0xDD, 0x56, 0x20,
-0x00, 0x00, 0x00, 0x00, 0x9E, 0x7C, 0x9E, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x9E, 0xB3, 0xFD, 0xA0,
+0x00, 0x00, 0x00, 0x00, 0x9E, 0x7C, 0x9E, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x9E, 0xAA, 0xC3, 0x20,
 0x00, 0x00, 0x00, 0x00, 0xA0, 0x53, 0x46, 0x20, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x81, 0x6A, 0xA0,
 0x00, 0x00, 0x00, 0x00, 0xA2, 0x20, 0xB3, 0x20, 0x00, 0x00, 0x00, 0x00, 0xA2, 0x58, 0x12, 0x20,
 0x00, 0x00, 0x00, 0x00, 0xA3, 0xF7, 0x5A, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xA4, 0x25, 0x7F, 0x20,
@@ -25019,7 +25363,7 @@
 0x00, 0x00, 0x00, 0x00, 0xA7, 0x9B, 0x6F, 0x20, 0x00, 0x00, 0x00, 0x00, 0xA7, 0xD2, 0xCE, 0x20,
 0x00, 0x00, 0x00, 0x00, 0xA9, 0x72, 0x16, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xA9, 0xA0, 0x3B, 0x20,
 0x00, 0x00, 0x00, 0x00, 0xAB, 0x3F, 0x83, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xAB, 0x76, 0xE2, 0xA0,
-0x00, 0x00, 0x00, 0x00, 0xAD, 0x16, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0xAD, 0x4D, 0x8A, 0x20,
+0x00, 0x00, 0x00, 0x00, 0xAD, 0x16, 0x2B, 0x20, 0x00, 0x00, 0x00, 0x00, 0xAD, 0x44, 0x4F, 0xA0,
 0x00, 0x00, 0x00, 0x00, 0xAE, 0xEC, 0xD2, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xAF, 0x1A, 0xF7, 0x20,
 0x00, 0x00, 0x00, 0x00, 0xB0, 0xBA, 0x3F, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xB0, 0xF1, 0x9E, 0xA0,
 0x00, 0x00, 0x00, 0x00, 0xB2, 0x90, 0xE7, 0x20, 0x00, 0x00, 0x00, 0x00, 0xB2, 0xBF, 0x0B, 0xA0,
@@ -25027,7 +25371,7 @@
 0x00, 0x00, 0x00, 0x00, 0xB6, 0x34, 0xFB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xB6, 0x6C, 0x5A, 0xA0,
 0x00, 0x00, 0x00, 0x00, 0xB8, 0x0B, 0xA3, 0x20, 0x00, 0x00, 0x00, 0x00, 0xB8, 0x39, 0xC7, 0xA0,
 0x00, 0x00, 0x00, 0x00, 0xB9, 0xD9, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00, 0xBA, 0x10, 0x6F, 0x20,
-0x00, 0x00, 0x00, 0x00, 0xBB, 0xAF, 0xB7, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xBB, 0xE7, 0x16, 0xA0,
+0x00, 0x00, 0x00, 0x00, 0xBB, 0xAF, 0xB7, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xBB, 0xDD, 0xDC, 0x20,
 0x00, 0x00, 0x00, 0x00, 0xBD, 0x86, 0x5F, 0x20, 0x00, 0x00, 0x00, 0x00, 0xBD, 0xB4, 0x83, 0xA0,
 0x00, 0x00, 0x00, 0x00, 0xBF, 0x53, 0xCC, 0x20, 0x00, 0x00, 0x00, 0x00, 0xBF, 0x8B, 0x2B, 0x20,
 0x00, 0x00, 0x00, 0x00, 0xC1, 0x2A, 0x73, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x58, 0x98, 0x20,
@@ -25035,15 +25379,15 @@
 0x00, 0x00, 0x00, 0x00, 0xC4, 0xCE, 0x88, 0x20, 0x00, 0x00, 0x00, 0x00, 0xC5, 0x05, 0xE7, 0x20,
 0x00, 0x00, 0x00, 0x00, 0xC6, 0xA5, 0x2F, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xC6, 0xD3, 0x54, 0x20,
 0x00, 0x00, 0x00, 0x00, 0xC8, 0x72, 0x9C, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xC8, 0xA9, 0xFB, 0xA0,
-0x00, 0x00, 0x00, 0x00, 0xCA, 0x49, 0x44, 0x20, 0x00, 0x00, 0x00, 0x00, 0xCA, 0x80, 0xA3, 0x20,
+0x00, 0x00, 0x00, 0x00, 0xCA, 0x49, 0x44, 0x20, 0x00, 0x00, 0x00, 0x00, 0xCA, 0x77, 0x68, 0xA0,
 0x00, 0x00, 0x00, 0x00, 0xCC, 0x1F, 0xEB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xCC, 0x4E, 0x10, 0x20,
 0x00, 0x00, 0x00, 0x00, 0xCD, 0xED, 0x58, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xCE, 0x24, 0xB7, 0xA0,
 0x00, 0x00, 0x00, 0x00, 0xCF, 0xC4, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0xCF, 0xF2, 0x24, 0xA0,
 0x00, 0x00, 0x00, 0x00, 0xD1, 0x91, 0x6D, 0x20, 0x00, 0x00, 0x00, 0x00, 0xD1, 0xC8, 0xCC, 0x20,
-0x00, 0x00, 0x00, 0x00, 0xD3, 0x68, 0x14, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xD3, 0x9F, 0x73, 0xA0,
+0x00, 0x00, 0x00, 0x00, 0xD3, 0x68, 0x14, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xD3, 0x96, 0x39, 0x20,
 0x00, 0x00, 0x00, 0x00, 0xD5, 0x3E, 0xBC, 0x20, 0x00, 0x00, 0x00, 0x00, 0xD5, 0x6C, 0xE0, 0xA0,
 0x00, 0x00, 0x00, 0x00, 0xD7, 0x0C, 0x29, 0x20, 0x00, 0x00, 0x00, 0x00, 0xD7, 0x43, 0x88, 0x20,
-0x00, 0x00, 0x00, 0x00, 0xD8, 0xE2, 0xD0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xD9, 0x1A, 0x2F, 0xA0,
+0x00, 0x00, 0x00, 0x00, 0xD8, 0xE2, 0xD0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0xD9, 0x10, 0xF5, 0x20,
 0x00, 0x00, 0x00, 0x00, 0xDA, 0xB9, 0x78, 0x20, 0x00, 0x00, 0x00, 0x00, 0xDA, 0xE7, 0x9C, 0xA0,
 0x00, 0x00, 0x00, 0x00, 0xDC, 0x86, 0xE5, 0x20, 0x00, 0x00, 0x00, 0x00, 0xDC, 0xBE, 0x44, 0x20,
 0x01, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
@@ -25889,9 +26233,9 @@
 0x53, 0x54, 0x00, 0x48, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x48, 0x53, 0x54, 0x31,
 0x30, 0x48, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E,
-0x31, 0x2E, 0x30, 0x0A, 0x00, 0xD8, 0x7D, 0xE0, 0x00, 0x05, 0x19, 0x72, 0x00, 0x00, 0x00, 0x10,
-0x41, 0x6C, 0x65, 0x75, 0x74, 0x69, 0x61, 0x6E, 0x20, 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64, 0x73,
-
+0x31, 0x2E, 0x30, 0x0A, 0x00, 0xD8, 0x7D, 0xE0, 0x00, 0x05, 0x19, 0x72, 0x00, 0x00, 0x00, 0x1A,
+0x41, 0x6C, 0x61, 0x73, 0x6B, 0x61, 0x20, 0x2D, 0x20, 0x77, 0x65, 0x73, 0x74, 0x65, 0x72, 0x6E,
+0x20, 0x41, 0x6C, 0x65, 0x75, 0x74, 0x69, 0x61, 0x6E, 0x73, 
 
 /* America/Anchorage */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x55, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -27515,9 +27859,8 @@
 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44,
 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x43, 0x53, 0x54, 0x36, 0x0A,
-0x00, 0xA9, 0x11, 0x40, 0x00, 0x72, 0x0F, 0x38, 0x00, 0x00, 0x00, 0x20, 0x43, 0x65, 0x6E, 0x74,
-0x72, 0x61, 0x6C, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x42, 0x61, 0x68, 0x69, 0x61,
-0x20, 0x64, 0x65, 0x20, 0x42, 0x61, 0x6E, 0x64, 0x65, 0x72, 0x61, 0x73, 
+0x00, 0xA9, 0x11, 0x40, 0x00, 0x72, 0x0F, 0x38, 0x00, 0x00, 0x00, 0x11, 0x42, 0x61, 0x68, 0x69,
+0x61, 0x20, 0x64, 0x65, 0x20, 0x42, 0x61, 0x6E, 0x64, 0x65, 0x72, 0x61, 0x73, 
 
 /* America/Barbados */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -27764,7 +28107,7 @@
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x4F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0x80, 0x00, 0x00, 0x00,
-0x98, 0x58, 0x55, 0x70, 0x2A, 0x03, 0x73, 0x50, 0x2B, 0xBE, 0x5D, 0x40, 0x01, 0x03, 0x02, 0x03,
+0x98, 0x58, 0x55, 0x70, 0x2A, 0x03, 0x73, 0x50, 0x2B, 0x74, 0x89, 0x40, 0x01, 0x03, 0x02, 0x03,
 0xFF, 0xFF, 0xBA, 0x90, 0x00, 0x00, 0xFF, 0xFF, 0xBA, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0,
 0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x42, 0x4D, 0x54, 0x00,
 0x2D, 0x30, 0x34, 0x00, 0x2D, 0x30, 0x35, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00,
@@ -27772,7 +28115,7 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04,
 0x00, 0x00, 0x00, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x5E, 0x9C, 0x34, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
 0x98, 0x58, 0x55, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x03, 0x73, 0x50, 0x00, 0x00, 0x00, 0x00,
-0x2B, 0xBE, 0x5D, 0x40, 0x01, 0x03, 0x02, 0x03, 0xFF, 0xFF, 0xBA, 0x90, 0x00, 0x00, 0xFF, 0xFF,
+0x2B, 0x74, 0x89, 0x40, 0x01, 0x03, 0x02, 0x03, 0xFF, 0xFF, 0xBA, 0x90, 0x00, 0x00, 0xFF, 0xFF,
 0xBA, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C,
 0x4C, 0x4D, 0x54, 0x00, 0x42, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x34, 0x00, 0x2D, 0x30, 0x35, 0x00,
 0x0A, 0x3C, 0x2D, 0x30, 0x35, 0x3E, 0x35, 0x0A, 0x00, 0x90, 0x59, 0x20, 0x00, 0xA1, 0x9D, 0xB2,
@@ -28006,138 +28349,148 @@
 
 /* America/Cambridge_Bay */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x7B, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x25, 0xA1, 0xF2, 0xCD, 0x80,
-0xCB, 0x89, 0x0C, 0x90, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x61, 0x18, 0x00, 0xF7, 0x2F, 0x5A, 0x70,
-0xF8, 0x28, 0x85, 0xF0, 0x13, 0x69, 0x64, 0x10, 0x14, 0x59, 0x47, 0x00, 0x15, 0x49, 0x46, 0x10,
-0x16, 0x39, 0x29, 0x00, 0x17, 0x29, 0x28, 0x10, 0x18, 0x22, 0x45, 0x80, 0x19, 0x09, 0x0A, 0x10,
-0x1A, 0x02, 0x27, 0x80, 0x1A, 0xF2, 0x26, 0x90, 0x1B, 0xE2, 0x09, 0x80, 0x1C, 0xD2, 0x08, 0x90,
-0x1D, 0xC1, 0xEB, 0x80, 0x1E, 0xB1, 0xEA, 0x90, 0x1F, 0xA1, 0xCD, 0x80, 0x20, 0x76, 0x1D, 0x10,
-0x21, 0x81, 0xAF, 0x80, 0x22, 0x55, 0xFF, 0x10, 0x23, 0x6A, 0xCC, 0x00, 0x24, 0x35, 0xE1, 0x10,
-0x25, 0x4A, 0xAE, 0x00, 0x26, 0x15, 0xC3, 0x10, 0x27, 0x2A, 0x90, 0x00, 0x27, 0xFE, 0xDF, 0x90,
-0x29, 0x0A, 0x72, 0x00, 0x29, 0xDE, 0xC1, 0x90, 0x2A, 0xEA, 0x54, 0x00, 0x2B, 0xBE, 0xA3, 0x90,
-0x2C, 0xD3, 0x70, 0x80, 0x2D, 0x9E, 0x85, 0x90, 0x2E, 0xB3, 0x52, 0x80, 0x2F, 0x7E, 0x67, 0x90,
-0x30, 0x93, 0x34, 0x80, 0x31, 0x67, 0x84, 0x10, 0x32, 0x73, 0x16, 0x80, 0x33, 0x47, 0x66, 0x10,
-0x34, 0x52, 0xF8, 0x80, 0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80, 0x37, 0x07, 0x2A, 0x10,
-0x38, 0x1B, 0xF7, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x3A, 0x04, 0xE9, 0x50,
-0x3A, 0xC6, 0xEE, 0x10, 0x3B, 0xDB, 0xBB, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x3D, 0xBB, 0x9D, 0x00,
-0x3E, 0x8F, 0xEC, 0x90, 0x3F, 0x9B, 0x7F, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x41, 0x84, 0x9B, 0x80,
-0x42, 0x4F, 0xB0, 0x90, 0x43, 0x64, 0x7D, 0x80, 0x44, 0x2F, 0x92, 0x90, 0x45, 0x44, 0x5F, 0x80,
-0x45, 0xF3, 0xC5, 0x10, 0x47, 0x2D, 0x7C, 0x00, 0x47, 0xD3, 0xA7, 0x10, 0x49, 0x0D, 0x5E, 0x00,
-0x49, 0xB3, 0x89, 0x10, 0x4A, 0xED, 0x40, 0x00, 0x4B, 0x9C, 0xA5, 0x90, 0x4C, 0xD6, 0x5C, 0x80,
-0x4D, 0x7C, 0x87, 0x90, 0x4E, 0xB6, 0x3E, 0x80, 0x4F, 0x5C, 0x69, 0x90, 0x50, 0x96, 0x20, 0x80,
-0x51, 0x3C, 0x4B, 0x90, 0x52, 0x76, 0x02, 0x80, 0x53, 0x1C, 0x2D, 0x90, 0x54, 0x55, 0xE4, 0x80,
-0x54, 0xFC, 0x0F, 0x90, 0x56, 0x35, 0xC6, 0x80, 0x56, 0xE5, 0x2C, 0x10, 0x58, 0x1E, 0xE3, 0x00,
-0x58, 0xC5, 0x0E, 0x10, 0x59, 0xFE, 0xC5, 0x00, 0x5A, 0xA4, 0xF0, 0x10, 0x5B, 0xDE, 0xA7, 0x00,
-0x5C, 0x84, 0xD2, 0x10, 0x5D, 0xBE, 0x89, 0x00, 0x5E, 0x64, 0xB4, 0x10, 0x5F, 0x9E, 0x6B, 0x00,
-0x60, 0x4D, 0xD0, 0x90, 0x61, 0x87, 0x87, 0x80, 0x62, 0x2D, 0xB2, 0x90, 0x63, 0x67, 0x69, 0x80,
-0x64, 0x0D, 0x94, 0x90, 0x65, 0x47, 0x4B, 0x80, 0x65, 0xED, 0x76, 0x90, 0x67, 0x27, 0x2D, 0x80,
-0x67, 0xCD, 0x58, 0x90, 0x69, 0x07, 0x0F, 0x80, 0x69, 0xAD, 0x3A, 0x90, 0x6A, 0xE6, 0xF1, 0x80,
-0x6B, 0x96, 0x57, 0x10, 0x6C, 0xD0, 0x0E, 0x00, 0x6D, 0x76, 0x39, 0x10, 0x6E, 0xAF, 0xF0, 0x00,
-0x6F, 0x56, 0x1B, 0x10, 0x70, 0x8F, 0xD2, 0x00, 0x71, 0x35, 0xFD, 0x10, 0x72, 0x6F, 0xB4, 0x00,
-0x73, 0x15, 0xDF, 0x10, 0x74, 0x4F, 0x96, 0x00, 0x74, 0xFE, 0xFB, 0x90, 0x76, 0x38, 0xB2, 0x80,
-0x76, 0xDE, 0xDD, 0x90, 0x78, 0x18, 0x94, 0x80, 0x78, 0xBE, 0xBF, 0x90, 0x79, 0xF8, 0x76, 0x80,
-0x7A, 0x9E, 0xA1, 0x90, 0x7B, 0xD8, 0x58, 0x80, 0x7C, 0x7E, 0x83, 0x90, 0x7D, 0xB8, 0x3A, 0x80,
-0x7E, 0x5E, 0x65, 0x90, 0x7F, 0x98, 0x1C, 0x80, 0x03, 0x01, 0x02, 0x03, 0x04, 0x03, 0x05, 0x03,
-0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03,
-0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03,
-0x05, 0x03, 0x05, 0x03, 0x05, 0x07, 0x06, 0x08, 0x07, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05,
-0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05,
-0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05,
-0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05,
-0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05,
-0x03, 0x05, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x04, 0xFF,
-0xFF, 0xAB, 0xA0, 0x01, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x01,
-0x10, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x15, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x19, 0xFF, 0xFF, 0xAB,
-0xA0, 0x00, 0x1D, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x21, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x15, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x89, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x20, 0xA1, 0xF2, 0xCD, 0x80,
+0xCB, 0x89, 0x0C, 0x90, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x61, 0x18, 0x00, 0x04, 0x61, 0x19, 0x90,
+0x05, 0x50, 0xFC, 0x80, 0x06, 0x40, 0xFB, 0x90, 0x07, 0x30, 0xDE, 0x80, 0x08, 0x20, 0xDD, 0x90,
+0x09, 0x10, 0xC0, 0x80, 0x0A, 0x00, 0xBF, 0x90, 0x0A, 0xF0, 0xA2, 0x80, 0x0B, 0xE0, 0xA1, 0x90,
+0x0C, 0xD9, 0xBF, 0x00, 0x0D, 0xC0, 0x83, 0x90, 0x0E, 0xB9, 0xA1, 0x00, 0x0F, 0xA9, 0xA0, 0x10,
+0x10, 0x99, 0x83, 0x00, 0x11, 0x89, 0x82, 0x10, 0x12, 0x79, 0x65, 0x00, 0x13, 0x69, 0x64, 0x10,
+0x14, 0x59, 0x47, 0x00, 0x15, 0x49, 0x46, 0x10, 0x16, 0x39, 0x29, 0x00, 0x17, 0x29, 0x28, 0x10,
+0x18, 0x22, 0x45, 0x80, 0x19, 0x09, 0x0A, 0x10, 0x1A, 0x02, 0x27, 0x80, 0x1A, 0xF2, 0x26, 0x90,
+0x1B, 0xE2, 0x09, 0x80, 0x1C, 0xD2, 0x08, 0x90, 0x1D, 0xC1, 0xEB, 0x80, 0x1E, 0xB1, 0xEA, 0x90,
+0x1F, 0xA1, 0xCD, 0x80, 0x20, 0x76, 0x1D, 0x10, 0x21, 0x81, 0xAF, 0x80, 0x22, 0x55, 0xFF, 0x10,
+0x23, 0x6A, 0xCC, 0x00, 0x24, 0x35, 0xE1, 0x10, 0x25, 0x4A, 0xAE, 0x00, 0x26, 0x15, 0xC3, 0x10,
+0x27, 0x2A, 0x90, 0x00, 0x27, 0xFE, 0xDF, 0x90, 0x29, 0x0A, 0x72, 0x00, 0x29, 0xDE, 0xC1, 0x90,
+0x2A, 0xEA, 0x54, 0x00, 0x2B, 0xBE, 0xA3, 0x90, 0x2C, 0xD3, 0x70, 0x80, 0x2D, 0x9E, 0x85, 0x90,
+0x2E, 0xB3, 0x52, 0x80, 0x2F, 0x7E, 0x67, 0x90, 0x30, 0x93, 0x34, 0x80, 0x31, 0x67, 0x84, 0x10,
+0x32, 0x73, 0x16, 0x80, 0x33, 0x47, 0x66, 0x10, 0x34, 0x52, 0xF8, 0x80, 0x35, 0x27, 0x48, 0x10,
+0x36, 0x32, 0xDA, 0x80, 0x37, 0x07, 0x2A, 0x10, 0x38, 0x1B, 0xF7, 0x00, 0x38, 0xE6, 0xFE, 0x00,
+0x39, 0xFB, 0xCA, 0xF0, 0x3A, 0x04, 0xE9, 0x50, 0x3A, 0xC6, 0xEE, 0x10, 0x3B, 0xDB, 0xBB, 0x00,
+0x3C, 0xB0, 0x0A, 0x90, 0x3D, 0xBB, 0x9D, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x3F, 0x9B, 0x7F, 0x00,
+0x40, 0x6F, 0xCE, 0x90, 0x41, 0x84, 0x9B, 0x80, 0x42, 0x4F, 0xB0, 0x90, 0x43, 0x64, 0x7D, 0x80,
+0x44, 0x2F, 0x92, 0x90, 0x45, 0x44, 0x5F, 0x80, 0x45, 0xF3, 0xC5, 0x10, 0x47, 0x2D, 0x7C, 0x00,
+0x47, 0xD3, 0xA7, 0x10, 0x49, 0x0D, 0x5E, 0x00, 0x49, 0xB3, 0x89, 0x10, 0x4A, 0xED, 0x40, 0x00,
+0x4B, 0x9C, 0xA5, 0x90, 0x4C, 0xD6, 0x5C, 0x80, 0x4D, 0x7C, 0x87, 0x90, 0x4E, 0xB6, 0x3E, 0x80,
+0x4F, 0x5C, 0x69, 0x90, 0x50, 0x96, 0x20, 0x80, 0x51, 0x3C, 0x4B, 0x90, 0x52, 0x76, 0x02, 0x80,
+0x53, 0x1C, 0x2D, 0x90, 0x54, 0x55, 0xE4, 0x80, 0x54, 0xFC, 0x0F, 0x90, 0x56, 0x35, 0xC6, 0x80,
+0x56, 0xE5, 0x2C, 0x10, 0x58, 0x1E, 0xE3, 0x00, 0x58, 0xC5, 0x0E, 0x10, 0x59, 0xFE, 0xC5, 0x00,
+0x5A, 0xA4, 0xF0, 0x10, 0x5B, 0xDE, 0xA7, 0x00, 0x5C, 0x84, 0xD2, 0x10, 0x5D, 0xBE, 0x89, 0x00,
+0x5E, 0x64, 0xB4, 0x10, 0x5F, 0x9E, 0x6B, 0x00, 0x60, 0x4D, 0xD0, 0x90, 0x61, 0x87, 0x87, 0x80,
+0x62, 0x2D, 0xB2, 0x90, 0x63, 0x67, 0x69, 0x80, 0x64, 0x0D, 0x94, 0x90, 0x65, 0x47, 0x4B, 0x80,
+0x65, 0xED, 0x76, 0x90, 0x67, 0x27, 0x2D, 0x80, 0x67, 0xCD, 0x58, 0x90, 0x69, 0x07, 0x0F, 0x80,
+0x69, 0xAD, 0x3A, 0x90, 0x6A, 0xE6, 0xF1, 0x80, 0x6B, 0x96, 0x57, 0x10, 0x6C, 0xD0, 0x0E, 0x00,
+0x6D, 0x76, 0x39, 0x10, 0x6E, 0xAF, 0xF0, 0x00, 0x6F, 0x56, 0x1B, 0x10, 0x70, 0x8F, 0xD2, 0x00,
+0x71, 0x35, 0xFD, 0x10, 0x72, 0x6F, 0xB4, 0x00, 0x73, 0x15, 0xDF, 0x10, 0x74, 0x4F, 0x96, 0x00,
+0x74, 0xFE, 0xFB, 0x90, 0x76, 0x38, 0xB2, 0x80, 0x76, 0xDE, 0xDD, 0x90, 0x78, 0x18, 0x94, 0x80,
+0x78, 0xBE, 0xBF, 0x90, 0x79, 0xF8, 0x76, 0x80, 0x7A, 0x9E, 0xA1, 0x90, 0x7B, 0xD8, 0x58, 0x80,
+0x7C, 0x7E, 0x83, 0x90, 0x7D, 0xB8, 0x3A, 0x80, 0x7E, 0x5E, 0x65, 0x90, 0x7F, 0x98, 0x1C, 0x80,
+0x03, 0x01, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x06, 0x05, 0x07, 0x06, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
+0xFF, 0xAB, 0xA0, 0x01, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00,
+0x0C, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x10, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x14, 0xFF, 0xFF, 0xAB,
+0xA0, 0x00, 0x18, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x1C, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x10, 0xFF,
 0xFF, 0x9D, 0x90, 0x00, 0x0C, 0x2D, 0x30, 0x30, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x4D, 0x50, 0x54,
-0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x44, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x43, 0x44,
-0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x7B, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x25, 0xFF, 0xFF, 0xFF, 0xFF,
-0xA1, 0xF2, 0xCD, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x89, 0x0C, 0x90, 0xFF, 0xFF, 0xFF, 0xFF,
-0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61, 0x18, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
-0xF7, 0x2F, 0x5A, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0x85, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x13, 0x69, 0x64, 0x10, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x15, 0x49, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x17, 0x29, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x45, 0x80, 0x00, 0x00, 0x00, 0x00,
-0x19, 0x09, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x27, 0x80, 0x00, 0x00, 0x00, 0x00,
-0x1A, 0xF2, 0x26, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00,
-0x1C, 0xD2, 0x08, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xEB, 0x80, 0x00, 0x00, 0x00, 0x00,
-0x1E, 0xB1, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xCD, 0x80, 0x00, 0x00, 0x00, 0x00,
-0x20, 0x76, 0x1D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xAF, 0x80, 0x00, 0x00, 0x00, 0x00,
-0x22, 0x55, 0xFF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xCC, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x24, 0x35, 0xE1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xAE, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x26, 0x15, 0xC3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x27, 0xFE, 0xDF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x29, 0xDE, 0xC1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x2B, 0xBE, 0xA3, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00,
-0x2D, 0x9E, 0x85, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x52, 0x80, 0x00, 0x00, 0x00, 0x00,
-0x2F, 0x7E, 0x67, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x34, 0x80, 0x00, 0x00, 0x00, 0x00,
-0x31, 0x67, 0x84, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00,
-0x33, 0x47, 0x66, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00,
-0x35, 0x27, 0x48, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00, 0x00, 0x00, 0x00,
-0x37, 0x07, 0x2A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x38, 0xE6, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x3A, 0x04, 0xE9, 0x50, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xEE, 0x10, 0x00, 0x00, 0x00, 0x00,
-0x3B, 0xDB, 0xBB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x00, 0x00, 0x00, 0x00,
-0x3D, 0xBB, 0x9D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x00, 0x00, 0x00, 0x00,
-0x3F, 0x9B, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x00, 0x00, 0x00, 0x00,
-0x41, 0x84, 0x9B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0, 0x90, 0x00, 0x00, 0x00, 0x00,
-0x43, 0x64, 0x7D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x92, 0x90, 0x00, 0x00, 0x00, 0x00,
-0x45, 0x44, 0x5F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xC5, 0x10, 0x00, 0x00, 0x00, 0x00,
-0x47, 0x2D, 0x7C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0xD3, 0xA7, 0x10, 0x00, 0x00, 0x00, 0x00,
-0x49, 0x0D, 0x5E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0xB3, 0x89, 0x10, 0x00, 0x00, 0x00, 0x00,
-0x4A, 0xED, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0xA5, 0x90, 0x00, 0x00, 0x00, 0x00,
-0x4C, 0xD6, 0x5C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x87, 0x90, 0x00, 0x00, 0x00, 0x00,
-0x4E, 0xB6, 0x3E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x69, 0x90, 0x00, 0x00, 0x00, 0x00,
-0x50, 0x96, 0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x4B, 0x90, 0x00, 0x00, 0x00, 0x00,
-0x52, 0x76, 0x02, 0x80, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x2D, 0x90, 0x00, 0x00, 0x00, 0x00,
-0x54, 0x55, 0xE4, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFC, 0x0F, 0x90, 0x00, 0x00, 0x00, 0x00,
-0x56, 0x35, 0xC6, 0x80, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x2C, 0x10, 0x00, 0x00, 0x00, 0x00,
-0x58, 0x1E, 0xE3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC5, 0x0E, 0x10, 0x00, 0x00, 0x00, 0x00,
-0x59, 0xFE, 0xC5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xF0, 0x10, 0x00, 0x00, 0x00, 0x00,
-0x5B, 0xDE, 0xA7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xD2, 0x10, 0x00, 0x00, 0x00, 0x00,
-0x5D, 0xBE, 0x89, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00,
-0x5F, 0x9E, 0x6B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xD0, 0x90, 0x00, 0x00, 0x00, 0x00,
-0x61, 0x87, 0x87, 0x80, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0xB2, 0x90, 0x00, 0x00, 0x00, 0x00,
-0x63, 0x67, 0x69, 0x80, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00,
-0x65, 0x47, 0x4B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00,
-0x67, 0x27, 0x2D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00,
-0x69, 0x07, 0x0F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00,
-0x6A, 0xE6, 0xF1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x57, 0x10, 0x00, 0x00, 0x00, 0x00,
-0x6C, 0xD0, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00,
-0x6E, 0xAF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x56, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00,
-0x70, 0x8F, 0xD2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x71, 0x35, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00,
-0x72, 0x6F, 0xB4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00,
-0x74, 0x4F, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFE, 0xFB, 0x90, 0x00, 0x00, 0x00, 0x00,
-0x76, 0x38, 0xB2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xDD, 0x90, 0x00, 0x00, 0x00, 0x00,
-0x78, 0x18, 0x94, 0x80, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00,
-0x79, 0xF8, 0x76, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00,
-0x7B, 0xD8, 0x58, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00,
-0x7D, 0xB8, 0x3A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00,
-0x7F, 0x98, 0x1C, 0x80, 0x03, 0x01, 0x02, 0x03, 0x04, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03,
-0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03,
-0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03,
-0x05, 0x07, 0x06, 0x08, 0x07, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05,
-0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05,
-0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05,
-0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05,
-0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x01,
-0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x10, 0xFF, 0xFF, 0xAB,
-0xA0, 0x01, 0x15, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x19, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x1D, 0xFF,
-0xFF, 0xB9, 0xB0, 0x00, 0x21, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x15, 0xFF, 0xFF, 0x9D, 0x90, 0x00,
-0x0C, 0x2D, 0x30, 0x30, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x4D, 0x50, 0x54, 0x00, 0x4D, 0x53, 0x54,
-0x00, 0x4D, 0x44, 0x44, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53,
-0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x4D, 0x53, 0x54,
-0x37, 0x4D, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E,
-0x31, 0x2E, 0x30, 0x0A, 0x00, 0xF2, 0xC9, 0xDC, 0x00, 0x72, 0x5C, 0x42, 0x00, 0x00, 0x00, 0x14,
-0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69, 0x6E, 0x20, 0x2D, 0x20, 0x4E, 0x55, 0x20, 0x28, 0x77,
-0x65, 0x73, 0x74, 0x29, 
+0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54,
+0x00, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x00, 0x00, 0x00,
+0x0A, 0x00, 0x00, 0x00, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0xF2, 0xCD, 0x80, 0xFF, 0xFF, 0xFF,
+0xFF, 0xCB, 0x89, 0x0C, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF,
+0xFF, 0xD2, 0x61, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x61, 0x19, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x05, 0x50, 0xFC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xFB, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x07, 0x30, 0xDE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x08, 0x20, 0xDD, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x09, 0x10, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0xBF, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x0A, 0xF0, 0xA2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0xA1, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x0C, 0xD9, 0xBF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x83, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x0E, 0xB9, 0xA1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0xA0, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x10, 0x99, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x82, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x12, 0x79, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x64, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x14, 0x59, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x46, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x16, 0x39, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x28, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x18, 0x22, 0x45, 0x80, 0x00, 0x00, 0x00, 0x00, 0x19, 0x09, 0x0A, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x1A, 0x02, 0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x26, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x1B, 0xE2, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD2, 0x08, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x1D, 0xC1, 0xEB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xEA, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x1F, 0xA1, 0xCD, 0x80, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x1D, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x21, 0x81, 0xAF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xFF, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x23, 0x6A, 0xCC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xE1, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x25, 0x4A, 0xAE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xC3, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x27, 0x2A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xDF, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x29, 0x0A, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xC1, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x2A, 0xEA, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0xA3, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x2C, 0xD3, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x85, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x2E, 0xB3, 0x52, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x67, 0x90, 0x00, 0x00, 0x00,
+0x00, 0x30, 0x93, 0x34, 0x80, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x36, 0x32, 0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00, 0x00, 0x00,
+0x00, 0x38, 0x1B, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0x04, 0xE9, 0x50, 0x00, 0x00, 0x00,
+0x00, 0x3A, 0xC6, 0xEE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xBB, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x9D, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x7F, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x40, 0x6F, 0xCE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x9B, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x42, 0x4F, 0xB0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x7D, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x44, 0x2F, 0x92, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x5F, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x45, 0xF3, 0xC5, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0x2D, 0x7C, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x47, 0xD3, 0xA7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x0D, 0x5E, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x49, 0xB3, 0x89, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xED, 0x40, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x4B, 0x9C, 0xA5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x5C, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x4D, 0x7C, 0x87, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x3E, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x4F, 0x5C, 0x69, 0x90, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x20, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x51, 0x3C, 0x4B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76, 0x02, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x53, 0x1C, 0x2D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xE4, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x54, 0xFC, 0x0F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xC6, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x56, 0xE5, 0x2C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xE3, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x58, 0xC5, 0x0E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xC5, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x5A, 0xA4, 0xF0, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0xA7, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x5C, 0x84, 0xD2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x89, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x5E, 0x64, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x6B, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x60, 0x4D, 0xD0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x87, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x62, 0x2D, 0xB2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x69, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x64, 0x0D, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x4B, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x65, 0xED, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x2D, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x67, 0xCD, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x0F, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x69, 0xAD, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xF1, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x6B, 0x96, 0x57, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xD0, 0x0E, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x6D, 0x76, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xF0, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x6F, 0x56, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xD2, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x71, 0x35, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xB4, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x73, 0x15, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0x96, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x74, 0xFE, 0xFB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xB2, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x76, 0xDE, 0xDD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0x94, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x78, 0xBE, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x76, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x7A, 0x9E, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x58, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x7C, 0x7E, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x3A, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x7E, 0x5E, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x1C, 0x80, 0x03, 0x01, 0x02,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x06, 0x05, 0x07, 0x06, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0,
+0x01, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x0C, 0xFF, 0xFF,
+0xAB, 0xA0, 0x01, 0x10, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x14, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x18,
+0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x1C, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x10, 0xFF, 0xFF, 0x9D, 0x90,
+0x00, 0x0C, 0x2D, 0x30, 0x30, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x4D, 0x50, 0x54, 0x00, 0x4D, 0x53,
+0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x45, 0x53,
+0x54, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x4D, 0x44, 0x54, 0x2C, 0x4D,
+0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0xF2,
+0xC9, 0xDC, 0x00, 0x72, 0x5C, 0x42, 0x00, 0x00, 0x00, 0x14, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61,
+0x69, 0x6E, 0x20, 0x2D, 0x20, 0x4E, 0x55, 0x20, 0x28, 0x77, 0x65, 0x73, 0x74, 0x29, 
 
 /* America/Campo_Grande */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x42, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -28286,10 +28639,8 @@
 0xB9, 0xB0, 0x01, 0x10, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x53,
 0x54, 0x00, 0x45, 0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x45, 0x53, 0x54,
-0x35, 0x0A, 0x00, 0xA9, 0x7F, 0xED, 0x00, 0x8E, 0x43, 0x45, 0x00, 0x00, 0x00, 0x24, 0x45, 0x61,
-0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x53, 0x74, 0x61, 0x6E, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54,
-0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x51, 0x75, 0x69, 0x6E, 0x74, 0x61, 0x6E, 0x61, 0x20, 0x52,
-0x6F, 0x6F, 
+0x35, 0x0A, 0x00, 0xA9, 0x7F, 0xED, 0x00, 0x8E, 0x43, 0x45, 0x00, 0x00, 0x00, 0x0C, 0x51, 0x75,
+0x69, 0x6E, 0x74, 0x61, 0x6E, 0x61, 0x20, 0x52, 0x6F, 0x6F, 
 
 /* America/Caracas */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x56, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -28709,11 +29060,111 @@
 0xAB, 0xA0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00,
 0x4D, 0x44, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x43, 0x53, 0x54, 0x36, 0x0A, 0x00, 0xB5,
-0x05, 0x25, 0x00, 0x70, 0xC9, 0xB2, 0x00, 0x00, 0x00, 0x26, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61,
-0x69, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x43, 0x68, 0x69, 0x68, 0x75, 0x61,
+0x05, 0x25, 0x00, 0x70, 0xC9, 0xB2, 0x00, 0x00, 0x00, 0x16, 0x43, 0x68, 0x69, 0x68, 0x75, 0x61,
 0x68, 0x75, 0x61, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x61, 0x72, 0x65, 0x61, 0x73, 0x29,
 
 
+/* America/Ciudad_Juarez */
+0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x5B, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xA5, 0xB6, 0xE8, 0x70,
+0xAF, 0xF2, 0x6E, 0xE0, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x43, 0xD2, 0x60, 0xB8, 0x0C, 0x36, 0x60,
+0xB8, 0xFD, 0x86, 0xF0, 0x31, 0x67, 0x76, 0x00, 0x32, 0x73, 0x08, 0x70, 0x33, 0x47, 0x58, 0x00,
+0x34, 0x52, 0xEA, 0x70, 0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80, 0x37, 0x07, 0x2A, 0x10,
+0x38, 0x1B, 0xF7, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x39, 0xFB, 0xD9, 0x00, 0x3A, 0xF5, 0x12, 0x90,
+0x3B, 0xB6, 0xD1, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x3D, 0xBB, 0x9D, 0x00, 0x3E, 0x8F, 0xEC, 0x90,
+0x3F, 0x9B, 0x7F, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x41, 0x84, 0x9B, 0x80, 0x42, 0x4F, 0xB0, 0x90,
+0x43, 0x64, 0x7D, 0x80, 0x44, 0x2F, 0x92, 0x90, 0x45, 0x44, 0x5F, 0x80, 0x46, 0x0F, 0x74, 0x90,
+0x47, 0x24, 0x41, 0x80, 0x47, 0xF8, 0x91, 0x10, 0x49, 0x04, 0x23, 0x80, 0x49, 0xD8, 0x73, 0x10,
+0x4A, 0xE4, 0x05, 0x80, 0x4B, 0x9C, 0xA5, 0x90, 0x4C, 0xD6, 0x5C, 0x80, 0x4D, 0x7C, 0x87, 0x90,
+0x4E, 0xB6, 0x3E, 0x80, 0x4F, 0x5C, 0x69, 0x90, 0x50, 0x96, 0x20, 0x80, 0x51, 0x3C, 0x4B, 0x90,
+0x52, 0x76, 0x02, 0x80, 0x53, 0x1C, 0x2D, 0x90, 0x54, 0x55, 0xE4, 0x80, 0x54, 0xFC, 0x0F, 0x90,
+0x56, 0x35, 0xC6, 0x80, 0x56, 0xE5, 0x2C, 0x10, 0x58, 0x1E, 0xE3, 0x00, 0x58, 0xC5, 0x0E, 0x10,
+0x59, 0xFE, 0xC5, 0x00, 0x5A, 0xA4, 0xF0, 0x10, 0x5B, 0xDE, 0xA7, 0x00, 0x5C, 0x84, 0xD2, 0x10,
+0x5D, 0xBE, 0x89, 0x00, 0x5E, 0x64, 0xB4, 0x10, 0x5F, 0x9E, 0x6B, 0x00, 0x60, 0x4D, 0xD0, 0x90,
+0x61, 0x87, 0x87, 0x80, 0x62, 0x2D, 0xB2, 0x90, 0x63, 0x5E, 0x2F, 0x00, 0x63, 0x86, 0xF1, 0x60,
+0x64, 0x0D, 0x94, 0x90, 0x65, 0x47, 0x4B, 0x80, 0x65, 0xED, 0x76, 0x90, 0x67, 0x27, 0x2D, 0x80,
+0x67, 0xCD, 0x58, 0x90, 0x69, 0x07, 0x0F, 0x80, 0x69, 0xAD, 0x3A, 0x90, 0x6A, 0xE6, 0xF1, 0x80,
+0x6B, 0x96, 0x57, 0x10, 0x6C, 0xD0, 0x0E, 0x00, 0x6D, 0x76, 0x39, 0x10, 0x6E, 0xAF, 0xF0, 0x00,
+0x6F, 0x56, 0x1B, 0x10, 0x70, 0x8F, 0xD2, 0x00, 0x71, 0x35, 0xFD, 0x10, 0x72, 0x6F, 0xB4, 0x00,
+0x73, 0x15, 0xDF, 0x10, 0x74, 0x4F, 0x96, 0x00, 0x74, 0xFE, 0xFB, 0x90, 0x76, 0x38, 0xB2, 0x80,
+0x76, 0xDE, 0xDD, 0x90, 0x78, 0x18, 0x94, 0x80, 0x78, 0xBE, 0xBF, 0x90, 0x79, 0xF8, 0x76, 0x80,
+0x7A, 0x9E, 0xA1, 0x90, 0x7B, 0xD8, 0x58, 0x80, 0x7C, 0x7E, 0x83, 0x90, 0x7D, 0xB8, 0x3A, 0x80,
+0x7E, 0x5E, 0x65, 0x90, 0x7F, 0x98, 0x1C, 0x80, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x05, 0x02,
+0x05, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0xFF, 0xFF, 0x9C, 0x2C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF,
+0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x00,
+0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x10, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0x4C, 0x4D, 0x54,
+0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x43, 0x44, 0x54,
+0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54,
+0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x5B, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5,
+0xB6, 0xE8, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6,
+0x66, 0x56, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8,
+0x0C, 0x36, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x31,
+0x67, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33,
+0x47, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35,
+0x27, 0x48, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37,
+0x07, 0x2A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38,
+0xE7, 0x0C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xD9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A,
+0xF5, 0x12, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xB6, 0xD1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C,
+0xB0, 0x0A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x9D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E,
+0x8F, 0xEC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
+0x6F, 0xCE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x9B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x42,
+0x4F, 0xB0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x7D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x44,
+0x2F, 0x92, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x5F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x46,
+0x0F, 0x74, 0x90, 0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x41, 0x80, 0x00, 0x00, 0x00, 0x00, 0x47,
+0xF8, 0x91, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x23, 0x80, 0x00, 0x00, 0x00, 0x00, 0x49,
+0xD8, 0x73, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE4, 0x05, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4B,
+0x9C, 0xA5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x5C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4D,
+0x7C, 0x87, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x3E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4F,
+0x5C, 0x69, 0x90, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x51,
+0x3C, 0x4B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76, 0x02, 0x80, 0x00, 0x00, 0x00, 0x00, 0x53,
+0x1C, 0x2D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xE4, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54,
+0xFC, 0x0F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xC6, 0x80, 0x00, 0x00, 0x00, 0x00, 0x56,
+0xE5, 0x2C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xE3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58,
+0xC5, 0x0E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xC5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5A,
+0xA4, 0xF0, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0xA7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5C,
+0x84, 0xD2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x89, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5E,
+0x64, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x6B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60,
+0x4D, 0xD0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x87, 0x80, 0x00, 0x00, 0x00, 0x00, 0x62,
+0x2D, 0xB2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5E, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63,
+0x86, 0xF1, 0x60, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x65,
+0x47, 0x4B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67,
+0x27, 0x2D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69,
+0x07, 0x0F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A,
+0xE6, 0xF1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x57, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6C,
+0xD0, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6E,
+0xAF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x56, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x70,
+0x8F, 0xD2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x71, 0x35, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72,
+0x6F, 0xB4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74,
+0x4F, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFE, 0xFB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76,
+0x38, 0xB2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xDD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78,
+0x18, 0x94, 0x80, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x79,
+0xF8, 0x76, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7B,
+0xD8, 0x58, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D,
+0xB8, 0x3A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F,
+0x98, 0x1C, 0x80, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x05, 0x02, 0x05, 0x02, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
+0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x02, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0xFF, 0xFF,
+0x9C, 0x2C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08,
+0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0,
+0x01, 0x10, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00,
+0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x4D,
+0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E,
+0x30, 0x0A, 0x00, 0xB9, 0xC0, 0x15, 0x00, 0x70, 0x2D, 0x72, 0x00, 0x00, 0x00, 0x1C, 0x43, 0x68,
+0x69, 0x68, 0x75, 0x61, 0x68, 0x75, 0x61, 0x20, 0x28, 0x55, 0x53, 0x20, 0x62, 0x6F, 0x72, 0x64,
+0x65, 0x72, 0x20, 0x2D, 0x20, 0x77, 0x65, 0x73, 0x74, 0x29, 
+
 /* America/Coral_Harbour */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -29633,9 +30084,9 @@
 0x54, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x4D, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
 0x00, 0x00, 0x00, 0x01, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x4D, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E,
 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0xDB, 0x0A, 0x38,
-0x00, 0x65, 0x85, 0x95, 0x00, 0x00, 0x00, 0x1D, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69, 0x6E,
-0x20, 0x2D, 0x20, 0x41, 0x42, 0x3B, 0x20, 0x42, 0x43, 0x20, 0x28, 0x45, 0x29, 0x3B, 0x20, 0x53,
-0x4B, 0x20, 0x28, 0x57, 0x29, 
+0x00, 0x65, 0x85, 0x95, 0x00, 0x00, 0x00, 0x25, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69, 0x6E,
+0x20, 0x2D, 0x20, 0x41, 0x42, 0x3B, 0x20, 0x42, 0x43, 0x20, 0x28, 0x45, 0x29, 0x3B, 0x20, 0x4E,
+0x54, 0x20, 0x28, 0x45, 0x29, 0x3B, 0x20, 0x53, 0x4B, 0x20, 0x28, 0x57, 0x29, 
 
 /* America/Eirunepe */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x42, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -30297,8 +30748,8 @@
 
 /* America/Godthab */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x75, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x0C, 0x9B, 0x80, 0x68, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x75, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x10, 0x9B, 0x80, 0x68, 0x00,
 0x13, 0x4D, 0x7C, 0x50, 0x14, 0x33, 0xFA, 0x90, 0x15, 0x23, 0xEB, 0x90, 0x16, 0x13, 0xDC, 0x90,
 0x17, 0x03, 0xCD, 0x90, 0x17, 0xF3, 0xBE, 0x90, 0x18, 0xE3, 0xAF, 0x90, 0x19, 0xD3, 0xA0, 0x90,
 0x1A, 0xC3, 0x91, 0x90, 0x1B, 0xBC, 0xBD, 0x10, 0x1C, 0xAC, 0xAE, 0x10, 0x1D, 0x9C, 0x9F, 0x10,
@@ -30333,87 +30784,89 @@
 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0xFF, 0xFF, 0xCF, 0x80, 0x00, 0x00, 0xFF, 0xFF, 0xD5, 0xD0, 0x00,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06,
+0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06,
+0x05, 0x06, 0x05, 0x06, 0x05, 0xFF, 0xFF, 0xCF, 0x80, 0x00, 0x00, 0xFF, 0xFF, 0xD5, 0xD0, 0x00,
 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x08, 0xFF, 0xFF, 0xE3,
-0xE0, 0x01, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x33, 0x00, 0x2D, 0x30, 0x32, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x33, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x75, 0x00, 0x00, 0x00,
-0x05, 0x00, 0x00, 0x00, 0x0C, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x80, 0x68, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x13, 0x4D, 0x7C, 0x50, 0x00, 0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x16, 0x13, 0xDC, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0xB4, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0x96, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0x78, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0x94, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x38, 0xDD, 0x61, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0x76, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x58, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x3E, 0x86, 0x41, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x40, 0x66, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x39, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x42, 0x46, 0x05, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x1B, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x44, 0x25, 0xE7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x43, 0xFD, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x46, 0x05, 0xC9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x47, 0x23, 0xDF, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x03, 0xC1, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0x83, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x51, 0x57, 0x8A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0x65, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x53, 0x37, 0x6C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x47, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x55, 0x17, 0x4E, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x29, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x56, 0xF7, 0x30, 0x90, 0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0x46, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x58, 0xD7, 0x12, 0x90, 0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x28, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x94, 0xCE, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00, 0x00, 0x00, 0x00, 0x61, 0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x64, 0x1F, 0x99, 0x10, 0x00, 0x00, 0x00, 0x00, 0x65, 0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x66, 0x08, 0xB5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0x1D, 0x90, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x67, 0xE8, 0x97, 0x90, 0x00, 0x00, 0x00, 0x00, 0x68, 0xFD, 0x72, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x69, 0xC8, 0x79, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xDD, 0x54, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x6B, 0xA8, 0x5B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xC6, 0x71, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x6D, 0x88, 0x3D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xA6, 0x53, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x6F, 0x68, 0x1F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x70, 0x86, 0x35, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x71, 0x51, 0x3C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72, 0x66, 0x17, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x73, 0x31, 0x1E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74, 0x45, 0xF9, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x75, 0x11, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x76, 0x2F, 0x15, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x76, 0xF0, 0xE2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x78, 0xD0, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x79, 0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x7A, 0xB0, 0xA6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x7C, 0x99, 0xC2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x7E, 0x79, 0xA4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x04, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0xE0, 0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x00, 0x08, 0xFF, 0xFF, 0xF1, 0xF0, 0x01, 0x0C, 0x4C,
+0x4D, 0x54, 0x00, 0x2D, 0x30, 0x33, 0x00, 0x2D, 0x30, 0x32, 0x00, 0x2D, 0x30, 0x31, 0x00, 0x00,
+0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x54, 0x5A, 0x69,
+0x66, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x75, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x80, 0x68,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x7C, 0x50, 0x00, 0x00, 0x00, 0x00, 0x14, 0x33, 0xFA,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x16, 0x13, 0xDC,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xBE,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0xA0,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xBD,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x9F,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0xB4,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0x96,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0x78,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0x94,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0x76,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x58,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x3A,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x1C,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x39,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x1B,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x43, 0xFD,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x47, 0x23, 0xDF,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x03, 0xC1,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xA3,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCC, 0xBF,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xA1,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0x83,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0x65,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x47,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x29,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90, 0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0x46,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90, 0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x28,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x0A,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xB4, 0xEC,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x94, 0xCE,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00, 0x00, 0x00, 0x00, 0x61, 0x7D, 0xEA,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5D, 0xCC,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10, 0x00, 0x00, 0x00, 0x00, 0x65, 0x3D, 0xAE,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0x1D, 0x90,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90, 0x00, 0x00, 0x00, 0x00, 0x68, 0xFD, 0x72,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xDD, 0x54,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xC6, 0x71,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xA6, 0x53,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x70, 0x86, 0x35,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72, 0x66, 0x17,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74, 0x45, 0xF9,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x76, 0x2F, 0x15,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0E, 0xF7,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x79, 0xEE, 0xD9,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xCE, 0xBB,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xAE, 0x9D,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x8E, 0x7F,
+0x90, 0x01, 0x04, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0xFF, 0xFF, 0xCF, 0x80, 0x00, 0x00, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF,
-0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x08,
-0x4C, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x33, 0x00, 0x2D, 0x30, 0x32, 0x00, 0x00, 0x00, 0x01, 0x01,
-0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x0A, 0x3C, 0x2D, 0x30, 0x33, 0x3E, 0x33, 0x3C, 0x2D, 0x30,
-0x32, 0x3E, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x2D, 0x32, 0x2C, 0x4D, 0x31, 0x30,
-0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x2D, 0x31, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05,
+0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05,
+0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0xFF, 0xFF, 0xCF, 0x80, 0x00, 0x00, 0xFF, 0xFF, 0xD5, 0xD0,
+0x00, 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x08, 0xFF, 0xFF,
+0xE3, 0xE0, 0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x00, 0x08, 0xFF, 0xFF, 0xF1, 0xF0, 0x01, 0x0C,
+0x4C, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x33, 0x00, 0x2D, 0x30, 0x32, 0x00, 0x2D, 0x30, 0x31, 0x00,
+0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x0A, 0x3C,
+0x2D, 0x30, 0x32, 0x3E, 0x32, 0x3C, 0x2D, 0x30, 0x31, 0x3E, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E,
+0x30, 0x2F, 0x2D, 0x31, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x30, 0x0A, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* America/Goose_Bay */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -31227,9 +31680,7 @@
 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00,
 0x50, 0x53, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x0A, 0x00, 0xB5, 0xAE, 0x6A, 0x00, 0x69, 0x56, 0x25,
-0x00, 0x00, 0x00, 0x1F, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69, 0x6E, 0x20, 0x53, 0x74, 0x61,
-0x6E, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x53, 0x6F, 0x6E,
-0x6F, 0x72, 0x61, 
+0x00, 0x00, 0x00, 0x06, 0x53, 0x6F, 0x6E, 0x6F, 0x72, 0x61, 
 
 /* America/Indiana/Indianapolis */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x55, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -32280,37 +32731,122 @@
 /* America/Inuvik */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x15, 0xE0, 0x06, 0x4E, 0x80,
-0xF7, 0x2F, 0x68, 0x80, 0xF8, 0x28, 0x94, 0x00, 0x11, 0x89, 0x90, 0x20, 0x13, 0x69, 0x64, 0x10,
-0x14, 0x59, 0x47, 0x00, 0x15, 0x49, 0x46, 0x10, 0x16, 0x39, 0x29, 0x00, 0x17, 0x29, 0x28, 0x10,
-0x18, 0x22, 0x45, 0x80, 0x19, 0x09, 0x0A, 0x10, 0x1A, 0x02, 0x27, 0x80, 0x1A, 0xF2, 0x26, 0x90,
-0x1B, 0xE2, 0x09, 0x80, 0x1C, 0xD2, 0x08, 0x90, 0x1D, 0xC1, 0xEB, 0x80, 0x1E, 0xB1, 0xEA, 0x90,
-0x1F, 0xA1, 0xCD, 0x80, 0x20, 0x76, 0x1D, 0x10, 0x21, 0x81, 0xAF, 0x80, 0x22, 0x55, 0xFF, 0x10,
-0x23, 0x6A, 0xCC, 0x00, 0x24, 0x35, 0xE1, 0x10, 0x25, 0x4A, 0xAE, 0x00, 0x26, 0x15, 0xC3, 0x10,
-0x27, 0x2A, 0x90, 0x00, 0x27, 0xFE, 0xDF, 0x90, 0x29, 0x0A, 0x72, 0x00, 0x29, 0xDE, 0xC1, 0x90,
-0x2A, 0xEA, 0x54, 0x00, 0x2B, 0xBE, 0xA3, 0x90, 0x2C, 0xD3, 0x70, 0x80, 0x2D, 0x9E, 0x85, 0x90,
-0x2E, 0xB3, 0x52, 0x80, 0x2F, 0x7E, 0x67, 0x90, 0x30, 0x93, 0x34, 0x80, 0x31, 0x67, 0x84, 0x10,
-0x32, 0x73, 0x16, 0x80, 0x33, 0x47, 0x66, 0x10, 0x34, 0x52, 0xF8, 0x80, 0x35, 0x27, 0x48, 0x10,
-0x36, 0x32, 0xDA, 0x80, 0x37, 0x07, 0x2A, 0x10, 0x38, 0x1B, 0xF7, 0x00, 0x38, 0xE7, 0x0C, 0x10,
-0x39, 0xFB, 0xD9, 0x00, 0x3A, 0xC6, 0xEE, 0x10, 0x3B, 0xDB, 0xBB, 0x00, 0x3C, 0xB0, 0x0A, 0x90,
-0x3D, 0xBB, 0x9D, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x3F, 0x9B, 0x7F, 0x00, 0x40, 0x6F, 0xCE, 0x90,
-0x41, 0x84, 0x9B, 0x80, 0x42, 0x4F, 0xB0, 0x90, 0x43, 0x64, 0x7D, 0x80, 0x44, 0x2F, 0x92, 0x90,
-0x45, 0x44, 0x5F, 0x80, 0x45, 0xF3, 0xC5, 0x10, 0x47, 0x2D, 0x7C, 0x00, 0x47, 0xD3, 0xA7, 0x10,
-0x49, 0x0D, 0x5E, 0x00, 0x49, 0xB3, 0x89, 0x10, 0x4A, 0xED, 0x40, 0x00, 0x4B, 0x9C, 0xA5, 0x90,
-0x4C, 0xD6, 0x5C, 0x80, 0x4D, 0x7C, 0x87, 0x90, 0x4E, 0xB6, 0x3E, 0x80, 0x4F, 0x5C, 0x69, 0x90,
-0x50, 0x96, 0x20, 0x80, 0x51, 0x3C, 0x4B, 0x90, 0x52, 0x76, 0x02, 0x80, 0x53, 0x1C, 0x2D, 0x90,
-0x54, 0x55, 0xE4, 0x80, 0x54, 0xFC, 0x0F, 0x90, 0x56, 0x35, 0xC6, 0x80, 0x56, 0xE5, 0x2C, 0x10,
-0x58, 0x1E, 0xE3, 0x00, 0x58, 0xC5, 0x0E, 0x10, 0x59, 0xFE, 0xC5, 0x00, 0x5A, 0xA4, 0xF0, 0x10,
-0x5B, 0xDE, 0xA7, 0x00, 0x5C, 0x84, 0xD2, 0x10, 0x5D, 0xBE, 0x89, 0x00, 0x5E, 0x64, 0xB4, 0x10,
-0x5F, 0x9E, 0x6B, 0x00, 0x60, 0x4D, 0xD0, 0x90, 0x61, 0x87, 0x87, 0x80, 0x62, 0x2D, 0xB2, 0x90,
-0x63, 0x67, 0x69, 0x80, 0x64, 0x0D, 0x94, 0x90, 0x65, 0x47, 0x4B, 0x80, 0x65, 0xED, 0x76, 0x90,
-0x67, 0x27, 0x2D, 0x80, 0x67, 0xCD, 0x58, 0x90, 0x69, 0x07, 0x0F, 0x80, 0x69, 0xAD, 0x3A, 0x90,
-0x6A, 0xE6, 0xF1, 0x80, 0x6B, 0x96, 0x57, 0x10, 0x6C, 0xD0, 0x0E, 0x00, 0x6D, 0x76, 0x39, 0x10,
-0x6E, 0xAF, 0xF0, 0x00, 0x6F, 0x56, 0x1B, 0x10, 0x70, 0x8F, 0xD2, 0x00, 0x71, 0x35, 0xFD, 0x10,
-0x72, 0x6F, 0xB4, 0x00, 0x73, 0x15, 0xDF, 0x10, 0x74, 0x4F, 0x96, 0x00, 0x74, 0xFE, 0xFB, 0x90,
-0x76, 0x38, 0xB2, 0x80, 0x76, 0xDE, 0xDD, 0x90, 0x78, 0x18, 0x94, 0x80, 0x78, 0xBE, 0xBF, 0x90,
-0x79, 0xF8, 0x76, 0x80, 0x7A, 0x9E, 0xA1, 0x90, 0x7B, 0xD8, 0x58, 0x80, 0x7C, 0x7E, 0x83, 0x90,
-0x7D, 0xB8, 0x3A, 0x80, 0x7E, 0x5E, 0x65, 0x90, 0x7F, 0x98, 0x1C, 0x80, 0x02, 0x01, 0x02, 0x03,
+0x00, 0x00, 0x00, 0x85, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0xE0, 0x06, 0x4E, 0x80,
+0x04, 0x61, 0x27, 0xA0, 0x05, 0x51, 0x0A, 0x90, 0x06, 0x41, 0x09, 0xA0, 0x07, 0x30, 0xEC, 0x90,
+0x08, 0x20, 0xEB, 0xA0, 0x09, 0x10, 0xCE, 0x90, 0x0A, 0x00, 0xCD, 0xA0, 0x0A, 0xF0, 0xB0, 0x90,
+0x0B, 0xE0, 0xAF, 0xA0, 0x0C, 0xD9, 0xCD, 0x10, 0x0D, 0xC0, 0x91, 0xA0, 0x0E, 0xB9, 0xAF, 0x10,
+0x0F, 0xA9, 0xAE, 0x20, 0x10, 0x99, 0x91, 0x10, 0x11, 0x89, 0x90, 0x20, 0x12, 0x79, 0x65, 0x00,
+0x13, 0x69, 0x64, 0x10, 0x14, 0x59, 0x47, 0x00, 0x15, 0x49, 0x46, 0x10, 0x16, 0x39, 0x29, 0x00,
+0x17, 0x29, 0x28, 0x10, 0x18, 0x22, 0x45, 0x80, 0x19, 0x09, 0x0A, 0x10, 0x1A, 0x02, 0x27, 0x80,
+0x1A, 0xF2, 0x26, 0x90, 0x1B, 0xE2, 0x09, 0x80, 0x1C, 0xD2, 0x08, 0x90, 0x1D, 0xC1, 0xEB, 0x80,
+0x1E, 0xB1, 0xEA, 0x90, 0x1F, 0xA1, 0xCD, 0x80, 0x20, 0x76, 0x1D, 0x10, 0x21, 0x81, 0xAF, 0x80,
+0x22, 0x55, 0xFF, 0x10, 0x23, 0x6A, 0xCC, 0x00, 0x24, 0x35, 0xE1, 0x10, 0x25, 0x4A, 0xAE, 0x00,
+0x26, 0x15, 0xC3, 0x10, 0x27, 0x2A, 0x90, 0x00, 0x27, 0xFE, 0xDF, 0x90, 0x29, 0x0A, 0x72, 0x00,
+0x29, 0xDE, 0xC1, 0x90, 0x2A, 0xEA, 0x54, 0x00, 0x2B, 0xBE, 0xA3, 0x90, 0x2C, 0xD3, 0x70, 0x80,
+0x2D, 0x9E, 0x85, 0x90, 0x2E, 0xB3, 0x52, 0x80, 0x2F, 0x7E, 0x67, 0x90, 0x30, 0x93, 0x34, 0x80,
+0x31, 0x67, 0x84, 0x10, 0x32, 0x73, 0x16, 0x80, 0x33, 0x47, 0x66, 0x10, 0x34, 0x52, 0xF8, 0x80,
+0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80, 0x37, 0x07, 0x2A, 0x10, 0x38, 0x1B, 0xF7, 0x00,
+0x38, 0xE7, 0x0C, 0x10, 0x39, 0xFB, 0xD9, 0x00, 0x3A, 0xC6, 0xEE, 0x10, 0x3B, 0xDB, 0xBB, 0x00,
+0x3C, 0xB0, 0x0A, 0x90, 0x3D, 0xBB, 0x9D, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x3F, 0x9B, 0x7F, 0x00,
+0x40, 0x6F, 0xCE, 0x90, 0x41, 0x84, 0x9B, 0x80, 0x42, 0x4F, 0xB0, 0x90, 0x43, 0x64, 0x7D, 0x80,
+0x44, 0x2F, 0x92, 0x90, 0x45, 0x44, 0x5F, 0x80, 0x45, 0xF3, 0xC5, 0x10, 0x47, 0x2D, 0x7C, 0x00,
+0x47, 0xD3, 0xA7, 0x10, 0x49, 0x0D, 0x5E, 0x00, 0x49, 0xB3, 0x89, 0x10, 0x4A, 0xED, 0x40, 0x00,
+0x4B, 0x9C, 0xA5, 0x90, 0x4C, 0xD6, 0x5C, 0x80, 0x4D, 0x7C, 0x87, 0x90, 0x4E, 0xB6, 0x3E, 0x80,
+0x4F, 0x5C, 0x69, 0x90, 0x50, 0x96, 0x20, 0x80, 0x51, 0x3C, 0x4B, 0x90, 0x52, 0x76, 0x02, 0x80,
+0x53, 0x1C, 0x2D, 0x90, 0x54, 0x55, 0xE4, 0x80, 0x54, 0xFC, 0x0F, 0x90, 0x56, 0x35, 0xC6, 0x80,
+0x56, 0xE5, 0x2C, 0x10, 0x58, 0x1E, 0xE3, 0x00, 0x58, 0xC5, 0x0E, 0x10, 0x59, 0xFE, 0xC5, 0x00,
+0x5A, 0xA4, 0xF0, 0x10, 0x5B, 0xDE, 0xA7, 0x00, 0x5C, 0x84, 0xD2, 0x10, 0x5D, 0xBE, 0x89, 0x00,
+0x5E, 0x64, 0xB4, 0x10, 0x5F, 0x9E, 0x6B, 0x00, 0x60, 0x4D, 0xD0, 0x90, 0x61, 0x87, 0x87, 0x80,
+0x62, 0x2D, 0xB2, 0x90, 0x63, 0x67, 0x69, 0x80, 0x64, 0x0D, 0x94, 0x90, 0x65, 0x47, 0x4B, 0x80,
+0x65, 0xED, 0x76, 0x90, 0x67, 0x27, 0x2D, 0x80, 0x67, 0xCD, 0x58, 0x90, 0x69, 0x07, 0x0F, 0x80,
+0x69, 0xAD, 0x3A, 0x90, 0x6A, 0xE6, 0xF1, 0x80, 0x6B, 0x96, 0x57, 0x10, 0x6C, 0xD0, 0x0E, 0x00,
+0x6D, 0x76, 0x39, 0x10, 0x6E, 0xAF, 0xF0, 0x00, 0x6F, 0x56, 0x1B, 0x10, 0x70, 0x8F, 0xD2, 0x00,
+0x71, 0x35, 0xFD, 0x10, 0x72, 0x6F, 0xB4, 0x00, 0x73, 0x15, 0xDF, 0x10, 0x74, 0x4F, 0x96, 0x00,
+0x74, 0xFE, 0xFB, 0x90, 0x76, 0x38, 0xB2, 0x80, 0x76, 0xDE, 0xDD, 0x90, 0x78, 0x18, 0x94, 0x80,
+0x78, 0xBE, 0xBF, 0x90, 0x79, 0xF8, 0x76, 0x80, 0x7A, 0x9E, 0xA1, 0x90, 0x7B, 0xD8, 0x58, 0x80,
+0x7C, 0x7E, 0x83, 0x90, 0x7D, 0xB8, 0x3A, 0x80, 0x7E, 0x5E, 0x65, 0x90, 0x7F, 0x98, 0x1C, 0x80,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x01,
+0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x0C, 0xFF, 0xFF, 0xAB,
+0xA0, 0x01, 0x10, 0x2D, 0x30, 0x30, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x4D,
+0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x00, 0x00, 0x00, 0x05, 0x00,
+0x00, 0x00, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x06, 0x4E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x04,
+0x61, 0x27, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x05, 0x51, 0x0A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x06,
+0x41, 0x09, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x07, 0x30, 0xEC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x08,
+0x20, 0xEB, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x09, 0x10, 0xCE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0A,
+0x00, 0xCD, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0, 0xB0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0B,
+0xE0, 0xAF, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9, 0xCD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0D,
+0xC0, 0x91, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9, 0xAF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x0F,
+0xA9, 0xAE, 0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99, 0x91, 0x10, 0x00, 0x00, 0x00, 0x00, 0x11,
+0x89, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13,
+0x69, 0x64, 0x10, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15,
+0x49, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17,
+0x29, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x45, 0x80, 0x00, 0x00, 0x00, 0x00, 0x19,
+0x09, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A,
+0xF2, 0x26, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1C,
+0xD2, 0x08, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xEB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1E,
+0xB1, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xCD, 0x80, 0x00, 0x00, 0x00, 0x00, 0x20,
+0x76, 0x1D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xAF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x22,
+0x55, 0xFF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xCC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24,
+0x35, 0xE1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0xAE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x26,
+0x15, 0xC3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27,
+0xFE, 0xDF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29,
+0xDE, 0xC1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2B,
+0xBE, 0xA3, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2D,
+0x9E, 0x85, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x52, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2F,
+0x7E, 0x67, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x34, 0x80, 0x00, 0x00, 0x00, 0x00, 0x31,
+0x67, 0x84, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33,
+0x47, 0x66, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35,
+0x27, 0x48, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37,
+0x07, 0x2A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38,
+0xE7, 0x0C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xD9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A,
+0xC6, 0xEE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xBB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C,
+0xB0, 0x0A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x9D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E,
+0x8F, 0xEC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
+0x6F, 0xCE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x9B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x42,
+0x4F, 0xB0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x7D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x44,
+0x2F, 0x92, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x5F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45,
+0xF3, 0xC5, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0x2D, 0x7C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47,
+0xD3, 0xA7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x0D, 0x5E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49,
+0xB3, 0x89, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xED, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4B,
+0x9C, 0xA5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x5C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4D,
+0x7C, 0x87, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x3E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4F,
+0x5C, 0x69, 0x90, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x51,
+0x3C, 0x4B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76, 0x02, 0x80, 0x00, 0x00, 0x00, 0x00, 0x53,
+0x1C, 0x2D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xE4, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54,
+0xFC, 0x0F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xC6, 0x80, 0x00, 0x00, 0x00, 0x00, 0x56,
+0xE5, 0x2C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xE3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58,
+0xC5, 0x0E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xC5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5A,
+0xA4, 0xF0, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0xA7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5C,
+0x84, 0xD2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x89, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5E,
+0x64, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x6B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60,
+0x4D, 0xD0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x87, 0x80, 0x00, 0x00, 0x00, 0x00, 0x62,
+0x2D, 0xB2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x69, 0x80, 0x00, 0x00, 0x00, 0x00, 0x64,
+0x0D, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x4B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x65,
+0xED, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x2D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x67,
+0xCD, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x0F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x69,
+0xAD, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xF1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x6B,
+0x96, 0x57, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xD0, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6D,
+0x76, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6F,
+0x56, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xD2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x71,
+0x35, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xB4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x73,
+0x15, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74,
+0xFE, 0xFB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xB2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x76,
+0xDE, 0xDD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0x94, 0x80, 0x00, 0x00, 0x00, 0x00, 0x78,
+0xBE, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x76, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7A,
+0x9E, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x58, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7C,
+0x7E, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x3A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7E,
+0x5E, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x1C, 0x80, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
@@ -32318,219 +32854,155 @@
 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
-0x04, 0x03, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x04,
-0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x09, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x0D, 0xFF, 0xFF, 0xAB, 0xA0,
-0x01, 0x11, 0x2D, 0x30, 0x30, 0x00, 0x50, 0x44, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x4D,
-0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x05, 0x00,
-0x00, 0x00, 0x15, 0xFF, 0xFF, 0xFF, 0xFF, 0xE0, 0x06, 0x4E, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7,
-0x2F, 0x68, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11,
-0x89, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x64, 0x10, 0x00, 0x00, 0x00, 0x00, 0x14,
-0x59, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x16,
-0x39, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x18,
-0x22, 0x45, 0x80, 0x00, 0x00, 0x00, 0x00, 0x19, 0x09, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1A,
-0x02, 0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x26, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B,
-0xE2, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD2, 0x08, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1D,
-0xC1, 0xEB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1F,
-0xA1, 0xCD, 0x80, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x1D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21,
-0x81, 0xAF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xFF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23,
-0x6A, 0xCC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xE1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25,
-0x4A, 0xAE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xC3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27,
-0x2A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xDF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29,
-0x0A, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xC1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A,
-0xEA, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0xA3, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C,
-0xD3, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x85, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E,
-0xB3, 0x52, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x67, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30,
-0x93, 0x34, 0x80, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32,
-0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34,
-0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36,
-0x32, 0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38,
-0x1B, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39,
-0xFB, 0xD9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xEE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B,
-0xDB, 0xBB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D,
-0xBB, 0x9D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F,
-0x9B, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41,
-0x84, 0x9B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43,
-0x64, 0x7D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x92, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45,
-0x44, 0x5F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xC5, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47,
-0x2D, 0x7C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0xD3, 0xA7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49,
-0x0D, 0x5E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0xB3, 0x89, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A,
-0xED, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0xA5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4C,
-0xD6, 0x5C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x87, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4E,
-0xB6, 0x3E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x69, 0x90, 0x00, 0x00, 0x00, 0x00, 0x50,
-0x96, 0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x4B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52,
-0x76, 0x02, 0x80, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x2D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54,
-0x55, 0xE4, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFC, 0x0F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56,
-0x35, 0xC6, 0x80, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x2C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58,
-0x1E, 0xE3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC5, 0x0E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x59,
-0xFE, 0xC5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xF0, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5B,
-0xDE, 0xA7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xD2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D,
-0xBE, 0x89, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F,
-0x9E, 0x6B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xD0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x61,
-0x87, 0x87, 0x80, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0xB2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x63,
-0x67, 0x69, 0x80, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x65,
-0x47, 0x4B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67,
-0x27, 0x2D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69,
-0x07, 0x0F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A,
-0xE6, 0xF1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x57, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6C,
-0xD0, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6E,
-0xAF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x56, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x70,
-0x8F, 0xD2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x71, 0x35, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72,
-0x6F, 0xB4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74,
-0x4F, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFE, 0xFB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76,
-0x38, 0xB2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xDD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78,
-0x18, 0x94, 0x80, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x79,
-0xF8, 0x76, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7B,
-0xD8, 0x58, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D,
-0xB8, 0x3A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F,
-0x98, 0x1C, 0x80, 0x02, 0x01, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x04, 0xFF, 0xFF, 0x8F, 0x80, 0x00, 0x09, 0xFF, 0xFF, 0x9D,
-0x90, 0x00, 0x0D, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x11, 0x2D, 0x30, 0x30, 0x00, 0x50, 0x44, 0x44,
-0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x0A, 0x4D,
-0x53, 0x54, 0x37, 0x4D, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31,
-0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0xF1, 0x9F, 0x5C, 0x00, 0x46, 0x9F, 0x6D, 0x00, 0x00,
-0x00, 0x14, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69, 0x6E, 0x20, 0x2D, 0x20, 0x4E, 0x54, 0x20,
-0x28, 0x77, 0x65, 0x73, 0x74, 0x29, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x01, 0x04, 0xFF, 0xFF, 0x8F, 0x80,
+0x00, 0x08, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x0C, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x10, 0x2D, 0x30,
+0x30, 0x00, 0x50, 0x44, 0x54, 0x00, 0x50, 0x53, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x44,
+0x54, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x4D, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E,
+0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0xF1, 0x9F, 0x5C, 0x00, 0x46,
+0x9F, 0x6D, 0x00, 0x00, 0x00, 0x14, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69, 0x6E, 0x20, 0x2D,
+0x20, 0x4E, 0x54, 0x20, 0x28, 0x77, 0x65, 0x73, 0x74, 0x29, 
 
 /* America/Iqaluit */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x21, 0xCC, 0x6C, 0xA1, 0x80,
-0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x60, 0xFB, 0xE0, 0xF7, 0x2F, 0x3E, 0x50, 0xF8, 0x28, 0x69, 0xD0,
-0x13, 0x69, 0x47, 0xF0, 0x14, 0x59, 0x2A, 0xE0, 0x15, 0x49, 0x29, 0xF0, 0x16, 0x39, 0x0C, 0xE0,
-0x17, 0x29, 0x0B, 0xF0, 0x18, 0x22, 0x29, 0x60, 0x19, 0x08, 0xED, 0xF0, 0x1A, 0x02, 0x0B, 0x60,
-0x1A, 0xF2, 0x0A, 0x70, 0x1B, 0xE1, 0xED, 0x60, 0x1C, 0xD1, 0xEC, 0x70, 0x1D, 0xC1, 0xCF, 0x60,
-0x1E, 0xB1, 0xCE, 0x70, 0x1F, 0xA1, 0xB1, 0x60, 0x20, 0x76, 0x00, 0xF0, 0x21, 0x81, 0x93, 0x60,
-0x22, 0x55, 0xE2, 0xF0, 0x23, 0x6A, 0xAF, 0xE0, 0x24, 0x35, 0xC4, 0xF0, 0x25, 0x4A, 0x91, 0xE0,
-0x26, 0x15, 0xA6, 0xF0, 0x27, 0x2A, 0x73, 0xE0, 0x27, 0xFE, 0xC3, 0x70, 0x29, 0x0A, 0x55, 0xE0,
-0x29, 0xDE, 0xA5, 0x70, 0x2A, 0xEA, 0x37, 0xE0, 0x2B, 0xBE, 0x87, 0x70, 0x2C, 0xD3, 0x54, 0x60,
-0x2D, 0x9E, 0x69, 0x70, 0x2E, 0xB3, 0x36, 0x60, 0x2F, 0x7E, 0x4B, 0x70, 0x30, 0x93, 0x18, 0x60,
-0x31, 0x67, 0x67, 0xF0, 0x32, 0x72, 0xFA, 0x60, 0x33, 0x47, 0x49, 0xF0, 0x34, 0x52, 0xDC, 0x60,
-0x35, 0x27, 0x2B, 0xF0, 0x36, 0x32, 0xBE, 0x60, 0x37, 0x07, 0x0D, 0xF0, 0x38, 0x1B, 0xDA, 0xE0,
-0x38, 0xE6, 0xFE, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x3A, 0xC6, 0xD1, 0xF0, 0x3B, 0xDB, 0x9E, 0xE0,
-0x3C, 0xAF, 0xEE, 0x70, 0x3D, 0xBB, 0x80, 0xE0, 0x3E, 0x8F, 0xD0, 0x70, 0x3F, 0x9B, 0x62, 0xE0,
-0x40, 0x6F, 0xB2, 0x70, 0x41, 0x84, 0x7F, 0x60, 0x42, 0x4F, 0x94, 0x70, 0x43, 0x64, 0x61, 0x60,
-0x44, 0x2F, 0x76, 0x70, 0x45, 0x44, 0x43, 0x60, 0x45, 0xF3, 0xA8, 0xF0, 0x47, 0x2D, 0x5F, 0xE0,
-0x47, 0xD3, 0x8A, 0xF0, 0x49, 0x0D, 0x41, 0xE0, 0x49, 0xB3, 0x6C, 0xF0, 0x4A, 0xED, 0x23, 0xE0,
-0x4B, 0x9C, 0x89, 0x70, 0x4C, 0xD6, 0x40, 0x60, 0x4D, 0x7C, 0x6B, 0x70, 0x4E, 0xB6, 0x22, 0x60,
-0x4F, 0x5C, 0x4D, 0x70, 0x50, 0x96, 0x04, 0x60, 0x51, 0x3C, 0x2F, 0x70, 0x52, 0x75, 0xE6, 0x60,
-0x53, 0x1C, 0x11, 0x70, 0x54, 0x55, 0xC8, 0x60, 0x54, 0xFB, 0xF3, 0x70, 0x56, 0x35, 0xAA, 0x60,
-0x56, 0xE5, 0x0F, 0xF0, 0x58, 0x1E, 0xC6, 0xE0, 0x58, 0xC4, 0xF1, 0xF0, 0x59, 0xFE, 0xA8, 0xE0,
-0x5A, 0xA4, 0xD3, 0xF0, 0x5B, 0xDE, 0x8A, 0xE0, 0x5C, 0x84, 0xB5, 0xF0, 0x5D, 0xBE, 0x6C, 0xE0,
-0x5E, 0x64, 0x97, 0xF0, 0x5F, 0x9E, 0x4E, 0xE0, 0x60, 0x4D, 0xB4, 0x70, 0x61, 0x87, 0x6B, 0x60,
-0x62, 0x2D, 0x96, 0x70, 0x63, 0x67, 0x4D, 0x60, 0x64, 0x0D, 0x78, 0x70, 0x65, 0x47, 0x2F, 0x60,
-0x65, 0xED, 0x5A, 0x70, 0x67, 0x27, 0x11, 0x60, 0x67, 0xCD, 0x3C, 0x70, 0x69, 0x06, 0xF3, 0x60,
-0x69, 0xAD, 0x1E, 0x70, 0x6A, 0xE6, 0xD5, 0x60, 0x6B, 0x96, 0x3A, 0xF0, 0x6C, 0xCF, 0xF1, 0xE0,
-0x6D, 0x76, 0x1C, 0xF0, 0x6E, 0xAF, 0xD3, 0xE0, 0x6F, 0x55, 0xFE, 0xF0, 0x70, 0x8F, 0xB5, 0xE0,
-0x71, 0x35, 0xE0, 0xF0, 0x72, 0x6F, 0x97, 0xE0, 0x73, 0x15, 0xC2, 0xF0, 0x74, 0x4F, 0x79, 0xE0,
-0x74, 0xFE, 0xDF, 0x70, 0x76, 0x38, 0x96, 0x60, 0x76, 0xDE, 0xC1, 0x70, 0x78, 0x18, 0x78, 0x60,
-0x78, 0xBE, 0xA3, 0x70, 0x79, 0xF8, 0x5A, 0x60, 0x7A, 0x9E, 0x85, 0x70, 0x7B, 0xD8, 0x3C, 0x60,
-0x7C, 0x7E, 0x67, 0x70, 0x7D, 0xB8, 0x1E, 0x60, 0x7E, 0x5E, 0x49, 0x70, 0x7F, 0x98, 0x00, 0x60,
-0x05, 0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x06, 0x07, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
-0xFF, 0xC7, 0xC0, 0x01, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08, 0xFF, 0xFF, 0xD5, 0xD0, 0x01,
-0x0C, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x11, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x15, 0xFF, 0xFF, 0xAB,
-0xA0, 0x00, 0x19, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x1D, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x11, 0xFF,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x87, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x1C, 0xCC, 0x6C, 0xA1, 0x80,
+0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x60, 0xFB, 0xE0, 0x04, 0x60, 0xFD, 0x70, 0x05, 0x50, 0xE0, 0x60,
+0x06, 0x40, 0xDF, 0x70, 0x07, 0x30, 0xC2, 0x60, 0x08, 0x20, 0xC1, 0x70, 0x09, 0x10, 0xA4, 0x60,
+0x0A, 0x00, 0xA3, 0x70, 0x0A, 0xF0, 0x86, 0x60, 0x0B, 0xE0, 0x85, 0x70, 0x0C, 0xD9, 0xA2, 0xE0,
+0x0D, 0xC0, 0x67, 0x70, 0x0E, 0xB9, 0x84, 0xE0, 0x0F, 0xA9, 0x83, 0xF0, 0x10, 0x99, 0x66, 0xE0,
+0x11, 0x89, 0x65, 0xF0, 0x12, 0x79, 0x48, 0xE0, 0x13, 0x69, 0x47, 0xF0, 0x14, 0x59, 0x2A, 0xE0,
+0x15, 0x49, 0x29, 0xF0, 0x16, 0x39, 0x0C, 0xE0, 0x17, 0x29, 0x0B, 0xF0, 0x18, 0x22, 0x29, 0x60,
+0x19, 0x08, 0xED, 0xF0, 0x1A, 0x02, 0x0B, 0x60, 0x1A, 0xF2, 0x0A, 0x70, 0x1B, 0xE1, 0xED, 0x60,
+0x1C, 0xD1, 0xEC, 0x70, 0x1D, 0xC1, 0xCF, 0x60, 0x1E, 0xB1, 0xCE, 0x70, 0x1F, 0xA1, 0xB1, 0x60,
+0x20, 0x76, 0x00, 0xF0, 0x21, 0x81, 0x93, 0x60, 0x22, 0x55, 0xE2, 0xF0, 0x23, 0x6A, 0xAF, 0xE0,
+0x24, 0x35, 0xC4, 0xF0, 0x25, 0x4A, 0x91, 0xE0, 0x26, 0x15, 0xA6, 0xF0, 0x27, 0x2A, 0x73, 0xE0,
+0x27, 0xFE, 0xC3, 0x70, 0x29, 0x0A, 0x55, 0xE0, 0x29, 0xDE, 0xA5, 0x70, 0x2A, 0xEA, 0x37, 0xE0,
+0x2B, 0xBE, 0x87, 0x70, 0x2C, 0xD3, 0x54, 0x60, 0x2D, 0x9E, 0x69, 0x70, 0x2E, 0xB3, 0x36, 0x60,
+0x2F, 0x7E, 0x4B, 0x70, 0x30, 0x93, 0x18, 0x60, 0x31, 0x67, 0x67, 0xF0, 0x32, 0x72, 0xFA, 0x60,
+0x33, 0x47, 0x49, 0xF0, 0x34, 0x52, 0xDC, 0x60, 0x35, 0x27, 0x2B, 0xF0, 0x36, 0x32, 0xBE, 0x60,
+0x37, 0x07, 0x0D, 0xF0, 0x38, 0x1B, 0xDA, 0xE0, 0x38, 0xE6, 0xFE, 0x00, 0x39, 0xFB, 0xCA, 0xF0,
+0x3A, 0xC6, 0xD1, 0xF0, 0x3B, 0xDB, 0x9E, 0xE0, 0x3C, 0xAF, 0xEE, 0x70, 0x3D, 0xBB, 0x80, 0xE0,
+0x3E, 0x8F, 0xD0, 0x70, 0x3F, 0x9B, 0x62, 0xE0, 0x40, 0x6F, 0xB2, 0x70, 0x41, 0x84, 0x7F, 0x60,
+0x42, 0x4F, 0x94, 0x70, 0x43, 0x64, 0x61, 0x60, 0x44, 0x2F, 0x76, 0x70, 0x45, 0x44, 0x43, 0x60,
+0x45, 0xF3, 0xA8, 0xF0, 0x47, 0x2D, 0x5F, 0xE0, 0x47, 0xD3, 0x8A, 0xF0, 0x49, 0x0D, 0x41, 0xE0,
+0x49, 0xB3, 0x6C, 0xF0, 0x4A, 0xED, 0x23, 0xE0, 0x4B, 0x9C, 0x89, 0x70, 0x4C, 0xD6, 0x40, 0x60,
+0x4D, 0x7C, 0x6B, 0x70, 0x4E, 0xB6, 0x22, 0x60, 0x4F, 0x5C, 0x4D, 0x70, 0x50, 0x96, 0x04, 0x60,
+0x51, 0x3C, 0x2F, 0x70, 0x52, 0x75, 0xE6, 0x60, 0x53, 0x1C, 0x11, 0x70, 0x54, 0x55, 0xC8, 0x60,
+0x54, 0xFB, 0xF3, 0x70, 0x56, 0x35, 0xAA, 0x60, 0x56, 0xE5, 0x0F, 0xF0, 0x58, 0x1E, 0xC6, 0xE0,
+0x58, 0xC4, 0xF1, 0xF0, 0x59, 0xFE, 0xA8, 0xE0, 0x5A, 0xA4, 0xD3, 0xF0, 0x5B, 0xDE, 0x8A, 0xE0,
+0x5C, 0x84, 0xB5, 0xF0, 0x5D, 0xBE, 0x6C, 0xE0, 0x5E, 0x64, 0x97, 0xF0, 0x5F, 0x9E, 0x4E, 0xE0,
+0x60, 0x4D, 0xB4, 0x70, 0x61, 0x87, 0x6B, 0x60, 0x62, 0x2D, 0x96, 0x70, 0x63, 0x67, 0x4D, 0x60,
+0x64, 0x0D, 0x78, 0x70, 0x65, 0x47, 0x2F, 0x60, 0x65, 0xED, 0x5A, 0x70, 0x67, 0x27, 0x11, 0x60,
+0x67, 0xCD, 0x3C, 0x70, 0x69, 0x06, 0xF3, 0x60, 0x69, 0xAD, 0x1E, 0x70, 0x6A, 0xE6, 0xD5, 0x60,
+0x6B, 0x96, 0x3A, 0xF0, 0x6C, 0xCF, 0xF1, 0xE0, 0x6D, 0x76, 0x1C, 0xF0, 0x6E, 0xAF, 0xD3, 0xE0,
+0x6F, 0x55, 0xFE, 0xF0, 0x70, 0x8F, 0xB5, 0xE0, 0x71, 0x35, 0xE0, 0xF0, 0x72, 0x6F, 0x97, 0xE0,
+0x73, 0x15, 0xC2, 0xF0, 0x74, 0x4F, 0x79, 0xE0, 0x74, 0xFE, 0xDF, 0x70, 0x76, 0x38, 0x96, 0x60,
+0x76, 0xDE, 0xC1, 0x70, 0x78, 0x18, 0x78, 0x60, 0x78, 0xBE, 0xA3, 0x70, 0x79, 0xF8, 0x5A, 0x60,
+0x7A, 0x9E, 0x85, 0x70, 0x7B, 0xD8, 0x3C, 0x60, 0x7C, 0x7E, 0x67, 0x70, 0x7D, 0xB8, 0x1E, 0x60,
+0x7E, 0x5E, 0x49, 0x70, 0x7F, 0x98, 0x00, 0x60, 0x04, 0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x05, 0x06, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00,
+0x08, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x10, 0xFF, 0xFF, 0xAB,
+0xA0, 0x00, 0x14, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x18, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0xFF,
 0xFF, 0xB9, 0xB0, 0x00, 0x08, 0x2D, 0x30, 0x30, 0x00, 0x45, 0x50, 0x54, 0x00, 0x45, 0x53, 0x54,
-0x00, 0x45, 0x44, 0x44, 0x54, 0x00, 0x45, 0x44, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00, 0x43, 0x53,
-0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00,
-0x00, 0x0A, 0x00, 0x00, 0x00, 0x21, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0x6C, 0xA1, 0x80, 0xFF, 0xFF,
-0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x60, 0xFB, 0xE0, 0xFF, 0xFF,
-0xFF, 0xFF, 0xF7, 0x2F, 0x3E, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0x69, 0xD0, 0x00, 0x00,
-0x00, 0x00, 0x13, 0x69, 0x47, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x2A, 0xE0, 0x00, 0x00,
-0x00, 0x00, 0x15, 0x49, 0x29, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x0C, 0xE0, 0x00, 0x00,
-0x00, 0x00, 0x17, 0x29, 0x0B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x29, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x19, 0x08, 0xED, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x0B, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x1A, 0xF2, 0x0A, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE1, 0xED, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x1C, 0xD1, 0xEC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xCF, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x1E, 0xB1, 0xCE, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xB1, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x20, 0x76, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0x93, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x22, 0x55, 0xE2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xAF, 0xE0, 0x00, 0x00,
-0x00, 0x00, 0x24, 0x35, 0xC4, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0x91, 0xE0, 0x00, 0x00,
-0x00, 0x00, 0x26, 0x15, 0xA6, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x73, 0xE0, 0x00, 0x00,
-0x00, 0x00, 0x27, 0xFE, 0xC3, 0x70, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x55, 0xE0, 0x00, 0x00,
-0x00, 0x00, 0x29, 0xDE, 0xA5, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x37, 0xE0, 0x00, 0x00,
-0x00, 0x00, 0x2B, 0xBE, 0x87, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x54, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x2D, 0x9E, 0x69, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x36, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x2F, 0x7E, 0x4B, 0x70, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x18, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x31, 0x67, 0x67, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0xFA, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x33, 0x47, 0x49, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xDC, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x35, 0x27, 0x2B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xBE, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x37, 0x07, 0x0D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xDA, 0xE0, 0x00, 0x00,
-0x00, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00, 0x00,
-0x00, 0x00, 0x3A, 0xC6, 0xD1, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x9E, 0xE0, 0x00, 0x00,
-0x00, 0x00, 0x3C, 0xAF, 0xEE, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x80, 0xE0, 0x00, 0x00,
-0x00, 0x00, 0x3E, 0x8F, 0xD0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x62, 0xE0, 0x00, 0x00,
-0x00, 0x00, 0x40, 0x6F, 0xB2, 0x70, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x7F, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x42, 0x4F, 0x94, 0x70, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x61, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x44, 0x2F, 0x76, 0x70, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x43, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x45, 0xF3, 0xA8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x47, 0x2D, 0x5F, 0xE0, 0x00, 0x00,
-0x00, 0x00, 0x47, 0xD3, 0x8A, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x49, 0x0D, 0x41, 0xE0, 0x00, 0x00,
-0x00, 0x00, 0x49, 0xB3, 0x6C, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xED, 0x23, 0xE0, 0x00, 0x00,
-0x00, 0x00, 0x4B, 0x9C, 0x89, 0x70, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x40, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x4D, 0x7C, 0x6B, 0x70, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x22, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x4F, 0x5C, 0x4D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x04, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x51, 0x3C, 0x2F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x52, 0x75, 0xE6, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x53, 0x1C, 0x11, 0x70, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xC8, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x54, 0xFB, 0xF3, 0x70, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xAA, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x56, 0xE5, 0x0F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xC6, 0xE0, 0x00, 0x00,
-0x00, 0x00, 0x58, 0xC4, 0xF1, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xA8, 0xE0, 0x00, 0x00,
-0x00, 0x00, 0x5A, 0xA4, 0xD3, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0x8A, 0xE0, 0x00, 0x00,
-0x00, 0x00, 0x5C, 0x84, 0xB5, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x6C, 0xE0, 0x00, 0x00,
-0x00, 0x00, 0x5E, 0x64, 0x97, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x4E, 0xE0, 0x00, 0x00,
-0x00, 0x00, 0x60, 0x4D, 0xB4, 0x70, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x6B, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x62, 0x2D, 0x96, 0x70, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x4D, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x64, 0x0D, 0x78, 0x70, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x2F, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x65, 0xED, 0x5A, 0x70, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x11, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x67, 0xCD, 0x3C, 0x70, 0x00, 0x00, 0x00, 0x00, 0x69, 0x06, 0xF3, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x69, 0xAD, 0x1E, 0x70, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xD5, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x6B, 0x96, 0x3A, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xCF, 0xF1, 0xE0, 0x00, 0x00,
-0x00, 0x00, 0x6D, 0x76, 0x1C, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xD3, 0xE0, 0x00, 0x00,
-0x00, 0x00, 0x6F, 0x55, 0xFE, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xB5, 0xE0, 0x00, 0x00,
-0x00, 0x00, 0x71, 0x35, 0xE0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0x97, 0xE0, 0x00, 0x00,
-0x00, 0x00, 0x73, 0x15, 0xC2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0x79, 0xE0, 0x00, 0x00,
-0x00, 0x00, 0x74, 0xFE, 0xDF, 0x70, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0x96, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x76, 0xDE, 0xC1, 0x70, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0x78, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x78, 0xBE, 0xA3, 0x70, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x5A, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x7A, 0x9E, 0x85, 0x70, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x3C, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x7C, 0x7E, 0x67, 0x70, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x1E, 0x60, 0x00, 0x00,
-0x00, 0x00, 0x7E, 0x5E, 0x49, 0x70, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x00, 0x60, 0x05, 0x01,
-0x02, 0x03, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x06, 0x07, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04,
-0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xC7,
-0xC0, 0x01, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x0C, 0xFF,
-0xFF, 0xC7, 0xC0, 0x01, 0x11, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x15, 0xFF, 0xFF, 0xAB, 0xA0, 0x00,
-0x19, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x1D, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x11, 0xFF, 0xFF, 0xB9,
-0xB0, 0x00, 0x08, 0x2D, 0x30, 0x30, 0x00, 0x45, 0x50, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x45,
-0x44, 0x44, 0x54, 0x00, 0x45, 0x44, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00,
-0x43, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x45, 0x53, 0x54, 0x35, 0x45, 0x44, 0x54,
-0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A,
-0x00, 0xEA, 0x94, 0x15, 0x00, 0xAA, 0x2F, 0xB5, 0x00, 0x00, 0x00, 0x1E, 0x45, 0x61, 0x73, 0x74,
-0x65, 0x72, 0x6E, 0x20, 0x2D, 0x20, 0x4E, 0x55, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x65,
-0x61, 0x73, 0x74, 0x20, 0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 
+0x00, 0x45, 0x44, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54,
+0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x1C, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCC, 0x6C, 0xA1, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x60, 0xFB, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x04, 0x60, 0xFD, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x05, 0x50, 0xE0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xDF, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x07, 0x30, 0xC2, 0x60, 0x00, 0x00, 0x00, 0x00, 0x08, 0x20, 0xC1, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x09, 0x10, 0xA4, 0x60, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0xA3, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x0A, 0xF0, 0x86, 0x60, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0x85, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x0C, 0xD9, 0xA2, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x67, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x0E, 0xB9, 0x84, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0x83, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x10, 0x99, 0x66, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x65, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x12, 0x79, 0x48, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x47, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x14, 0x59, 0x2A, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x29, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x16, 0x39, 0x0C, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x0B, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x18, 0x22, 0x29, 0x60, 0x00, 0x00, 0x00, 0x00, 0x19, 0x08, 0xED, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0x02, 0x0B, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x0A, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x1B, 0xE1, 0xED, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD1, 0xEC, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x1D, 0xC1, 0xCF, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xCE, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x1F, 0xA1, 0xB1, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x00, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x21, 0x81, 0x93, 0x60, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xE2, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x23, 0x6A, 0xAF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xC4, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x25, 0x4A, 0x91, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xA6, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x27, 0x2A, 0x73, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xC3, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x29, 0x0A, 0x55, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xA5, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x2A, 0xEA, 0x37, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0x87, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x2C, 0xD3, 0x54, 0x60, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x69, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x2E, 0xB3, 0x36, 0x60, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x4B, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x30, 0x93, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x67, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x32, 0x72, 0xFA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x49, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x34, 0x52, 0xDC, 0x60, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x2B, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x36, 0x32, 0xBE, 0x60, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x0D, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x38, 0x1B, 0xDA, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xD1, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x3B, 0xDB, 0x9E, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xEE, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x3D, 0xBB, 0x80, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xD0, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x3F, 0x9B, 0x62, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xB2, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x41, 0x84, 0x7F, 0x60, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0x94, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x43, 0x64, 0x61, 0x60, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x76, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x45, 0x44, 0x43, 0x60, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xA8, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x47, 0x2D, 0x5F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x47, 0xD3, 0x8A, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x49, 0x0D, 0x41, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x49, 0xB3, 0x6C, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x4A, 0xED, 0x23, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0x89, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x4C, 0xD6, 0x40, 0x60, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x6B, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x4E, 0xB6, 0x22, 0x60, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x4D, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x50, 0x96, 0x04, 0x60, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x2F, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x52, 0x75, 0xE6, 0x60, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x11, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x54, 0x55, 0xC8, 0x60, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFB, 0xF3, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x56, 0x35, 0xAA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x0F, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x58, 0x1E, 0xC6, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC4, 0xF1, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x59, 0xFE, 0xA8, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xD3, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x5B, 0xDE, 0x8A, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xB5, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x5D, 0xBE, 0x6C, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0x97, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x5F, 0x9E, 0x4E, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xB4, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x61, 0x87, 0x6B, 0x60, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0x96, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x63, 0x67, 0x4D, 0x60, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0x78, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x65, 0x47, 0x2F, 0x60, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x5A, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x67, 0x27, 0x11, 0x60, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x3C, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x69, 0x06, 0xF3, 0x60, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x1E, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x6A, 0xE6, 0xD5, 0x60, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x3A, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x6C, 0xCF, 0xF1, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x1C, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x6E, 0xAF, 0xD3, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x55, 0xFE, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x70, 0x8F, 0xB5, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x71, 0x35, 0xE0, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x72, 0x6F, 0x97, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xC2, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x74, 0x4F, 0x79, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFE, 0xDF, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x76, 0x38, 0x96, 0x60, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xC1, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x78, 0x18, 0x78, 0x60, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xA3, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x79, 0xF8, 0x5A, 0x60, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0x85, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x7B, 0xD8, 0x3C, 0x60, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x67, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x7D, 0xB8, 0x1E, 0x60, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x49, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x7F, 0x98, 0x00, 0x60, 0x04, 0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x05, 0x06, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08,
+0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x10, 0xFF, 0xFF, 0xAB, 0xA0,
+0x00, 0x14, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x18, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0xFF, 0xFF,
+0xB9, 0xB0, 0x00, 0x08, 0x2D, 0x30, 0x30, 0x00, 0x45, 0x50, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00,
+0x45, 0x44, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00,
+0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x0A, 0x45, 0x53, 0x54, 0x35, 0x45, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E,
+0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0xEA, 0x94, 0x15, 0x00, 0xAA,
+0x2F, 0xB5, 0x00, 0x00, 0x00, 0x19, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x2D, 0x20,
+0x4E, 0x55, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 
 
 /* America/Jamaica */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4A, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -33964,11 +34436,10 @@
 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
 0x00, 0x00, 0x0A, 0x43, 0x53, 0x54, 0x36, 0x43, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E,
 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0xB0, 0xBF, 0x65, 0x00, 0x7D,
-0xE2, 0x90, 0x00, 0x00, 0x00, 0x3E, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x54, 0x69,
-0x6D, 0x65, 0x20, 0x55, 0x53, 0x20, 0x2D, 0x20, 0x43, 0x6F, 0x61, 0x68, 0x75, 0x69, 0x6C, 0x61,
-0x2C, 0x20, 0x4E, 0x75, 0x65, 0x76, 0x6F, 0x20, 0x4C, 0x65, 0x6F, 0x6E, 0x2C, 0x20, 0x54, 0x61,
-0x6D, 0x61, 0x75, 0x6C, 0x69, 0x70, 0x61, 0x73, 0x20, 0x28, 0x55, 0x53, 0x20, 0x62, 0x6F, 0x72,
-0x64, 0x65, 0x72, 0x29, 
+0xE2, 0x90, 0x00, 0x00, 0x00, 0x2C, 0x43, 0x6F, 0x61, 0x68, 0x75, 0x69, 0x6C, 0x61, 0x2C, 0x20,
+0x4E, 0x75, 0x65, 0x76, 0x6F, 0x20, 0x4C, 0x65, 0x6F, 0x6E, 0x2C, 0x20, 0x54, 0x61, 0x6D, 0x61,
+0x75, 0x6C, 0x69, 0x70, 0x61, 0x73, 0x20, 0x28, 0x55, 0x53, 0x20, 0x62, 0x6F, 0x72, 0x64, 0x65,
+0x72, 0x29, 
 
 /* America/Mazatlan */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -34042,10 +34513,10 @@
 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00,
 0x50, 0x53, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x0A, 0x00, 0xAC, 0xC1, 0x42, 0x00, 0x70, 0x47, 0x7D,
-0x00, 0x00, 0x00, 0x35, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69, 0x6E, 0x20, 0x54, 0x69, 0x6D,
-0x65, 0x20, 0x2D, 0x20, 0x42, 0x61, 0x6A, 0x61, 0x20, 0x43, 0x61, 0x6C, 0x69, 0x66, 0x6F, 0x72,
+0x00, 0x00, 0x00, 0x32, 0x42, 0x61, 0x6A, 0x61, 0x20, 0x43, 0x61, 0x6C, 0x69, 0x66, 0x6F, 0x72,
 0x6E, 0x69, 0x61, 0x20, 0x53, 0x75, 0x72, 0x2C, 0x20, 0x4E, 0x61, 0x79, 0x61, 0x72, 0x69, 0x74,
-0x2C, 0x20, 0x53, 0x69, 0x6E, 0x61, 0x6C, 0x6F, 0x61, 
+0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 0x2C, 0x20, 0x53,
+0x69, 0x6E, 0x61, 0x6C, 0x6F, 0x61, 
 
 /* America/Mendoza */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -34328,9 +34799,8 @@
 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0C, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00,
 0x43, 0x53, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00,
 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0A, 0x43, 0x53, 0x54, 0x36, 0x0A, 0x00, 0xA9, 0x52, 0x5A,
-0x00, 0x89, 0xE9, 0xFD, 0x00, 0x00, 0x00, 0x20, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20,
-0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x43, 0x61, 0x6D, 0x70, 0x65, 0x63, 0x68, 0x65, 0x2C,
-0x20, 0x59, 0x75, 0x63, 0x61, 0x74, 0x61, 0x6E, 
+0x00, 0x89, 0xE9, 0xFD, 0x00, 0x00, 0x00, 0x11, 0x43, 0x61, 0x6D, 0x70, 0x65, 0x63, 0x68, 0x65,
+0x2C, 0x20, 0x59, 0x75, 0x63, 0x61, 0x74, 0x61, 0x6E, 
 
 /* America/Metlakatla */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x55, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -34504,7 +34974,8 @@
 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x57, 0x54, 0x00,
 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x0A, 0x43, 0x53, 0x54, 0x36, 0x0A, 0x00, 0xA6, 0xEE, 0x60, 0x00, 0x7B, 0x5E, 0x07, 0x00, 0x00,
-0x00, 0x0C, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x54, 0x69, 0x6D, 0x65, 
+0x00, 0x0E, 0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x4D, 0x65, 0x78, 0x69, 0x63, 0x6F,
+
 
 /* America/Miquelon */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x50, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -34877,12 +35348,11 @@
 0x02, 0x03, 0xFF, 0xFF, 0xA1, 0xF4, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0xFF, 0xFF,
 0xB9, 0xB0, 0x01, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x43, 0x53,
 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x0A, 0x43,
-0x53, 0x54, 0x36, 0x0A, 0x00, 0xB0, 0x7E, 0x4A, 0x00, 0x79, 0x96, 0x4D, 0x00, 0x00, 0x00, 0x45,
-0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x44,
-0x75, 0x72, 0x61, 0x6E, 0x67, 0x6F, 0x3B, 0x20, 0x43, 0x6F, 0x61, 0x68, 0x75, 0x69, 0x6C, 0x61,
-0x2C, 0x20, 0x4E, 0x75, 0x65, 0x76, 0x6F, 0x20, 0x4C, 0x65, 0x6F, 0x6E, 0x2C, 0x20, 0x54, 0x61,
-0x6D, 0x61, 0x75, 0x6C, 0x69, 0x70, 0x61, 0x73, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x61,
-0x72, 0x65, 0x61, 0x73, 0x29, 
+0x53, 0x54, 0x36, 0x0A, 0x00, 0xB0, 0x7E, 0x4A, 0x00, 0x79, 0x96, 0x4D, 0x00, 0x00, 0x00, 0x36,
+0x44, 0x75, 0x72, 0x61, 0x6E, 0x67, 0x6F, 0x3B, 0x20, 0x43, 0x6F, 0x61, 0x68, 0x75, 0x69, 0x6C,
+0x61, 0x2C, 0x20, 0x4E, 0x75, 0x65, 0x76, 0x6F, 0x20, 0x4C, 0x65, 0x6F, 0x6E, 0x2C, 0x20, 0x54,
+0x61, 0x6D, 0x61, 0x75, 0x6C, 0x69, 0x70, 0x61, 0x73, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20,
+0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 
 
 /* America/Montevideo */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x55, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -36483,8 +36953,8 @@
 
 /* America/Nuuk */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x47, 0x4C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x75, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x0C, 0x9B, 0x80, 0x68, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x75, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x10, 0x9B, 0x80, 0x68, 0x00,
 0x13, 0x4D, 0x7C, 0x50, 0x14, 0x33, 0xFA, 0x90, 0x15, 0x23, 0xEB, 0x90, 0x16, 0x13, 0xDC, 0x90,
 0x17, 0x03, 0xCD, 0x90, 0x17, 0xF3, 0xBE, 0x90, 0x18, 0xE3, 0xAF, 0x90, 0x19, 0xD3, 0xA0, 0x90,
 0x1A, 0xC3, 0x91, 0x90, 0x1B, 0xBC, 0xBD, 0x10, 0x1C, 0xAC, 0xAE, 0x10, 0x1D, 0x9C, 0x9F, 0x10,
@@ -36519,93 +36989,95 @@
 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0xFF, 0xFF, 0xCF, 0x80, 0x00, 0x00, 0xFF, 0xFF, 0xD5, 0xD0, 0x00,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06,
+0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06,
+0x05, 0x06, 0x05, 0x06, 0x05, 0xFF, 0xFF, 0xCF, 0x80, 0x00, 0x00, 0xFF, 0xFF, 0xD5, 0xD0, 0x00,
 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x08, 0xFF, 0xFF, 0xE3,
-0xE0, 0x01, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x33, 0x00, 0x2D, 0x30, 0x32, 0x00, 0x00,
-0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x33, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x75, 0x00, 0x00, 0x00,
-0x05, 0x00, 0x00, 0x00, 0x0C, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x80, 0x68, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x13, 0x4D, 0x7C, 0x50, 0x00, 0x00, 0x00, 0x00, 0x14, 0x33, 0xFA, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x16, 0x13, 0xDC, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xBE, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0xA0, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xBD, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x9F, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0xB4, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0x96, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0x78, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0x94, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x38, 0xDD, 0x61, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0x76, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x58, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x3A, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x3E, 0x86, 0x41, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x1C, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x40, 0x66, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x39, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x42, 0x46, 0x05, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x1B, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x44, 0x25, 0xE7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x43, 0xFD, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x46, 0x05, 0xC9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x47, 0x23, 0xDF, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x03, 0xC1, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xA3, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCC, 0xBF, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xA1, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0x83, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x51, 0x57, 0x8A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0x65, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x53, 0x37, 0x6C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x47, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x55, 0x17, 0x4E, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x29, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x56, 0xF7, 0x30, 0x90, 0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0x46, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x58, 0xD7, 0x12, 0x90, 0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x28, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x0A, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xB4, 0xEC, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x94, 0xCE, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00, 0x00, 0x00, 0x00, 0x61, 0x7D, 0xEA, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5D, 0xCC, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x64, 0x1F, 0x99, 0x10, 0x00, 0x00, 0x00, 0x00, 0x65, 0x3D, 0xAE, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x66, 0x08, 0xB5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0x1D, 0x90, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x67, 0xE8, 0x97, 0x90, 0x00, 0x00, 0x00, 0x00, 0x68, 0xFD, 0x72, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x69, 0xC8, 0x79, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xDD, 0x54, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x6B, 0xA8, 0x5B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xC6, 0x71, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x6D, 0x88, 0x3D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xA6, 0x53, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x6F, 0x68, 0x1F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x70, 0x86, 0x35, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x71, 0x51, 0x3C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72, 0x66, 0x17, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x73, 0x31, 0x1E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74, 0x45, 0xF9, 0x10, 0x00, 0x00, 0x00,
-0x00, 0x75, 0x11, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x76, 0x2F, 0x15, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x76, 0xF0, 0xE2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0E, 0xF7, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x78, 0xD0, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x79, 0xEE, 0xD9, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x7A, 0xB0, 0xA6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xCE, 0xBB, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x7C, 0x99, 0xC2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xAE, 0x9D, 0x90, 0x00, 0x00, 0x00,
-0x00, 0x7E, 0x79, 0xA4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x8E, 0x7F, 0x90, 0x01, 0x04, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0xE0, 0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x00, 0x08, 0xFF, 0xFF, 0xF1, 0xF0, 0x01, 0x0C, 0x4C,
+0x4D, 0x54, 0x00, 0x2D, 0x30, 0x33, 0x00, 0x2D, 0x30, 0x32, 0x00, 0x2D, 0x30, 0x31, 0x00, 0x00,
+0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x54, 0x5A, 0x69,
+0x66, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x75, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x9B, 0x80, 0x68,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x4D, 0x7C, 0x50, 0x00, 0x00, 0x00, 0x00, 0x14, 0x33, 0xFA,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x15, 0x23, 0xEB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x16, 0x13, 0xDC,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0x03, 0xCD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x17, 0xF3, 0xBE,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x18, 0xE3, 0xAF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x19, 0xD3, 0xA0,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xC3, 0x91, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0xBD,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0xAE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x9F,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x81,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x72, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x63,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x54, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x45,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x36, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x27,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0C, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x43,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x34, 0x90, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE5, 0x25,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD5, 0x16, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC5, 0x07,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xF8, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xE9,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xDA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xCB,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xBC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0xAD,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xD9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0xB4,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0xBB, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0x96,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x9D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0x78,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x7F, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0x94,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x61, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0x76,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x43, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x58,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x5F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x3A,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x41, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x1C,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x23, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x39,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x42, 0x46, 0x05, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x1B,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xE7, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x43, 0xFD,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xC9, 0x90, 0x00, 0x00, 0x00, 0x00, 0x47, 0x23, 0xDF,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xE6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x03, 0xC1,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xC8, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0xA3,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0xAA, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCC, 0xBF,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x8C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xAC, 0xA1,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x6E, 0x6E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x50, 0x8C, 0x83,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x51, 0x57, 0x8A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52, 0x6C, 0x65,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x53, 0x37, 0x6C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x47,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x55, 0x17, 0x4E, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0x2C, 0x29,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0xF7, 0x30, 0x90, 0x00, 0x00, 0x00, 0x00, 0x58, 0x15, 0x46,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0xD7, 0x12, 0x90, 0x00, 0x00, 0x00, 0x00, 0x59, 0xF5, 0x28,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xB6, 0xF4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xD5, 0x0A,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x5C, 0xA0, 0x11, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xB4, 0xEC,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7F, 0xF3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x94, 0xCE,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5F, 0xD5, 0x10, 0x00, 0x00, 0x00, 0x00, 0x61, 0x7D, 0xEA,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0xB7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5D, 0xCC,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1F, 0x99, 0x10, 0x00, 0x00, 0x00, 0x00, 0x65, 0x3D, 0xAE,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x66, 0x08, 0xB5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0x1D, 0x90,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE8, 0x97, 0x90, 0x00, 0x00, 0x00, 0x00, 0x68, 0xFD, 0x72,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC8, 0x79, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xDD, 0x54,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA8, 0x5B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xC6, 0x71,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x88, 0x3D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xA6, 0x53,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x68, 0x1F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x70, 0x86, 0x35,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x71, 0x51, 0x3C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72, 0x66, 0x17,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x73, 0x31, 0x1E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74, 0x45, 0xF9,
+0x10, 0x00, 0x00, 0x00, 0x00, 0x75, 0x11, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x76, 0x2F, 0x15,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0xF0, 0xE2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0E, 0xF7,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0xD0, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x79, 0xEE, 0xD9,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xB0, 0xA6, 0x10, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xCE, 0xBB,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x99, 0xC2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xAE, 0x9D,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x79, 0xA4, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x8E, 0x7F,
+0x90, 0x01, 0x04, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0xFF, 0xFF, 0xCF, 0x80, 0x00, 0x00, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF,
-0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x08,
-0x4C, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x33, 0x00, 0x2D, 0x30, 0x32, 0x00, 0x00, 0x00, 0x01, 0x01,
-0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x0A, 0x3C, 0x2D, 0x30, 0x33, 0x3E, 0x33, 0x3C, 0x2D, 0x30,
-0x32, 0x3E, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x2D, 0x32, 0x2C, 0x4D, 0x31, 0x30,
-0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x2D, 0x31, 0x0A, 0x00, 0xEB, 0x43, 0xDD, 0x00, 0xC3, 0xB8, 0x2A,
-0x00, 0x00, 0x00, 0x16, 0x47, 0x72, 0x65, 0x65, 0x6E, 0x6C, 0x61, 0x6E, 0x64, 0x20, 0x28, 0x6D,
-0x6F, 0x73, 0x74, 0x20, 0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05,
+0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05,
+0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0xFF, 0xFF, 0xCF, 0x80, 0x00, 0x00, 0xFF, 0xFF, 0xD5, 0xD0,
+0x00, 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x08, 0xFF, 0xFF,
+0xE3, 0xE0, 0x01, 0x08, 0xFF, 0xFF, 0xE3, 0xE0, 0x00, 0x08, 0xFF, 0xFF, 0xF1, 0xF0, 0x01, 0x0C,
+0x4C, 0x4D, 0x54, 0x00, 0x2D, 0x30, 0x33, 0x00, 0x2D, 0x30, 0x32, 0x00, 0x2D, 0x30, 0x31, 0x00,
+0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x0A, 0x3C,
+0x2D, 0x30, 0x32, 0x3E, 0x32, 0x3C, 0x2D, 0x30, 0x31, 0x3E, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E,
+0x30, 0x2F, 0x2D, 0x31, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x30, 0x0A, 0x00,
+0xEB, 0x43, 0xDD, 0x00, 0xC3, 0xB8, 0x2A, 0x00, 0x00, 0x00, 0x11, 0x6D, 0x6F, 0x73, 0x74, 0x20,
+0x6F, 0x66, 0x20, 0x47, 0x72, 0x65, 0x65, 0x6E, 0x6C, 0x61, 0x6E, 0x64, 
 
 /* America/Ojinaga */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x14, 0xA5, 0xB6, 0xE8, 0x70,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x5A, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xA5, 0xB6, 0xE8, 0x70,
 0xAF, 0xF2, 0x6E, 0xE0, 0xB6, 0x66, 0x56, 0x60, 0xB7, 0x43, 0xD2, 0x60, 0xB8, 0x0C, 0x36, 0x60,
 0xB8, 0xFD, 0x86, 0xF0, 0x31, 0x67, 0x76, 0x00, 0x32, 0x73, 0x08, 0x70, 0x33, 0x47, 0x58, 0x00,
 0x34, 0x52, 0xEA, 0x70, 0x35, 0x27, 0x48, 0x10, 0x36, 0x32, 0xDA, 0x80, 0x37, 0x07, 0x2A, 0x10,
@@ -36620,62 +37092,87 @@
 0x56, 0x35, 0xC6, 0x80, 0x56, 0xE5, 0x2C, 0x10, 0x58, 0x1E, 0xE3, 0x00, 0x58, 0xC5, 0x0E, 0x10,
 0x59, 0xFE, 0xC5, 0x00, 0x5A, 0xA4, 0xF0, 0x10, 0x5B, 0xDE, 0xA7, 0x00, 0x5C, 0x84, 0xD2, 0x10,
 0x5D, 0xBE, 0x89, 0x00, 0x5E, 0x64, 0xB4, 0x10, 0x5F, 0x9E, 0x6B, 0x00, 0x60, 0x4D, 0xD0, 0x90,
-0x61, 0x87, 0x87, 0x80, 0x62, 0x2D, 0xB2, 0x90, 0x63, 0x5E, 0x2F, 0x00, 0x01, 0x02, 0x04, 0x03,
-0x04, 0x02, 0x05, 0x02, 0x05, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x61, 0x87, 0x87, 0x80, 0x62, 0x2D, 0xB2, 0x90, 0x63, 0x5E, 0x2F, 0x00, 0x64, 0x0D, 0x86, 0x80,
+0x65, 0x47, 0x3D, 0x70, 0x65, 0xED, 0x68, 0x80, 0x67, 0x27, 0x1F, 0x70, 0x67, 0xCD, 0x4A, 0x80,
+0x69, 0x07, 0x01, 0x70, 0x69, 0xAD, 0x2C, 0x80, 0x6A, 0xE6, 0xE3, 0x70, 0x6B, 0x96, 0x49, 0x00,
+0x6C, 0xCF, 0xFF, 0xF0, 0x6D, 0x76, 0x2B, 0x00, 0x6E, 0xAF, 0xE1, 0xF0, 0x6F, 0x56, 0x0D, 0x00,
+0x70, 0x8F, 0xC3, 0xF0, 0x71, 0x35, 0xEF, 0x00, 0x72, 0x6F, 0xA5, 0xF0, 0x73, 0x15, 0xD1, 0x00,
+0x74, 0x4F, 0x87, 0xF0, 0x74, 0xFE, 0xED, 0x80, 0x76, 0x38, 0xA4, 0x70, 0x76, 0xDE, 0xCF, 0x80,
+0x78, 0x18, 0x86, 0x70, 0x78, 0xBE, 0xB1, 0x80, 0x79, 0xF8, 0x68, 0x70, 0x7A, 0x9E, 0x93, 0x80,
+0x7B, 0xD8, 0x4A, 0x70, 0x7C, 0x7E, 0x75, 0x80, 0x7D, 0xB8, 0x2C, 0x70, 0x7E, 0x5E, 0x57, 0x80,
+0x7F, 0x98, 0x0E, 0x70, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x05, 0x02, 0x05, 0x02, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x02, 0xFF, 0xFF, 0x9E, 0x1C, 0x00, 0x00, 0xFF, 0xFF,
-0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C,
-0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x10, 0xFF, 0xFF, 0xAB, 0xA0,
-0x01, 0x0C, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x02,
+0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02,
+0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0xFF, 0xFF,
+0x9E, 0x1C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08,
+0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0,
+0x01, 0x10, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00,
 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66,
-0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C,
-0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70,
-0xFF, 0xFF, 0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60,
-0xFF, 0xFF, 0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60,
-0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x0C, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xD9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xF5, 0x12, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x3B, 0xB6, 0xD1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x0A, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x9D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xEC, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x9B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x7D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x92, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x5F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x74, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x47, 0x24, 0x41, 0x80, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x91, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x49, 0x04, 0x23, 0x80, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x73, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x4A, 0xE4, 0x05, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0xA5, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x5C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x87, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x3E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x69, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x4B, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x52, 0x76, 0x02, 0x80, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x2D, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xE4, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFC, 0x0F, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xC6, 0x80, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x2C, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xE3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC5, 0x0E, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xC5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xF0, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0xA7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xD2, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x89, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0xB4, 0x10,
-0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x6B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xD0, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x87, 0x80, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0xB2, 0x90,
-0x00, 0x00, 0x00, 0x00, 0x63, 0x5E, 0x2F, 0x00, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x05, 0x02,
-0x05, 0x02, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5A, 0x00, 0x00,
+0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0xB6, 0xE8, 0x70, 0xFF, 0xFF,
+0xFF, 0xFF, 0xAF, 0xF2, 0x6E, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xB6, 0x66, 0x56, 0x60, 0xFF, 0xFF,
+0xFF, 0xFF, 0xB7, 0x43, 0xD2, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xB8, 0x0C, 0x36, 0x60, 0xFF, 0xFF,
+0xFF, 0xFF, 0xB8, 0xFD, 0x86, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x36, 0x32, 0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x38, 0x1B, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x39, 0xFB, 0xD9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xF5, 0x12, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x3B, 0xB6, 0xD1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x3D, 0xBB, 0x9D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x3F, 0x9B, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x41, 0x84, 0x9B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x43, 0x64, 0x7D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x92, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x45, 0x44, 0x5F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x46, 0x0F, 0x74, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x47, 0x24, 0x41, 0x80, 0x00, 0x00, 0x00, 0x00, 0x47, 0xF8, 0x91, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x49, 0x04, 0x23, 0x80, 0x00, 0x00, 0x00, 0x00, 0x49, 0xD8, 0x73, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x4A, 0xE4, 0x05, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0xA5, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x4C, 0xD6, 0x5C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x87, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x4E, 0xB6, 0x3E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x69, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x50, 0x96, 0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x4B, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x52, 0x76, 0x02, 0x80, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x2D, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x54, 0x55, 0xE4, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFC, 0x0F, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x56, 0x35, 0xC6, 0x80, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x2C, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x58, 0x1E, 0xE3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC5, 0x0E, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x59, 0xFE, 0xC5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xF0, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x5B, 0xDE, 0xA7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xD2, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x5D, 0xBE, 0x89, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0xB4, 0x10, 0x00, 0x00,
+0x00, 0x00, 0x5F, 0x9E, 0x6B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xD0, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x61, 0x87, 0x87, 0x80, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0xB2, 0x90, 0x00, 0x00,
+0x00, 0x00, 0x63, 0x5E, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0x86, 0x80, 0x00, 0x00,
+0x00, 0x00, 0x65, 0x47, 0x3D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x68, 0x80, 0x00, 0x00,
+0x00, 0x00, 0x67, 0x27, 0x1F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x4A, 0x80, 0x00, 0x00,
+0x00, 0x00, 0x69, 0x07, 0x01, 0x70, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x2C, 0x80, 0x00, 0x00,
+0x00, 0x00, 0x6A, 0xE6, 0xE3, 0x70, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x49, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x6C, 0xCF, 0xFF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x2B, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x6E, 0xAF, 0xE1, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x56, 0x0D, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x70, 0x8F, 0xC3, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x71, 0x35, 0xEF, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x72, 0x6F, 0xA5, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xD1, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x74, 0x4F, 0x87, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFE, 0xED, 0x80, 0x00, 0x00,
+0x00, 0x00, 0x76, 0x38, 0xA4, 0x70, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xCF, 0x80, 0x00, 0x00,
+0x00, 0x00, 0x78, 0x18, 0x86, 0x70, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xB1, 0x80, 0x00, 0x00,
+0x00, 0x00, 0x79, 0xF8, 0x68, 0x70, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0x93, 0x80, 0x00, 0x00,
+0x00, 0x00, 0x7B, 0xD8, 0x4A, 0x70, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x75, 0x80, 0x00, 0x00,
+0x00, 0x00, 0x7D, 0xB8, 0x2C, 0x70, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x57, 0x80, 0x00, 0x00,
+0x00, 0x00, 0x7F, 0x98, 0x0E, 0x70, 0x01, 0x02, 0x04, 0x03, 0x04, 0x02, 0x05, 0x02, 0x05, 0x02,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x02, 0xFF, 0xFF, 0x9E, 0x1C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04,
-0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90,
-0x00, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x10, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF,
-0xAB, 0xA0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00,
-0x4D, 0x44, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x43, 0x53, 0x54, 0x36, 0x0A, 0x00, 0xB6,
-0x71, 0xBA, 0x00, 0x73, 0x54, 0xBD, 0x00, 0x00, 0x00, 0x28, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61,
-0x69, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x55, 0x53, 0x20, 0x2D, 0x20, 0x43, 0x68, 0x69,
-0x68, 0x75, 0x61, 0x68, 0x75, 0x61, 0x20, 0x28, 0x55, 0x53, 0x20, 0x62, 0x6F, 0x72, 0x64, 0x65,
-0x72, 0x29, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02,
+0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02, 0x05, 0x02,
+0xFF, 0xFF, 0x9E, 0x1C, 0x00, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0,
+0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF,
+0xB9, 0xB0, 0x01, 0x10, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x53,
+0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x01,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x43, 0x53, 0x54,
+0x36, 0x43, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E,
+0x31, 0x2E, 0x30, 0x0A, 0x00, 0xB6, 0x71, 0xBA, 0x00, 0x73, 0x54, 0xBD, 0x00, 0x00, 0x00, 0x1C,
+0x43, 0x68, 0x69, 0x68, 0x75, 0x61, 0x68, 0x75, 0x61, 0x20, 0x28, 0x55, 0x53, 0x20, 0x62, 0x6F,
+0x72, 0x64, 0x65, 0x72, 0x20, 0x2D, 0x20, 0x65, 0x61, 0x73, 0x74, 0x29, 
 
 /* America/Panama */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x50, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -36693,140 +37190,145 @@
 0x00, 0x00, 
 
 /* America/Pangnirtung */
-0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x41, 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, 0x7A, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x29, 0xA3, 0xD5, 0x52, 0x80,
-0xCB, 0x88, 0xE2, 0x60, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x60, 0xED, 0xD0, 0xF7, 0x2F, 0x30, 0x40,
-0xF8, 0x28, 0x5B, 0xC0, 0x13, 0x69, 0x39, 0xE0, 0x14, 0x59, 0x1C, 0xD0, 0x15, 0x49, 0x1B, 0xE0,
-0x16, 0x38, 0xFE, 0xD0, 0x17, 0x28, 0xFD, 0xE0, 0x18, 0x22, 0x1B, 0x50, 0x19, 0x08, 0xDF, 0xE0,
-0x1A, 0x01, 0xFD, 0x50, 0x1A, 0xF1, 0xFC, 0x60, 0x1B, 0xE1, 0xDF, 0x50, 0x1C, 0xD1, 0xDE, 0x60,
-0x1D, 0xC1, 0xC1, 0x50, 0x1E, 0xB1, 0xC0, 0x60, 0x1F, 0xA1, 0xA3, 0x50, 0x20, 0x75, 0xF2, 0xE0,
-0x21, 0x81, 0x85, 0x50, 0x22, 0x55, 0xD4, 0xE0, 0x23, 0x6A, 0xA1, 0xD0, 0x24, 0x35, 0xB6, 0xE0,
-0x25, 0x4A, 0x83, 0xD0, 0x26, 0x15, 0x98, 0xE0, 0x27, 0x2A, 0x65, 0xD0, 0x27, 0xFE, 0xB5, 0x60,
-0x29, 0x0A, 0x47, 0xD0, 0x29, 0xDE, 0x97, 0x60, 0x2A, 0xEA, 0x29, 0xD0, 0x2B, 0xBE, 0x79, 0x60,
-0x2C, 0xD3, 0x46, 0x50, 0x2D, 0x9E, 0x5B, 0x60, 0x2E, 0xB3, 0x28, 0x50, 0x2F, 0x7E, 0x3D, 0x60,
-0x30, 0x93, 0x18, 0x60, 0x31, 0x67, 0x67, 0xF0, 0x32, 0x72, 0xFA, 0x60, 0x33, 0x47, 0x49, 0xF0,
-0x34, 0x52, 0xDC, 0x60, 0x35, 0x27, 0x2B, 0xF0, 0x36, 0x32, 0xBE, 0x60, 0x37, 0x07, 0x0D, 0xF0,
-0x38, 0x1B, 0xDA, 0xE0, 0x38, 0xE6, 0xFE, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x3A, 0xC6, 0xD1, 0xF0,
-0x3B, 0xDB, 0x9E, 0xE0, 0x3C, 0xAF, 0xEE, 0x70, 0x3D, 0xBB, 0x80, 0xE0, 0x3E, 0x8F, 0xD0, 0x70,
-0x3F, 0x9B, 0x62, 0xE0, 0x40, 0x6F, 0xB2, 0x70, 0x41, 0x84, 0x7F, 0x60, 0x42, 0x4F, 0x94, 0x70,
-0x43, 0x64, 0x61, 0x60, 0x44, 0x2F, 0x76, 0x70, 0x45, 0x44, 0x43, 0x60, 0x45, 0xF3, 0xA8, 0xF0,
-0x47, 0x2D, 0x5F, 0xE0, 0x47, 0xD3, 0x8A, 0xF0, 0x49, 0x0D, 0x41, 0xE0, 0x49, 0xB3, 0x6C, 0xF0,
-0x4A, 0xED, 0x23, 0xE0, 0x4B, 0x9C, 0x89, 0x70, 0x4C, 0xD6, 0x40, 0x60, 0x4D, 0x7C, 0x6B, 0x70,
-0x4E, 0xB6, 0x22, 0x60, 0x4F, 0x5C, 0x4D, 0x70, 0x50, 0x96, 0x04, 0x60, 0x51, 0x3C, 0x2F, 0x70,
-0x52, 0x75, 0xE6, 0x60, 0x53, 0x1C, 0x11, 0x70, 0x54, 0x55, 0xC8, 0x60, 0x54, 0xFB, 0xF3, 0x70,
-0x56, 0x35, 0xAA, 0x60, 0x56, 0xE5, 0x0F, 0xF0, 0x58, 0x1E, 0xC6, 0xE0, 0x58, 0xC4, 0xF1, 0xF0,
-0x59, 0xFE, 0xA8, 0xE0, 0x5A, 0xA4, 0xD3, 0xF0, 0x5B, 0xDE, 0x8A, 0xE0, 0x5C, 0x84, 0xB5, 0xF0,
-0x5D, 0xBE, 0x6C, 0xE0, 0x5E, 0x64, 0x97, 0xF0, 0x5F, 0x9E, 0x4E, 0xE0, 0x60, 0x4D, 0xB4, 0x70,
-0x61, 0x87, 0x6B, 0x60, 0x62, 0x2D, 0x96, 0x70, 0x63, 0x67, 0x4D, 0x60, 0x64, 0x0D, 0x78, 0x70,
-0x65, 0x47, 0x2F, 0x60, 0x65, 0xED, 0x5A, 0x70, 0x67, 0x27, 0x11, 0x60, 0x67, 0xCD, 0x3C, 0x70,
-0x69, 0x06, 0xF3, 0x60, 0x69, 0xAD, 0x1E, 0x70, 0x6A, 0xE6, 0xD5, 0x60, 0x6B, 0x96, 0x3A, 0xF0,
-0x6C, 0xCF, 0xF1, 0xE0, 0x6D, 0x76, 0x1C, 0xF0, 0x6E, 0xAF, 0xD3, 0xE0, 0x6F, 0x55, 0xFE, 0xF0,
-0x70, 0x8F, 0xB5, 0xE0, 0x71, 0x35, 0xE0, 0xF0, 0x72, 0x6F, 0x97, 0xE0, 0x73, 0x15, 0xC2, 0xF0,
-0x74, 0x4F, 0x79, 0xE0, 0x74, 0xFE, 0xDF, 0x70, 0x76, 0x38, 0x96, 0x60, 0x76, 0xDE, 0xC1, 0x70,
-0x78, 0x18, 0x78, 0x60, 0x78, 0xBE, 0xA3, 0x70, 0x79, 0xF8, 0x5A, 0x60, 0x7A, 0x9E, 0x85, 0x70,
-0x7B, 0xD8, 0x3C, 0x60, 0x7C, 0x7E, 0x67, 0x70, 0x7D, 0xB8, 0x1E, 0x60, 0x7E, 0x5E, 0x49, 0x70,
-0x7F, 0x98, 0x00, 0x60, 0x03, 0x01, 0x02, 0x03, 0x04, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03,
-0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03,
-0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07,
-0x06, 0x08, 0x09, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07,
-0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07,
-0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07,
-0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07,
-0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x08,
-0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x0C, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x10, 0xFF, 0xFF, 0xD5, 0xD0,
-0x01, 0x15, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x19, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x1D, 0xFF, 0xFF,
-0xAB, 0xA0, 0x00, 0x21, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x25, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x19,
-0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x1D, 0x2D, 0x30, 0x30, 0x00, 0x41, 0x57, 0x54, 0x00, 0x41, 0x50,
-0x54, 0x00, 0x41, 0x53, 0x54, 0x00, 0x41, 0x44, 0x44, 0x54, 0x00, 0x41, 0x44, 0x54, 0x00, 0x45,
-0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00,
-0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 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, 0x7A, 0x00, 0x00, 0x00, 0x0C, 0x00,
-0x00, 0x00, 0x29, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0xD5, 0x52, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB,
-0x88, 0xE2, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2,
-0x60, 0xED, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x2F, 0x30, 0x40, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8,
-0x28, 0x5B, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x39, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x14,
-0x59, 0x1C, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x1B, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x16,
-0x38, 0xFE, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x17, 0x28, 0xFD, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x18,
-0x22, 0x1B, 0x50, 0x00, 0x00, 0x00, 0x00, 0x19, 0x08, 0xDF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x1A,
-0x01, 0xFD, 0x50, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF1, 0xFC, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1B,
-0xE1, 0xDF, 0x50, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD1, 0xDE, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1D,
-0xC1, 0xC1, 0x50, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xC0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1F,
-0xA1, 0xA3, 0x50, 0x00, 0x00, 0x00, 0x00, 0x20, 0x75, 0xF2, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x21,
-0x81, 0x85, 0x50, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xD4, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x23,
-0x6A, 0xA1, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xB6, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x25,
-0x4A, 0x83, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0x98, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x27,
-0x2A, 0x65, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xB5, 0x60, 0x00, 0x00, 0x00, 0x00, 0x29,
-0x0A, 0x47, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0x97, 0x60, 0x00, 0x00, 0x00, 0x00, 0x2A,
-0xEA, 0x29, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0x79, 0x60, 0x00, 0x00, 0x00, 0x00, 0x2C,
-0xD3, 0x46, 0x50, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x5B, 0x60, 0x00, 0x00, 0x00, 0x00, 0x2E,
-0xB3, 0x28, 0x50, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x3D, 0x60, 0x00, 0x00, 0x00, 0x00, 0x30,
-0x93, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x67, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x32,
-0x72, 0xFA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x49, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x34,
-0x52, 0xDC, 0x60, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x2B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x36,
-0x32, 0xBE, 0x60, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x0D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x38,
-0x1B, 0xDA, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39,
-0xFB, 0xCA, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xD1, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3B,
-0xDB, 0x9E, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xEE, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3D,
-0xBB, 0x80, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xD0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3F,
-0x9B, 0x62, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xB2, 0x70, 0x00, 0x00, 0x00, 0x00, 0x41,
-0x84, 0x7F, 0x60, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0x94, 0x70, 0x00, 0x00, 0x00, 0x00, 0x43,
-0x64, 0x61, 0x60, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x76, 0x70, 0x00, 0x00, 0x00, 0x00, 0x45,
-0x44, 0x43, 0x60, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xA8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x47,
-0x2D, 0x5F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x47, 0xD3, 0x8A, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x49,
-0x0D, 0x41, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x49, 0xB3, 0x6C, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4A,
-0xED, 0x23, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0x89, 0x70, 0x00, 0x00, 0x00, 0x00, 0x4C,
-0xD6, 0x40, 0x60, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x6B, 0x70, 0x00, 0x00, 0x00, 0x00, 0x4E,
-0xB6, 0x22, 0x60, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x4D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x50,
-0x96, 0x04, 0x60, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x2F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x52,
-0x75, 0xE6, 0x60, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x11, 0x70, 0x00, 0x00, 0x00, 0x00, 0x54,
-0x55, 0xC8, 0x60, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFB, 0xF3, 0x70, 0x00, 0x00, 0x00, 0x00, 0x56,
-0x35, 0xAA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x0F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x58,
-0x1E, 0xC6, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC4, 0xF1, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x59,
-0xFE, 0xA8, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xD3, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x5B,
-0xDE, 0x8A, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xB5, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x5D,
-0xBE, 0x6C, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0x97, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x5F,
-0x9E, 0x4E, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xB4, 0x70, 0x00, 0x00, 0x00, 0x00, 0x61,
-0x87, 0x6B, 0x60, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0x96, 0x70, 0x00, 0x00, 0x00, 0x00, 0x63,
-0x67, 0x4D, 0x60, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0x78, 0x70, 0x00, 0x00, 0x00, 0x00, 0x65,
-0x47, 0x2F, 0x60, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x5A, 0x70, 0x00, 0x00, 0x00, 0x00, 0x67,
-0x27, 0x11, 0x60, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x3C, 0x70, 0x00, 0x00, 0x00, 0x00, 0x69,
-0x06, 0xF3, 0x60, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x1E, 0x70, 0x00, 0x00, 0x00, 0x00, 0x6A,
-0xE6, 0xD5, 0x60, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x3A, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x6C,
-0xCF, 0xF1, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x1C, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x6E,
-0xAF, 0xD3, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x55, 0xFE, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x70,
-0x8F, 0xB5, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x71, 0x35, 0xE0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x72,
-0x6F, 0x97, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xC2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x74,
-0x4F, 0x79, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFE, 0xDF, 0x70, 0x00, 0x00, 0x00, 0x00, 0x76,
-0x38, 0x96, 0x60, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xC1, 0x70, 0x00, 0x00, 0x00, 0x00, 0x78,
-0x18, 0x78, 0x60, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xA3, 0x70, 0x00, 0x00, 0x00, 0x00, 0x79,
-0xF8, 0x5A, 0x60, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0x85, 0x70, 0x00, 0x00, 0x00, 0x00, 0x7B,
-0xD8, 0x3C, 0x60, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x67, 0x70, 0x00, 0x00, 0x00, 0x00, 0x7D,
-0xB8, 0x1E, 0x60, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x49, 0x70, 0x00, 0x00, 0x00, 0x00, 0x7F,
-0x98, 0x00, 0x60, 0x03, 0x01, 0x02, 0x03, 0x04, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05,
-0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05,
-0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06,
-0x08, 0x09, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06,
-0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06,
-0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06,
-0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06,
-0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x08, 0xFF,
-0xFF, 0xC7, 0xC0, 0x00, 0x0C, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x10, 0xFF, 0xFF, 0xD5, 0xD0, 0x01,
-0x15, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x19, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x1D, 0xFF, 0xFF, 0xAB,
-0xA0, 0x00, 0x21, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x25, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x19, 0xFF,
-0xFF, 0xB9, 0xB0, 0x00, 0x1D, 0x2D, 0x30, 0x30, 0x00, 0x41, 0x57, 0x54, 0x00, 0x41, 0x50, 0x54,
-0x00, 0x41, 0x53, 0x54, 0x00, 0x41, 0x44, 0x44, 0x54, 0x00, 0x41, 0x44, 0x54, 0x00, 0x45, 0x44,
-0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x00, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x45, 0x53, 0x54, 0x35, 0x45, 0x44, 0x54, 0x2C, 0x4D,
-0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0xEE,
-0x3D, 0x95, 0x00, 0xAE, 0x5B, 0x6A, 0x00, 0x00, 0x00, 0x1A, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72,
-0x6E, 0x20, 0x2D, 0x20, 0x4E, 0x55, 0x20, 0x28, 0x50, 0x61, 0x6E, 0x67, 0x6E, 0x69, 0x72, 0x74,
-0x75, 0x6E, 0x67, 0x29, 
+0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x87, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x1C, 0xCC, 0x6C, 0xA1, 0x80,
+0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x60, 0xFB, 0xE0, 0x04, 0x60, 0xFD, 0x70, 0x05, 0x50, 0xE0, 0x60,
+0x06, 0x40, 0xDF, 0x70, 0x07, 0x30, 0xC2, 0x60, 0x08, 0x20, 0xC1, 0x70, 0x09, 0x10, 0xA4, 0x60,
+0x0A, 0x00, 0xA3, 0x70, 0x0A, 0xF0, 0x86, 0x60, 0x0B, 0xE0, 0x85, 0x70, 0x0C, 0xD9, 0xA2, 0xE0,
+0x0D, 0xC0, 0x67, 0x70, 0x0E, 0xB9, 0x84, 0xE0, 0x0F, 0xA9, 0x83, 0xF0, 0x10, 0x99, 0x66, 0xE0,
+0x11, 0x89, 0x65, 0xF0, 0x12, 0x79, 0x48, 0xE0, 0x13, 0x69, 0x47, 0xF0, 0x14, 0x59, 0x2A, 0xE0,
+0x15, 0x49, 0x29, 0xF0, 0x16, 0x39, 0x0C, 0xE0, 0x17, 0x29, 0x0B, 0xF0, 0x18, 0x22, 0x29, 0x60,
+0x19, 0x08, 0xED, 0xF0, 0x1A, 0x02, 0x0B, 0x60, 0x1A, 0xF2, 0x0A, 0x70, 0x1B, 0xE1, 0xED, 0x60,
+0x1C, 0xD1, 0xEC, 0x70, 0x1D, 0xC1, 0xCF, 0x60, 0x1E, 0xB1, 0xCE, 0x70, 0x1F, 0xA1, 0xB1, 0x60,
+0x20, 0x76, 0x00, 0xF0, 0x21, 0x81, 0x93, 0x60, 0x22, 0x55, 0xE2, 0xF0, 0x23, 0x6A, 0xAF, 0xE0,
+0x24, 0x35, 0xC4, 0xF0, 0x25, 0x4A, 0x91, 0xE0, 0x26, 0x15, 0xA6, 0xF0, 0x27, 0x2A, 0x73, 0xE0,
+0x27, 0xFE, 0xC3, 0x70, 0x29, 0x0A, 0x55, 0xE0, 0x29, 0xDE, 0xA5, 0x70, 0x2A, 0xEA, 0x37, 0xE0,
+0x2B, 0xBE, 0x87, 0x70, 0x2C, 0xD3, 0x54, 0x60, 0x2D, 0x9E, 0x69, 0x70, 0x2E, 0xB3, 0x36, 0x60,
+0x2F, 0x7E, 0x4B, 0x70, 0x30, 0x93, 0x18, 0x60, 0x31, 0x67, 0x67, 0xF0, 0x32, 0x72, 0xFA, 0x60,
+0x33, 0x47, 0x49, 0xF0, 0x34, 0x52, 0xDC, 0x60, 0x35, 0x27, 0x2B, 0xF0, 0x36, 0x32, 0xBE, 0x60,
+0x37, 0x07, 0x0D, 0xF0, 0x38, 0x1B, 0xDA, 0xE0, 0x38, 0xE6, 0xFE, 0x00, 0x39, 0xFB, 0xCA, 0xF0,
+0x3A, 0xC6, 0xD1, 0xF0, 0x3B, 0xDB, 0x9E, 0xE0, 0x3C, 0xAF, 0xEE, 0x70, 0x3D, 0xBB, 0x80, 0xE0,
+0x3E, 0x8F, 0xD0, 0x70, 0x3F, 0x9B, 0x62, 0xE0, 0x40, 0x6F, 0xB2, 0x70, 0x41, 0x84, 0x7F, 0x60,
+0x42, 0x4F, 0x94, 0x70, 0x43, 0x64, 0x61, 0x60, 0x44, 0x2F, 0x76, 0x70, 0x45, 0x44, 0x43, 0x60,
+0x45, 0xF3, 0xA8, 0xF0, 0x47, 0x2D, 0x5F, 0xE0, 0x47, 0xD3, 0x8A, 0xF0, 0x49, 0x0D, 0x41, 0xE0,
+0x49, 0xB3, 0x6C, 0xF0, 0x4A, 0xED, 0x23, 0xE0, 0x4B, 0x9C, 0x89, 0x70, 0x4C, 0xD6, 0x40, 0x60,
+0x4D, 0x7C, 0x6B, 0x70, 0x4E, 0xB6, 0x22, 0x60, 0x4F, 0x5C, 0x4D, 0x70, 0x50, 0x96, 0x04, 0x60,
+0x51, 0x3C, 0x2F, 0x70, 0x52, 0x75, 0xE6, 0x60, 0x53, 0x1C, 0x11, 0x70, 0x54, 0x55, 0xC8, 0x60,
+0x54, 0xFB, 0xF3, 0x70, 0x56, 0x35, 0xAA, 0x60, 0x56, 0xE5, 0x0F, 0xF0, 0x58, 0x1E, 0xC6, 0xE0,
+0x58, 0xC4, 0xF1, 0xF0, 0x59, 0xFE, 0xA8, 0xE0, 0x5A, 0xA4, 0xD3, 0xF0, 0x5B, 0xDE, 0x8A, 0xE0,
+0x5C, 0x84, 0xB5, 0xF0, 0x5D, 0xBE, 0x6C, 0xE0, 0x5E, 0x64, 0x97, 0xF0, 0x5F, 0x9E, 0x4E, 0xE0,
+0x60, 0x4D, 0xB4, 0x70, 0x61, 0x87, 0x6B, 0x60, 0x62, 0x2D, 0x96, 0x70, 0x63, 0x67, 0x4D, 0x60,
+0x64, 0x0D, 0x78, 0x70, 0x65, 0x47, 0x2F, 0x60, 0x65, 0xED, 0x5A, 0x70, 0x67, 0x27, 0x11, 0x60,
+0x67, 0xCD, 0x3C, 0x70, 0x69, 0x06, 0xF3, 0x60, 0x69, 0xAD, 0x1E, 0x70, 0x6A, 0xE6, 0xD5, 0x60,
+0x6B, 0x96, 0x3A, 0xF0, 0x6C, 0xCF, 0xF1, 0xE0, 0x6D, 0x76, 0x1C, 0xF0, 0x6E, 0xAF, 0xD3, 0xE0,
+0x6F, 0x55, 0xFE, 0xF0, 0x70, 0x8F, 0xB5, 0xE0, 0x71, 0x35, 0xE0, 0xF0, 0x72, 0x6F, 0x97, 0xE0,
+0x73, 0x15, 0xC2, 0xF0, 0x74, 0x4F, 0x79, 0xE0, 0x74, 0xFE, 0xDF, 0x70, 0x76, 0x38, 0x96, 0x60,
+0x76, 0xDE, 0xC1, 0x70, 0x78, 0x18, 0x78, 0x60, 0x78, 0xBE, 0xA3, 0x70, 0x79, 0xF8, 0x5A, 0x60,
+0x7A, 0x9E, 0x85, 0x70, 0x7B, 0xD8, 0x3C, 0x60, 0x7C, 0x7E, 0x67, 0x70, 0x7D, 0xB8, 0x1E, 0x60,
+0x7E, 0x5E, 0x49, 0x70, 0x7F, 0x98, 0x00, 0x60, 0x04, 0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x05, 0x06, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00,
+0x08, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x10, 0xFF, 0xFF, 0xAB,
+0xA0, 0x00, 0x14, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x18, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0xFF,
+0xFF, 0xB9, 0xB0, 0x00, 0x08, 0x2D, 0x30, 0x30, 0x00, 0x45, 0x50, 0x54, 0x00, 0x45, 0x53, 0x54,
+0x00, 0x45, 0x44, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54,
+0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x1C, 0xFF,
+0xFF, 0xFF, 0xFF, 0xCC, 0x6C, 0xA1, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD2, 0x60, 0xFB, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x04, 0x60, 0xFD, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x05, 0x50, 0xE0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xDF, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x07, 0x30, 0xC2, 0x60, 0x00, 0x00, 0x00, 0x00, 0x08, 0x20, 0xC1, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x09, 0x10, 0xA4, 0x60, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0xA3, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x0A, 0xF0, 0x86, 0x60, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0x85, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x0C, 0xD9, 0xA2, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x67, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x0E, 0xB9, 0x84, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0x83, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x10, 0x99, 0x66, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x65, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x12, 0x79, 0x48, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x47, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x14, 0x59, 0x2A, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x29, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x16, 0x39, 0x0C, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x0B, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x18, 0x22, 0x29, 0x60, 0x00, 0x00, 0x00, 0x00, 0x19, 0x08, 0xED, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0x02, 0x0B, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x0A, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x1B, 0xE1, 0xED, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD1, 0xEC, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x1D, 0xC1, 0xCF, 0x60, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xCE, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x1F, 0xA1, 0xB1, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x00, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x21, 0x81, 0x93, 0x60, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xE2, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x23, 0x6A, 0xAF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xC4, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x25, 0x4A, 0x91, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xA6, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x27, 0x2A, 0x73, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xC3, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x29, 0x0A, 0x55, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xA5, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x2A, 0xEA, 0x37, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0x87, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x2C, 0xD3, 0x54, 0x60, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x69, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x2E, 0xB3, 0x36, 0x60, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x4B, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x30, 0x93, 0x18, 0x60, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x67, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x32, 0x72, 0xFA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x49, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x34, 0x52, 0xDC, 0x60, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x2B, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x36, 0x32, 0xBE, 0x60, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x0D, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x38, 0x1B, 0xDA, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xD1, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x3B, 0xDB, 0x9E, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xEE, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x3D, 0xBB, 0x80, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xD0, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x3F, 0x9B, 0x62, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xB2, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x41, 0x84, 0x7F, 0x60, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0x94, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x43, 0x64, 0x61, 0x60, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x76, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x45, 0x44, 0x43, 0x60, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xA8, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x47, 0x2D, 0x5F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x47, 0xD3, 0x8A, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x49, 0x0D, 0x41, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x49, 0xB3, 0x6C, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x4A, 0xED, 0x23, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0x89, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x4C, 0xD6, 0x40, 0x60, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x6B, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x4E, 0xB6, 0x22, 0x60, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x4D, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x50, 0x96, 0x04, 0x60, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x2F, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x52, 0x75, 0xE6, 0x60, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x11, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x54, 0x55, 0xC8, 0x60, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFB, 0xF3, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x56, 0x35, 0xAA, 0x60, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x0F, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x58, 0x1E, 0xC6, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC4, 0xF1, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x59, 0xFE, 0xA8, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xD3, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x5B, 0xDE, 0x8A, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xB5, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x5D, 0xBE, 0x6C, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0x97, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x5F, 0x9E, 0x4E, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xB4, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x61, 0x87, 0x6B, 0x60, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0x96, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x63, 0x67, 0x4D, 0x60, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0x78, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x65, 0x47, 0x2F, 0x60, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x5A, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x67, 0x27, 0x11, 0x60, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x3C, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x69, 0x06, 0xF3, 0x60, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x1E, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x6A, 0xE6, 0xD5, 0x60, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x3A, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x6C, 0xCF, 0xF1, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x1C, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x6E, 0xAF, 0xD3, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x55, 0xFE, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x70, 0x8F, 0xB5, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x71, 0x35, 0xE0, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x72, 0x6F, 0x97, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xC2, 0xF0, 0x00,
+0x00, 0x00, 0x00, 0x74, 0x4F, 0x79, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFE, 0xDF, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x76, 0x38, 0x96, 0x60, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xC1, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x78, 0x18, 0x78, 0x60, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xA3, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x79, 0xF8, 0x5A, 0x60, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0x85, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x7B, 0xD8, 0x3C, 0x60, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x67, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x7D, 0xB8, 0x1E, 0x60, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x49, 0x70, 0x00,
+0x00, 0x00, 0x00, 0x7F, 0x98, 0x00, 0x60, 0x04, 0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x05, 0x06, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02,
+0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x08,
+0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x10, 0xFF, 0xFF, 0xAB, 0xA0,
+0x00, 0x14, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x18, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0xFF, 0xFF,
+0xB9, 0xB0, 0x00, 0x08, 0x2D, 0x30, 0x30, 0x00, 0x45, 0x50, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00,
+0x45, 0x44, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00,
+0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x0A, 0x45, 0x53, 0x54, 0x35, 0x45, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E,
+0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* America/Paramaribo */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x53, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -36871,9 +37373,8 @@
 0x01, 0x0C, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00,
 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
 0x00, 0x01, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x0A, 0x00, 0xBC, 0x5E, 0x01, 0x00, 0x67, 0xA5, 0xDA,
-0x00, 0x00, 0x00, 0x1D, 0x4D, 0x53, 0x54, 0x20, 0x2D, 0x20, 0x41, 0x72, 0x69, 0x7A, 0x6F, 0x6E,
-0x61, 0x20, 0x28, 0x65, 0x78, 0x63, 0x65, 0x70, 0x74, 0x20, 0x4E, 0x61, 0x76, 0x61, 0x6A, 0x6F,
-0x29, 
+0x00, 0x00, 0x00, 0x18, 0x4D, 0x53, 0x54, 0x20, 0x2D, 0x20, 0x41, 0x5A, 0x20, 0x28, 0x65, 0x78,
+0x63, 0x65, 0x70, 0x74, 0x20, 0x4E, 0x61, 0x76, 0x61, 0x6A, 0x6F, 0x29, 
 
 /* America/Port-au-Prince */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x48, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -37390,125 +37891,136 @@
 /* America/Rankin_Inlet */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x15, 0xE7, 0x8C, 0x6E, 0x00,
-0xF7, 0x2F, 0x4C, 0x60, 0xF8, 0x28, 0x77, 0xE0, 0x13, 0x69, 0x56, 0x00, 0x14, 0x59, 0x38, 0xF0,
-0x15, 0x49, 0x38, 0x00, 0x16, 0x39, 0x1A, 0xF0, 0x17, 0x29, 0x1A, 0x00, 0x18, 0x22, 0x37, 0x70,
-0x19, 0x08, 0xFC, 0x00, 0x1A, 0x02, 0x19, 0x70, 0x1A, 0xF2, 0x18, 0x80, 0x1B, 0xE1, 0xFB, 0x70,
-0x1C, 0xD1, 0xFA, 0x80, 0x1D, 0xC1, 0xDD, 0x70, 0x1E, 0xB1, 0xDC, 0x80, 0x1F, 0xA1, 0xBF, 0x70,
-0x20, 0x76, 0x0F, 0x00, 0x21, 0x81, 0xA1, 0x70, 0x22, 0x55, 0xF1, 0x00, 0x23, 0x6A, 0xBD, 0xF0,
-0x24, 0x35, 0xD3, 0x00, 0x25, 0x4A, 0x9F, 0xF0, 0x26, 0x15, 0xB5, 0x00, 0x27, 0x2A, 0x81, 0xF0,
-0x27, 0xFE, 0xD1, 0x80, 0x29, 0x0A, 0x63, 0xF0, 0x29, 0xDE, 0xB3, 0x80, 0x2A, 0xEA, 0x45, 0xF0,
-0x2B, 0xBE, 0x95, 0x80, 0x2C, 0xD3, 0x62, 0x70, 0x2D, 0x9E, 0x77, 0x80, 0x2E, 0xB3, 0x44, 0x70,
-0x2F, 0x7E, 0x59, 0x80, 0x30, 0x93, 0x26, 0x70, 0x31, 0x67, 0x76, 0x00, 0x32, 0x73, 0x08, 0x70,
-0x33, 0x47, 0x58, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x35, 0x27, 0x3A, 0x00, 0x36, 0x32, 0xCC, 0x70,
-0x37, 0x07, 0x1C, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x38, 0xE6, 0xFE, 0x00, 0x39, 0xFB, 0xCA, 0xF0,
-0x3A, 0xC6, 0xE0, 0x00, 0x3B, 0xDB, 0xAC, 0xF0, 0x3C, 0xAF, 0xFC, 0x80, 0x3D, 0xBB, 0x8E, 0xF0,
-0x3E, 0x8F, 0xDE, 0x80, 0x3F, 0x9B, 0x70, 0xF0, 0x40, 0x6F, 0xC0, 0x80, 0x41, 0x84, 0x8D, 0x70,
-0x42, 0x4F, 0xA2, 0x80, 0x43, 0x64, 0x6F, 0x70, 0x44, 0x2F, 0x84, 0x80, 0x45, 0x44, 0x51, 0x70,
-0x45, 0xF3, 0xB7, 0x00, 0x47, 0x2D, 0x6D, 0xF0, 0x47, 0xD3, 0x99, 0x00, 0x49, 0x0D, 0x4F, 0xF0,
-0x49, 0xB3, 0x7B, 0x00, 0x4A, 0xED, 0x31, 0xF0, 0x4B, 0x9C, 0x97, 0x80, 0x4C, 0xD6, 0x4E, 0x70,
-0x4D, 0x7C, 0x79, 0x80, 0x4E, 0xB6, 0x30, 0x70, 0x4F, 0x5C, 0x5B, 0x80, 0x50, 0x96, 0x12, 0x70,
-0x51, 0x3C, 0x3D, 0x80, 0x52, 0x75, 0xF4, 0x70, 0x53, 0x1C, 0x1F, 0x80, 0x54, 0x55, 0xD6, 0x70,
-0x54, 0xFC, 0x01, 0x80, 0x56, 0x35, 0xB8, 0x70, 0x56, 0xE5, 0x1E, 0x00, 0x58, 0x1E, 0xD4, 0xF0,
-0x58, 0xC5, 0x00, 0x00, 0x59, 0xFE, 0xB6, 0xF0, 0x5A, 0xA4, 0xE2, 0x00, 0x5B, 0xDE, 0x98, 0xF0,
-0x5C, 0x84, 0xC4, 0x00, 0x5D, 0xBE, 0x7A, 0xF0, 0x5E, 0x64, 0xA6, 0x00, 0x5F, 0x9E, 0x5C, 0xF0,
-0x60, 0x4D, 0xC2, 0x80, 0x61, 0x87, 0x79, 0x70, 0x62, 0x2D, 0xA4, 0x80, 0x63, 0x67, 0x5B, 0x70,
-0x64, 0x0D, 0x86, 0x80, 0x65, 0x47, 0x3D, 0x70, 0x65, 0xED, 0x68, 0x80, 0x67, 0x27, 0x1F, 0x70,
-0x67, 0xCD, 0x4A, 0x80, 0x69, 0x07, 0x01, 0x70, 0x69, 0xAD, 0x2C, 0x80, 0x6A, 0xE6, 0xE3, 0x70,
-0x6B, 0x96, 0x49, 0x00, 0x6C, 0xCF, 0xFF, 0xF0, 0x6D, 0x76, 0x2B, 0x00, 0x6E, 0xAF, 0xE1, 0xF0,
-0x6F, 0x56, 0x0D, 0x00, 0x70, 0x8F, 0xC3, 0xF0, 0x71, 0x35, 0xEF, 0x00, 0x72, 0x6F, 0xA5, 0xF0,
-0x73, 0x15, 0xD1, 0x00, 0x74, 0x4F, 0x87, 0xF0, 0x74, 0xFE, 0xED, 0x80, 0x76, 0x38, 0xA4, 0x70,
-0x76, 0xDE, 0xCF, 0x80, 0x78, 0x18, 0x86, 0x70, 0x78, 0xBE, 0xB1, 0x80, 0x79, 0xF8, 0x68, 0x70,
-0x7A, 0x9E, 0x93, 0x80, 0x7B, 0xD8, 0x4A, 0x70, 0x7C, 0x7E, 0x75, 0x80, 0x7D, 0xB8, 0x2C, 0x70,
-0x7E, 0x5E, 0x57, 0x80, 0x7F, 0x98, 0x0E, 0x70, 0x02, 0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x04, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00,
-0x09, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0D, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x11, 0xFF, 0xFF, 0xAB,
-0xA0, 0x00, 0x09, 0x2D, 0x30, 0x30, 0x00, 0x43, 0x44, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00,
-0x43, 0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, 0x06,
-0x00, 0x00, 0x00, 0x15, 0xFF, 0xFF, 0xFF, 0xFF, 0xE7, 0x8C, 0x6E, 0x00, 0xFF, 0xFF, 0xFF, 0xFF,
-0xF7, 0x2F, 0x4C, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0x77, 0xE0, 0x00, 0x00, 0x00, 0x00,
-0x13, 0x69, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x38, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x15, 0x49, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x1A, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x17, 0x29, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x37, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x19, 0x08, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x19, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x1A, 0xF2, 0x18, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE1, 0xFB, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x1C, 0xD1, 0xFA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xDD, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x1E, 0xB1, 0xDC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xBF, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x20, 0x76, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xA1, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x22, 0x55, 0xF1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xBD, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x24, 0x35, 0xD3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0x9F, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x26, 0x15, 0xB5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x81, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x27, 0xFE, 0xD1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x63, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x29, 0xDE, 0xB3, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x45, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x2B, 0xBE, 0x95, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x62, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x2D, 0x9E, 0x77, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x44, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x2F, 0x7E, 0x59, 0x80, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x26, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x31, 0x67, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x33, 0x47, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x35, 0x27, 0x3A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x37, 0x07, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x38, 0xE6, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x3A, 0xC6, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xAC, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x3C, 0xAF, 0xFC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x8E, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x3E, 0x8F, 0xDE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x70, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x40, 0x6F, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x8D, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x42, 0x4F, 0xA2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x6F, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x44, 0x2F, 0x84, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x51, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x45, 0xF3, 0xB7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x2D, 0x6D, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x47, 0xD3, 0x99, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x0D, 0x4F, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x49, 0xB3, 0x7B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xED, 0x31, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x4B, 0x9C, 0x97, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x4E, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x4D, 0x7C, 0x79, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x30, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x4F, 0x5C, 0x5B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x12, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x51, 0x3C, 0x3D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x52, 0x75, 0xF4, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x53, 0x1C, 0x1F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xD6, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x54, 0xFC, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xB8, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x56, 0xE5, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xD4, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x58, 0xC5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xB6, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x5A, 0xA4, 0xE2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0x98, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x5C, 0x84, 0xC4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x7A, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x5E, 0x64, 0xA6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x5C, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x60, 0x4D, 0xC2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x79, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x62, 0x2D, 0xA4, 0x80, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x5B, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x64, 0x0D, 0x86, 0x80, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x3D, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x65, 0xED, 0x68, 0x80, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x1F, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x67, 0xCD, 0x4A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x01, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x69, 0xAD, 0x2C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xE3, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x6B, 0x96, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xCF, 0xFF, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x6D, 0x76, 0x2B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xE1, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x6F, 0x56, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xC3, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x71, 0x35, 0xEF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xA5, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x73, 0x15, 0xD1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0x87, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x74, 0xFE, 0xED, 0x80, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xA4, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x76, 0xDE, 0xCF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0x86, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x78, 0xBE, 0xB1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x68, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x7A, 0x9E, 0x93, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x4A, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x7C, 0x7E, 0x75, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x2C, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x7E, 0x5E, 0x57, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x0E, 0x70, 0x02, 0x01, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x04, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x04, 0xFF,
-0xFF, 0xAB, 0xA0, 0x00, 0x09, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0D, 0xFF, 0xFF, 0xB9, 0xB0, 0x00,
-0x11, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x09, 0x2D, 0x30, 0x30, 0x00, 0x43, 0x44, 0x44, 0x54, 0x00,
-0x43, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x0A, 0x43, 0x53, 0x54,
-0x36, 0x43, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E,
-0x31, 0x2E, 0x30, 0x0A, 0x00, 0xE9, 0x2E, 0x02, 0x00, 0x86, 0x26, 0x8E, 0x00, 0x00, 0x00, 0x16,
-0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x2D, 0x20, 0x4E, 0x55, 0x20, 0x28, 0x63, 0x65,
-0x6E, 0x74, 0x72, 0x61, 0x6C, 0x29, 
+0x00, 0x00, 0x00, 0x85, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xE7, 0x8C, 0x6E, 0x00,
+0x04, 0x61, 0x0B, 0x80, 0x05, 0x50, 0xEE, 0x70, 0x06, 0x40, 0xED, 0x80, 0x07, 0x30, 0xD0, 0x70,
+0x08, 0x20, 0xCF, 0x80, 0x09, 0x10, 0xB2, 0x70, 0x0A, 0x00, 0xB1, 0x80, 0x0A, 0xF0, 0x94, 0x70,
+0x0B, 0xE0, 0x93, 0x80, 0x0C, 0xD9, 0xB0, 0xF0, 0x0D, 0xC0, 0x75, 0x80, 0x0E, 0xB9, 0x92, 0xF0,
+0x0F, 0xA9, 0x92, 0x00, 0x10, 0x99, 0x74, 0xF0, 0x11, 0x89, 0x74, 0x00, 0x12, 0x79, 0x56, 0xF0,
+0x13, 0x69, 0x56, 0x00, 0x14, 0x59, 0x38, 0xF0, 0x15, 0x49, 0x38, 0x00, 0x16, 0x39, 0x1A, 0xF0,
+0x17, 0x29, 0x1A, 0x00, 0x18, 0x22, 0x37, 0x70, 0x19, 0x08, 0xFC, 0x00, 0x1A, 0x02, 0x19, 0x70,
+0x1A, 0xF2, 0x18, 0x80, 0x1B, 0xE1, 0xFB, 0x70, 0x1C, 0xD1, 0xFA, 0x80, 0x1D, 0xC1, 0xDD, 0x70,
+0x1E, 0xB1, 0xDC, 0x80, 0x1F, 0xA1, 0xBF, 0x70, 0x20, 0x76, 0x0F, 0x00, 0x21, 0x81, 0xA1, 0x70,
+0x22, 0x55, 0xF1, 0x00, 0x23, 0x6A, 0xBD, 0xF0, 0x24, 0x35, 0xD3, 0x00, 0x25, 0x4A, 0x9F, 0xF0,
+0x26, 0x15, 0xB5, 0x00, 0x27, 0x2A, 0x81, 0xF0, 0x27, 0xFE, 0xD1, 0x80, 0x29, 0x0A, 0x63, 0xF0,
+0x29, 0xDE, 0xB3, 0x80, 0x2A, 0xEA, 0x45, 0xF0, 0x2B, 0xBE, 0x95, 0x80, 0x2C, 0xD3, 0x62, 0x70,
+0x2D, 0x9E, 0x77, 0x80, 0x2E, 0xB3, 0x44, 0x70, 0x2F, 0x7E, 0x59, 0x80, 0x30, 0x93, 0x26, 0x70,
+0x31, 0x67, 0x76, 0x00, 0x32, 0x73, 0x08, 0x70, 0x33, 0x47, 0x58, 0x00, 0x34, 0x52, 0xEA, 0x70,
+0x35, 0x27, 0x3A, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x37, 0x07, 0x1C, 0x00, 0x38, 0x1B, 0xE8, 0xF0,
+0x38, 0xE6, 0xFE, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x3A, 0xC6, 0xE0, 0x00, 0x3B, 0xDB, 0xAC, 0xF0,
+0x3C, 0xAF, 0xFC, 0x80, 0x3D, 0xBB, 0x8E, 0xF0, 0x3E, 0x8F, 0xDE, 0x80, 0x3F, 0x9B, 0x70, 0xF0,
+0x40, 0x6F, 0xC0, 0x80, 0x41, 0x84, 0x8D, 0x70, 0x42, 0x4F, 0xA2, 0x80, 0x43, 0x64, 0x6F, 0x70,
+0x44, 0x2F, 0x84, 0x80, 0x45, 0x44, 0x51, 0x70, 0x45, 0xF3, 0xB7, 0x00, 0x47, 0x2D, 0x6D, 0xF0,
+0x47, 0xD3, 0x99, 0x00, 0x49, 0x0D, 0x4F, 0xF0, 0x49, 0xB3, 0x7B, 0x00, 0x4A, 0xED, 0x31, 0xF0,
+0x4B, 0x9C, 0x97, 0x80, 0x4C, 0xD6, 0x4E, 0x70, 0x4D, 0x7C, 0x79, 0x80, 0x4E, 0xB6, 0x30, 0x70,
+0x4F, 0x5C, 0x5B, 0x80, 0x50, 0x96, 0x12, 0x70, 0x51, 0x3C, 0x3D, 0x80, 0x52, 0x75, 0xF4, 0x70,
+0x53, 0x1C, 0x1F, 0x80, 0x54, 0x55, 0xD6, 0x70, 0x54, 0xFC, 0x01, 0x80, 0x56, 0x35, 0xB8, 0x70,
+0x56, 0xE5, 0x1E, 0x00, 0x58, 0x1E, 0xD4, 0xF0, 0x58, 0xC5, 0x00, 0x00, 0x59, 0xFE, 0xB6, 0xF0,
+0x5A, 0xA4, 0xE2, 0x00, 0x5B, 0xDE, 0x98, 0xF0, 0x5C, 0x84, 0xC4, 0x00, 0x5D, 0xBE, 0x7A, 0xF0,
+0x5E, 0x64, 0xA6, 0x00, 0x5F, 0x9E, 0x5C, 0xF0, 0x60, 0x4D, 0xC2, 0x80, 0x61, 0x87, 0x79, 0x70,
+0x62, 0x2D, 0xA4, 0x80, 0x63, 0x67, 0x5B, 0x70, 0x64, 0x0D, 0x86, 0x80, 0x65, 0x47, 0x3D, 0x70,
+0x65, 0xED, 0x68, 0x80, 0x67, 0x27, 0x1F, 0x70, 0x67, 0xCD, 0x4A, 0x80, 0x69, 0x07, 0x01, 0x70,
+0x69, 0xAD, 0x2C, 0x80, 0x6A, 0xE6, 0xE3, 0x70, 0x6B, 0x96, 0x49, 0x00, 0x6C, 0xCF, 0xFF, 0xF0,
+0x6D, 0x76, 0x2B, 0x00, 0x6E, 0xAF, 0xE1, 0xF0, 0x6F, 0x56, 0x0D, 0x00, 0x70, 0x8F, 0xC3, 0xF0,
+0x71, 0x35, 0xEF, 0x00, 0x72, 0x6F, 0xA5, 0xF0, 0x73, 0x15, 0xD1, 0x00, 0x74, 0x4F, 0x87, 0xF0,
+0x74, 0xFE, 0xED, 0x80, 0x76, 0x38, 0xA4, 0x70, 0x76, 0xDE, 0xCF, 0x80, 0x78, 0x18, 0x86, 0x70,
+0x78, 0xBE, 0xB1, 0x80, 0x79, 0xF8, 0x68, 0x70, 0x7A, 0x9E, 0x93, 0x80, 0x7B, 0xD8, 0x4A, 0x70,
+0x7C, 0x7E, 0x75, 0x80, 0x7D, 0xB8, 0x2C, 0x70, 0x7E, 0x5E, 0x57, 0x80, 0x7F, 0x98, 0x0E, 0x70,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x01,
+0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0xFF, 0xFF, 0xAB,
+0xA0, 0x00, 0x08, 0x2D, 0x30, 0x30, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x45,
+0x53, 0x54, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xE7, 0x8C, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x61, 0x0B, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x05, 0x50, 0xEE, 0x70, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xED, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x07, 0x30, 0xD0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x08, 0x20, 0xCF, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x09, 0x10, 0xB2, 0x70, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0xB1, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x0A, 0xF0, 0x94, 0x70, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0x93, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x0C, 0xD9, 0xB0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x75, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x0E, 0xB9, 0x92, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0x92, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x10, 0x99, 0x74, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x74, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x12, 0x79, 0x56, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x56, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x14, 0x59, 0x38, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x38, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x16, 0x39, 0x1A, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x1A, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x18, 0x22, 0x37, 0x70, 0x00, 0x00, 0x00, 0x00, 0x19, 0x08, 0xFC, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0x02, 0x19, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x18, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x1B, 0xE1, 0xFB, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD1, 0xFA, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x1D, 0xC1, 0xDD, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xDC, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x1F, 0xA1, 0xBF, 0x70, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x0F, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x21, 0x81, 0xA1, 0x70, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xF1, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x23, 0x6A, 0xBD, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xD3, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x25, 0x4A, 0x9F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xB5, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x27, 0x2A, 0x81, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xD1, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x29, 0x0A, 0x63, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xB3, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x2A, 0xEA, 0x45, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0x95, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x2C, 0xD3, 0x62, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x77, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x2E, 0xB3, 0x44, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x59, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x30, 0x93, 0x26, 0x70, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x3A, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x1C, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xE0, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x3B, 0xDB, 0xAC, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xFC, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x3D, 0xBB, 0x8E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xDE, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x3F, 0x9B, 0x70, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xC0, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x41, 0x84, 0x8D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xA2, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x43, 0x64, 0x6F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x84, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x45, 0x44, 0x51, 0x70, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xB7, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x47, 0x2D, 0x6D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x47, 0xD3, 0x99, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x49, 0x0D, 0x4F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x49, 0xB3, 0x7B, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x4A, 0xED, 0x31, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0x97, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x4C, 0xD6, 0x4E, 0x70, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x79, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x4E, 0xB6, 0x30, 0x70, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x5B, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x50, 0x96, 0x12, 0x70, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x3D, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x52, 0x75, 0xF4, 0x70, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x1F, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x54, 0x55, 0xD6, 0x70, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFC, 0x01, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x56, 0x35, 0xB8, 0x70, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x1E, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x58, 0x1E, 0xD4, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC5, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x59, 0xFE, 0xB6, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xE2, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x5B, 0xDE, 0x98, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xC4, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x5D, 0xBE, 0x7A, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0xA6, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x5F, 0x9E, 0x5C, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xC2, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x61, 0x87, 0x79, 0x70, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0xA4, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x63, 0x67, 0x5B, 0x70, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0x86, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x65, 0x47, 0x3D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x68, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x67, 0x27, 0x1F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x4A, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x69, 0x07, 0x01, 0x70, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x2C, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x6A, 0xE6, 0xE3, 0x70, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x49, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x6C, 0xCF, 0xFF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x2B, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x6E, 0xAF, 0xE1, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x56, 0x0D, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x70, 0x8F, 0xC3, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x71, 0x35, 0xEF, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x72, 0x6F, 0xA5, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xD1, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x74, 0x4F, 0x87, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFE, 0xED, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x76, 0x38, 0xA4, 0x70, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xCF, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x78, 0x18, 0x86, 0x70, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xB1, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x79, 0xF8, 0x68, 0x70, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0x93, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x7B, 0xD8, 0x4A, 0x70, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x75, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x7D, 0xB8, 0x2C, 0x70, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x57, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x7F, 0x98, 0x0E, 0x70, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF,
+0xB9, 0xB0, 0x00, 0x0C, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0x2D, 0x30, 0x30, 0x00, 0x43, 0x44,
+0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x0A, 0x43, 0x53, 0x54, 0x36, 0x43,
+0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E,
+0x30, 0x0A, 0x00, 0xE9, 0x2E, 0x02, 0x00, 0x86, 0x26, 0x8E, 0x00, 0x00, 0x00, 0x16, 0x43, 0x65,
+0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x2D, 0x20, 0x4E, 0x55, 0x20, 0x28, 0x63, 0x65, 0x6E, 0x74,
+0x72, 0x61, 0x6C, 0x29, 
 
 /* America/Recife */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x42, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -37627,125 +38139,136 @@
 /* America/Resolute */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x15, 0xD5, 0xFB, 0x81, 0x80,
-0xF7, 0x2F, 0x4C, 0x60, 0xF8, 0x28, 0x77, 0xE0, 0x13, 0x69, 0x56, 0x00, 0x14, 0x59, 0x38, 0xF0,
-0x15, 0x49, 0x38, 0x00, 0x16, 0x39, 0x1A, 0xF0, 0x17, 0x29, 0x1A, 0x00, 0x18, 0x22, 0x37, 0x70,
-0x19, 0x08, 0xFC, 0x00, 0x1A, 0x02, 0x19, 0x70, 0x1A, 0xF2, 0x18, 0x80, 0x1B, 0xE1, 0xFB, 0x70,
-0x1C, 0xD1, 0xFA, 0x80, 0x1D, 0xC1, 0xDD, 0x70, 0x1E, 0xB1, 0xDC, 0x80, 0x1F, 0xA1, 0xBF, 0x70,
-0x20, 0x76, 0x0F, 0x00, 0x21, 0x81, 0xA1, 0x70, 0x22, 0x55, 0xF1, 0x00, 0x23, 0x6A, 0xBD, 0xF0,
-0x24, 0x35, 0xD3, 0x00, 0x25, 0x4A, 0x9F, 0xF0, 0x26, 0x15, 0xB5, 0x00, 0x27, 0x2A, 0x81, 0xF0,
-0x27, 0xFE, 0xD1, 0x80, 0x29, 0x0A, 0x63, 0xF0, 0x29, 0xDE, 0xB3, 0x80, 0x2A, 0xEA, 0x45, 0xF0,
-0x2B, 0xBE, 0x95, 0x80, 0x2C, 0xD3, 0x62, 0x70, 0x2D, 0x9E, 0x77, 0x80, 0x2E, 0xB3, 0x44, 0x70,
-0x2F, 0x7E, 0x59, 0x80, 0x30, 0x93, 0x26, 0x70, 0x31, 0x67, 0x76, 0x00, 0x32, 0x73, 0x08, 0x70,
-0x33, 0x47, 0x58, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x35, 0x27, 0x3A, 0x00, 0x36, 0x32, 0xCC, 0x70,
-0x37, 0x07, 0x1C, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x38, 0xE6, 0xFE, 0x00, 0x39, 0xFB, 0xCA, 0xF0,
-0x3A, 0xC6, 0xE0, 0x00, 0x3B, 0xDB, 0xAC, 0xF0, 0x3C, 0xAF, 0xFC, 0x80, 0x3D, 0xBB, 0x8E, 0xF0,
-0x3E, 0x8F, 0xDE, 0x80, 0x3F, 0x9B, 0x70, 0xF0, 0x40, 0x6F, 0xC0, 0x80, 0x41, 0x84, 0x8D, 0x70,
-0x42, 0x4F, 0xA2, 0x80, 0x43, 0x64, 0x6F, 0x70, 0x44, 0x2F, 0x84, 0x80, 0x45, 0x44, 0x51, 0x70,
-0x45, 0xF3, 0xB7, 0x00, 0x47, 0x2D, 0x6D, 0xF0, 0x47, 0xD3, 0x99, 0x00, 0x49, 0x0D, 0x4F, 0xF0,
-0x49, 0xB3, 0x7B, 0x00, 0x4A, 0xED, 0x31, 0xF0, 0x4B, 0x9C, 0x97, 0x80, 0x4C, 0xD6, 0x4E, 0x70,
-0x4D, 0x7C, 0x79, 0x80, 0x4E, 0xB6, 0x30, 0x70, 0x4F, 0x5C, 0x5B, 0x80, 0x50, 0x96, 0x12, 0x70,
-0x51, 0x3C, 0x3D, 0x80, 0x52, 0x75, 0xF4, 0x70, 0x53, 0x1C, 0x1F, 0x80, 0x54, 0x55, 0xD6, 0x70,
-0x54, 0xFC, 0x01, 0x80, 0x56, 0x35, 0xB8, 0x70, 0x56, 0xE5, 0x1E, 0x00, 0x58, 0x1E, 0xD4, 0xF0,
-0x58, 0xC5, 0x00, 0x00, 0x59, 0xFE, 0xB6, 0xF0, 0x5A, 0xA4, 0xE2, 0x00, 0x5B, 0xDE, 0x98, 0xF0,
-0x5C, 0x84, 0xC4, 0x00, 0x5D, 0xBE, 0x7A, 0xF0, 0x5E, 0x64, 0xA6, 0x00, 0x5F, 0x9E, 0x5C, 0xF0,
-0x60, 0x4D, 0xC2, 0x80, 0x61, 0x87, 0x79, 0x70, 0x62, 0x2D, 0xA4, 0x80, 0x63, 0x67, 0x5B, 0x70,
-0x64, 0x0D, 0x86, 0x80, 0x65, 0x47, 0x3D, 0x70, 0x65, 0xED, 0x68, 0x80, 0x67, 0x27, 0x1F, 0x70,
-0x67, 0xCD, 0x4A, 0x80, 0x69, 0x07, 0x01, 0x70, 0x69, 0xAD, 0x2C, 0x80, 0x6A, 0xE6, 0xE3, 0x70,
-0x6B, 0x96, 0x49, 0x00, 0x6C, 0xCF, 0xFF, 0xF0, 0x6D, 0x76, 0x2B, 0x00, 0x6E, 0xAF, 0xE1, 0xF0,
-0x6F, 0x56, 0x0D, 0x00, 0x70, 0x8F, 0xC3, 0xF0, 0x71, 0x35, 0xEF, 0x00, 0x72, 0x6F, 0xA5, 0xF0,
-0x73, 0x15, 0xD1, 0x00, 0x74, 0x4F, 0x87, 0xF0, 0x74, 0xFE, 0xED, 0x80, 0x76, 0x38, 0xA4, 0x70,
-0x76, 0xDE, 0xCF, 0x80, 0x78, 0x18, 0x86, 0x70, 0x78, 0xBE, 0xB1, 0x80, 0x79, 0xF8, 0x68, 0x70,
-0x7A, 0x9E, 0x93, 0x80, 0x7B, 0xD8, 0x4A, 0x70, 0x7C, 0x7E, 0x75, 0x80, 0x7D, 0xB8, 0x2C, 0x70,
-0x7E, 0x5E, 0x57, 0x80, 0x7F, 0x98, 0x0E, 0x70, 0x02, 0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x04, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x04, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00,
-0x09, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0D, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x11, 0xFF, 0xFF, 0xAB,
-0xA0, 0x00, 0x09, 0x2D, 0x30, 0x30, 0x00, 0x43, 0x44, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00,
-0x43, 0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, 0x06,
-0x00, 0x00, 0x00, 0x15, 0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0xFB, 0x81, 0x80, 0xFF, 0xFF, 0xFF, 0xFF,
-0xF7, 0x2F, 0x4C, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0x28, 0x77, 0xE0, 0x00, 0x00, 0x00, 0x00,
-0x13, 0x69, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x38, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x15, 0x49, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x1A, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x17, 0x29, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x37, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x19, 0x08, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02, 0x19, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x1A, 0xF2, 0x18, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE1, 0xFB, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x1C, 0xD1, 0xFA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1, 0xDD, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x1E, 0xB1, 0xDC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1, 0xBF, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x20, 0x76, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81, 0xA1, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x22, 0x55, 0xF1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A, 0xBD, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x24, 0x35, 0xD3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A, 0x9F, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x26, 0x15, 0xB5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A, 0x81, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x27, 0xFE, 0xD1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A, 0x63, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x29, 0xDE, 0xB3, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA, 0x45, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x2B, 0xBE, 0x95, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3, 0x62, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x2D, 0x9E, 0x77, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3, 0x44, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x2F, 0x7E, 0x59, 0x80, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93, 0x26, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x31, 0x67, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x33, 0x47, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x35, 0x27, 0x3A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x37, 0x07, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x38, 0xE6, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x3A, 0xC6, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0xAC, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x3C, 0xAF, 0xFC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x8E, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x3E, 0x8F, 0xDE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x70, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x40, 0x6F, 0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x8D, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x42, 0x4F, 0xA2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64, 0x6F, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x44, 0x2F, 0x84, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44, 0x51, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x45, 0xF3, 0xB7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x2D, 0x6D, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x47, 0xD3, 0x99, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x0D, 0x4F, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x49, 0xB3, 0x7B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xED, 0x31, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x4B, 0x9C, 0x97, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6, 0x4E, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x4D, 0x7C, 0x79, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6, 0x30, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x4F, 0x5C, 0x5B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96, 0x12, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x51, 0x3C, 0x3D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x52, 0x75, 0xF4, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x53, 0x1C, 0x1F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0xD6, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x54, 0xFC, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35, 0xB8, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x56, 0xE5, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E, 0xD4, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x58, 0xC5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE, 0xB6, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x5A, 0xA4, 0xE2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE, 0x98, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x5C, 0x84, 0xC4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE, 0x7A, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x5E, 0x64, 0xA6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E, 0x5C, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x60, 0x4D, 0xC2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87, 0x79, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x62, 0x2D, 0xA4, 0x80, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67, 0x5B, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x64, 0x0D, 0x86, 0x80, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47, 0x3D, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x65, 0xED, 0x68, 0x80, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27, 0x1F, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x67, 0xCD, 0x4A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07, 0x01, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x69, 0xAD, 0x2C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6, 0xE3, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x6B, 0x96, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xCF, 0xFF, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x6D, 0x76, 0x2B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF, 0xE1, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x6F, 0x56, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F, 0xC3, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x71, 0x35, 0xEF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F, 0xA5, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x73, 0x15, 0xD1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F, 0x87, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x74, 0xFE, 0xED, 0x80, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38, 0xA4, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x76, 0xDE, 0xCF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18, 0x86, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x78, 0xBE, 0xB1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8, 0x68, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x7A, 0x9E, 0x93, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8, 0x4A, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x7C, 0x7E, 0x75, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8, 0x2C, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x7E, 0x5E, 0x57, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98, 0x0E, 0x70, 0x02, 0x01, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x04, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x04, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x04, 0xFF,
-0xFF, 0xAB, 0xA0, 0x00, 0x09, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x0D, 0xFF, 0xFF, 0xB9, 0xB0, 0x00,
-0x11, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x09, 0x2D, 0x30, 0x30, 0x00, 0x43, 0x44, 0x44, 0x54, 0x00,
-0x43, 0x53, 0x54, 0x00, 0x43, 0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x0A, 0x43, 0x53, 0x54,
-0x36, 0x43, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E,
-0x31, 0x2E, 0x30, 0x0A, 0x00, 0xFB, 0x4E, 0x33, 0x00, 0x81, 0xF5, 0xDB, 0x00, 0x00, 0x00, 0x17,
-0x43, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x2D, 0x20, 0x4E, 0x55, 0x20, 0x28, 0x52, 0x65,
-0x73, 0x6F, 0x6C, 0x75, 0x74, 0x65, 0x29, 
+0x00, 0x00, 0x00, 0x85, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xD5, 0xFB, 0x81, 0x80,
+0x04, 0x61, 0x0B, 0x80, 0x05, 0x50, 0xEE, 0x70, 0x06, 0x40, 0xED, 0x80, 0x07, 0x30, 0xD0, 0x70,
+0x08, 0x20, 0xCF, 0x80, 0x09, 0x10, 0xB2, 0x70, 0x0A, 0x00, 0xB1, 0x80, 0x0A, 0xF0, 0x94, 0x70,
+0x0B, 0xE0, 0x93, 0x80, 0x0C, 0xD9, 0xB0, 0xF0, 0x0D, 0xC0, 0x75, 0x80, 0x0E, 0xB9, 0x92, 0xF0,
+0x0F, 0xA9, 0x92, 0x00, 0x10, 0x99, 0x74, 0xF0, 0x11, 0x89, 0x74, 0x00, 0x12, 0x79, 0x56, 0xF0,
+0x13, 0x69, 0x56, 0x00, 0x14, 0x59, 0x38, 0xF0, 0x15, 0x49, 0x38, 0x00, 0x16, 0x39, 0x1A, 0xF0,
+0x17, 0x29, 0x1A, 0x00, 0x18, 0x22, 0x37, 0x70, 0x19, 0x08, 0xFC, 0x00, 0x1A, 0x02, 0x19, 0x70,
+0x1A, 0xF2, 0x18, 0x80, 0x1B, 0xE1, 0xFB, 0x70, 0x1C, 0xD1, 0xFA, 0x80, 0x1D, 0xC1, 0xDD, 0x70,
+0x1E, 0xB1, 0xDC, 0x80, 0x1F, 0xA1, 0xBF, 0x70, 0x20, 0x76, 0x0F, 0x00, 0x21, 0x81, 0xA1, 0x70,
+0x22, 0x55, 0xF1, 0x00, 0x23, 0x6A, 0xBD, 0xF0, 0x24, 0x35, 0xD3, 0x00, 0x25, 0x4A, 0x9F, 0xF0,
+0x26, 0x15, 0xB5, 0x00, 0x27, 0x2A, 0x81, 0xF0, 0x27, 0xFE, 0xD1, 0x80, 0x29, 0x0A, 0x63, 0xF0,
+0x29, 0xDE, 0xB3, 0x80, 0x2A, 0xEA, 0x45, 0xF0, 0x2B, 0xBE, 0x95, 0x80, 0x2C, 0xD3, 0x62, 0x70,
+0x2D, 0x9E, 0x77, 0x80, 0x2E, 0xB3, 0x44, 0x70, 0x2F, 0x7E, 0x59, 0x80, 0x30, 0x93, 0x26, 0x70,
+0x31, 0x67, 0x76, 0x00, 0x32, 0x73, 0x08, 0x70, 0x33, 0x47, 0x58, 0x00, 0x34, 0x52, 0xEA, 0x70,
+0x35, 0x27, 0x3A, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x37, 0x07, 0x1C, 0x00, 0x38, 0x1B, 0xE8, 0xF0,
+0x38, 0xE6, 0xFE, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x3A, 0xC6, 0xE0, 0x00, 0x3B, 0xDB, 0xAC, 0xF0,
+0x3C, 0xAF, 0xFC, 0x80, 0x3D, 0xBB, 0x8E, 0xF0, 0x3E, 0x8F, 0xDE, 0x80, 0x3F, 0x9B, 0x70, 0xF0,
+0x40, 0x6F, 0xC0, 0x80, 0x41, 0x84, 0x8D, 0x70, 0x42, 0x4F, 0xA2, 0x80, 0x43, 0x64, 0x6F, 0x70,
+0x44, 0x2F, 0x84, 0x80, 0x45, 0x44, 0x51, 0x70, 0x45, 0xF3, 0xB7, 0x00, 0x47, 0x2D, 0x6D, 0xF0,
+0x47, 0xD3, 0x99, 0x00, 0x49, 0x0D, 0x4F, 0xF0, 0x49, 0xB3, 0x7B, 0x00, 0x4A, 0xED, 0x31, 0xF0,
+0x4B, 0x9C, 0x97, 0x80, 0x4C, 0xD6, 0x4E, 0x70, 0x4D, 0x7C, 0x79, 0x80, 0x4E, 0xB6, 0x30, 0x70,
+0x4F, 0x5C, 0x5B, 0x80, 0x50, 0x96, 0x12, 0x70, 0x51, 0x3C, 0x3D, 0x80, 0x52, 0x75, 0xF4, 0x70,
+0x53, 0x1C, 0x1F, 0x80, 0x54, 0x55, 0xD6, 0x70, 0x54, 0xFC, 0x01, 0x80, 0x56, 0x35, 0xB8, 0x70,
+0x56, 0xE5, 0x1E, 0x00, 0x58, 0x1E, 0xD4, 0xF0, 0x58, 0xC5, 0x00, 0x00, 0x59, 0xFE, 0xB6, 0xF0,
+0x5A, 0xA4, 0xE2, 0x00, 0x5B, 0xDE, 0x98, 0xF0, 0x5C, 0x84, 0xC4, 0x00, 0x5D, 0xBE, 0x7A, 0xF0,
+0x5E, 0x64, 0xA6, 0x00, 0x5F, 0x9E, 0x5C, 0xF0, 0x60, 0x4D, 0xC2, 0x80, 0x61, 0x87, 0x79, 0x70,
+0x62, 0x2D, 0xA4, 0x80, 0x63, 0x67, 0x5B, 0x70, 0x64, 0x0D, 0x86, 0x80, 0x65, 0x47, 0x3D, 0x70,
+0x65, 0xED, 0x68, 0x80, 0x67, 0x27, 0x1F, 0x70, 0x67, 0xCD, 0x4A, 0x80, 0x69, 0x07, 0x01, 0x70,
+0x69, 0xAD, 0x2C, 0x80, 0x6A, 0xE6, 0xE3, 0x70, 0x6B, 0x96, 0x49, 0x00, 0x6C, 0xCF, 0xFF, 0xF0,
+0x6D, 0x76, 0x2B, 0x00, 0x6E, 0xAF, 0xE1, 0xF0, 0x6F, 0x56, 0x0D, 0x00, 0x70, 0x8F, 0xC3, 0xF0,
+0x71, 0x35, 0xEF, 0x00, 0x72, 0x6F, 0xA5, 0xF0, 0x73, 0x15, 0xD1, 0x00, 0x74, 0x4F, 0x87, 0xF0,
+0x74, 0xFE, 0xED, 0x80, 0x76, 0x38, 0xA4, 0x70, 0x76, 0xDE, 0xCF, 0x80, 0x78, 0x18, 0x86, 0x70,
+0x78, 0xBE, 0xB1, 0x80, 0x79, 0xF8, 0x68, 0x70, 0x7A, 0x9E, 0x93, 0x80, 0x7B, 0xD8, 0x4A, 0x70,
+0x7C, 0x7E, 0x75, 0x80, 0x7D, 0xB8, 0x2C, 0x70, 0x7E, 0x5E, 0x57, 0x80, 0x7F, 0x98, 0x0E, 0x70,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x01,
+0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x0C, 0xFF, 0xFF, 0xAB,
+0xA0, 0x00, 0x08, 0x2D, 0x30, 0x30, 0x00, 0x43, 0x44, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x45,
+0x53, 0x54, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0xFF,
+0xFF, 0xFF, 0xFF, 0xD5, 0xFB, 0x81, 0x80, 0x00, 0x00, 0x00, 0x00, 0x04, 0x61, 0x0B, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x05, 0x50, 0xEE, 0x70, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xED, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x07, 0x30, 0xD0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x08, 0x20, 0xCF, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x09, 0x10, 0xB2, 0x70, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0xB1, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x0A, 0xF0, 0x94, 0x70, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0x93, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x0C, 0xD9, 0xB0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x75, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x0E, 0xB9, 0x92, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0x92, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x10, 0x99, 0x74, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x74, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x12, 0x79, 0x56, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x56, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x14, 0x59, 0x38, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x38, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x16, 0x39, 0x1A, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x1A, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x18, 0x22, 0x37, 0x70, 0x00, 0x00, 0x00, 0x00, 0x19, 0x08, 0xFC, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x1A, 0x02, 0x19, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x18, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x1B, 0xE1, 0xFB, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD1, 0xFA, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x1D, 0xC1, 0xDD, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xDC, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x1F, 0xA1, 0xBF, 0x70, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x0F, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x21, 0x81, 0xA1, 0x70, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xF1, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x23, 0x6A, 0xBD, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xD3, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x25, 0x4A, 0x9F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xB5, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x27, 0x2A, 0x81, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xD1, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x29, 0x0A, 0x63, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xB3, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x2A, 0xEA, 0x45, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0x95, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x2C, 0xD3, 0x62, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x77, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x2E, 0xB3, 0x44, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x59, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x30, 0x93, 0x26, 0x70, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x76, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x32, 0x73, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x58, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x34, 0x52, 0xEA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x3A, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x36, 0x32, 0xCC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x1C, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x38, 0x1B, 0xE8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE6, 0xFE, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x39, 0xFB, 0xCA, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xE0, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x3B, 0xDB, 0xAC, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xAF, 0xFC, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x3D, 0xBB, 0x8E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xDE, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x3F, 0x9B, 0x70, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xC0, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x41, 0x84, 0x8D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xA2, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x43, 0x64, 0x6F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x84, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x45, 0x44, 0x51, 0x70, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xB7, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x47, 0x2D, 0x6D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x47, 0xD3, 0x99, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x49, 0x0D, 0x4F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x49, 0xB3, 0x7B, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x4A, 0xED, 0x31, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0x97, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x4C, 0xD6, 0x4E, 0x70, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x79, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x4E, 0xB6, 0x30, 0x70, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x5B, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x50, 0x96, 0x12, 0x70, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x3D, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x52, 0x75, 0xF4, 0x70, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x1F, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x54, 0x55, 0xD6, 0x70, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFC, 0x01, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x56, 0x35, 0xB8, 0x70, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x1E, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x58, 0x1E, 0xD4, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC5, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x59, 0xFE, 0xB6, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xE2, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x5B, 0xDE, 0x98, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xC4, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x5D, 0xBE, 0x7A, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0xA6, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x5F, 0x9E, 0x5C, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xC2, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x61, 0x87, 0x79, 0x70, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0xA4, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x63, 0x67, 0x5B, 0x70, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0x86, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x65, 0x47, 0x3D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x68, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x67, 0x27, 0x1F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x4A, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x69, 0x07, 0x01, 0x70, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x2C, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x6A, 0xE6, 0xE3, 0x70, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x49, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x6C, 0xCF, 0xFF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x2B, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x6E, 0xAF, 0xE1, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x56, 0x0D, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x70, 0x8F, 0xC3, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x71, 0x35, 0xEF, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x72, 0x6F, 0xA5, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xD1, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x74, 0x4F, 0x87, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFE, 0xED, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x76, 0x38, 0xA4, 0x70, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xCF, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x78, 0x18, 0x86, 0x70, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xB1, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x79, 0xF8, 0x68, 0x70, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0x93, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x7B, 0xD8, 0x4A, 0x70, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x75, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x7D, 0xB8, 0x2C, 0x70, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x57, 0x80, 0x00,
+0x00, 0x00, 0x00, 0x7F, 0x98, 0x0E, 0x70, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x03, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0xFF, 0xFF,
+0xB9, 0xB0, 0x00, 0x0C, 0xFF, 0xFF, 0xAB, 0xA0, 0x00, 0x08, 0x2D, 0x30, 0x30, 0x00, 0x43, 0x44,
+0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x0A, 0x43, 0x53, 0x54, 0x36, 0x43,
+0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E,
+0x30, 0x0A, 0x00, 0xFB, 0x4E, 0x33, 0x00, 0x81, 0xF5, 0xDB, 0x00, 0x00, 0x00, 0x17, 0x43, 0x65,
+0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x2D, 0x20, 0x4E, 0x55, 0x20, 0x28, 0x52, 0x65, 0x73, 0x6F,
+0x6C, 0x75, 0x74, 0x65, 0x29, 
 
 /* America/Rio_Branco */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x42, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -38210,9 +38733,8 @@
 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x01, 0x01, 0x0A, 0x3C, 0x2D, 0x30, 0x34, 0x3E, 0x34, 0x3C, 0x2D, 0x30, 0x33, 0x3E, 0x2C, 0x4D,
 0x39, 0x2E, 0x31, 0x2E, 0x36, 0x2F, 0x32, 0x34, 0x2C, 0x4D, 0x34, 0x2E, 0x31, 0x2E, 0x36, 0x2F,
-0x32, 0x34, 0x0A, 0x00, 0x56, 0x49, 0xD8, 0x00, 0xA6, 0xD4, 0x55, 0x00, 0x00, 0x00, 0x12, 0x43,
-0x68, 0x69, 0x6C, 0x65, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x61, 0x72, 0x65, 0x61, 0x73,
-0x29, 
+0x32, 0x34, 0x0A, 0x00, 0x56, 0x49, 0xD8, 0x00, 0xA6, 0xD4, 0x55, 0x00, 0x00, 0x00, 0x0D, 0x6D,
+0x6F, 0x73, 0x74, 0x20, 0x6F, 0x66, 0x20, 0x43, 0x68, 0x69, 0x6C, 0x65, 
 
 /* America/Santo_Domingo */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x44, 0x4F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -39610,9 +40132,8 @@
 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0A, 0x50,
 0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31,
 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0xBA, 0xF8, 0x95, 0x00, 0x60, 0x1A, 0xDD, 0x00, 0x00,
-0x00, 0x21, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x55,
-0x53, 0x20, 0x2D, 0x20, 0x42, 0x61, 0x6A, 0x61, 0x20, 0x43, 0x61, 0x6C, 0x69, 0x66, 0x6F, 0x72,
-0x6E, 0x69, 0x61, 
+0x00, 0x0F, 0x42, 0x61, 0x6A, 0x61, 0x20, 0x43, 0x61, 0x6C, 0x69, 0x66, 0x6F, 0x72, 0x6E, 0x69,
+0x61, 
 
 /* America/Toronto */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -40061,7 +40582,7 @@
 0x00, 0x00, 0x00, 0x5D, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x25, 0x80, 0x00, 0x00, 0x00,
 0x9E, 0xB8, 0xCB, 0xB0, 0x9F, 0xBB, 0x23, 0xA0, 0xA0, 0xD0, 0x0C, 0xB0, 0xA1, 0xA2, 0xD2, 0x80,
 0xCB, 0x89, 0x28, 0xB0, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x61, 0x34, 0x20, 0xF7, 0x2F, 0x76, 0x90,
-0xF8, 0x28, 0xA2, 0x10, 0xFB, 0x1D, 0x5F, 0x10, 0x13, 0x69, 0x72, 0x20, 0x14, 0x59, 0x55, 0x10,
+0xF8, 0x28, 0xA2, 0x10, 0xF8, 0xC5, 0x84, 0x90, 0x13, 0x69, 0x72, 0x20, 0x14, 0x59, 0x55, 0x10,
 0x15, 0x49, 0x54, 0x20, 0x16, 0x39, 0x37, 0x10, 0x17, 0x29, 0x36, 0x20, 0x18, 0x22, 0x53, 0x90,
 0x19, 0x09, 0x18, 0x20, 0x1A, 0x02, 0x35, 0x90, 0x1A, 0xF2, 0x34, 0xA0, 0x1B, 0xE2, 0x17, 0x90,
 0x1C, 0xD2, 0x16, 0xA0, 0x1D, 0xC1, 0xF9, 0x90, 0x1E, 0xB1, 0xF8, 0xA0, 0x1F, 0xA1, 0xDB, 0x90,
@@ -40102,7 +40623,7 @@
 0xFF, 0xFF, 0xA0, 0xD0, 0x0C, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0xA2, 0xD2, 0x80, 0xFF, 0xFF,
 0xFF, 0xFF, 0xCB, 0x89, 0x28, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF,
 0xFF, 0xFF, 0xD2, 0x61, 0x34, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x2F, 0x76, 0x90, 0xFF, 0xFF,
-0xFF, 0xFF, 0xF8, 0x28, 0xA2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0x1D, 0x5F, 0x10, 0x00, 0x00,
+0xFF, 0xFF, 0xF8, 0x28, 0xA2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC5, 0x84, 0x90, 0x00, 0x00,
 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x55, 0x10, 0x00, 0x00,
 0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x37, 0x10, 0x00, 0x00,
 0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x53, 0x90, 0x00, 0x00,
@@ -40493,11 +41014,18 @@
 0x73, 0x6B, 0x61, 0x20, 0x2D, 0x20, 0x59, 0x61, 0x6B, 0x75, 0x74, 0x61, 0x74, 
 
 /* America/Yellowknife */
-0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x7A, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x19, 0xBE, 0x2A, 0x18, 0x00,
-0xCB, 0x89, 0x0C, 0x90, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x61, 0x18, 0x00, 0xF7, 0x2F, 0x5A, 0x70,
-0xF8, 0x28, 0x85, 0xF0, 0x13, 0x69, 0x64, 0x10, 0x14, 0x59, 0x47, 0x00, 0x15, 0x49, 0x46, 0x10,
+0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x96, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0x88, 0xDE, 0xCE, 0xE0,
+0x9E, 0xB8, 0xAF, 0x90, 0x9F, 0xBB, 0x07, 0x80, 0xA0, 0x98, 0x91, 0x90, 0xA0, 0xD2, 0x85, 0x80,
+0xA2, 0x8A, 0xE8, 0x90, 0xA3, 0x84, 0x06, 0x00, 0xA4, 0x6A, 0xCA, 0x90, 0xA5, 0x35, 0xC3, 0x80,
+0xA6, 0x53, 0xE7, 0x10, 0xA7, 0x15, 0xA5, 0x80, 0xA8, 0x33, 0xC9, 0x10, 0xA8, 0xFE, 0xC2, 0x00,
+0xCB, 0x89, 0x0C, 0x90, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x61, 0x18, 0x00, 0xD5, 0x55, 0xE3, 0x10,
+0xD6, 0x20, 0xDC, 0x00, 0x04, 0x61, 0x19, 0x90, 0x05, 0x50, 0xFC, 0x80, 0x06, 0x40, 0xFB, 0x90,
+0x07, 0x30, 0xDE, 0x80, 0x08, 0x20, 0xDD, 0x90, 0x09, 0x10, 0xC0, 0x80, 0x0A, 0x00, 0xBF, 0x90,
+0x0A, 0xF0, 0xA2, 0x80, 0x0B, 0xE0, 0xA1, 0x90, 0x0C, 0xD9, 0xBF, 0x00, 0x0D, 0xC0, 0x83, 0x90,
+0x0E, 0xB9, 0xA1, 0x00, 0x0F, 0xA9, 0xA0, 0x10, 0x10, 0x99, 0x83, 0x00, 0x11, 0x89, 0x82, 0x10,
+0x12, 0x79, 0x65, 0x00, 0x13, 0x69, 0x64, 0x10, 0x14, 0x59, 0x47, 0x00, 0x15, 0x49, 0x46, 0x10,
 0x16, 0x39, 0x29, 0x00, 0x17, 0x29, 0x28, 0x10, 0x18, 0x22, 0x45, 0x80, 0x19, 0x09, 0x0A, 0x10,
 0x1A, 0x02, 0x27, 0x80, 0x1A, 0xF2, 0x26, 0x90, 0x1B, 0xE2, 0x09, 0x80, 0x1C, 0xD2, 0x08, 0x90,
 0x1D, 0xC1, 0xEB, 0x80, 0x1E, 0xB1, 0xEA, 0x90, 0x1F, 0xA1, 0xCD, 0x80, 0x20, 0x76, 0x1D, 0x10,
@@ -40526,99 +41054,113 @@
 0x74, 0x4F, 0x96, 0x00, 0x74, 0xFE, 0xFB, 0x90, 0x76, 0x38, 0xB2, 0x80, 0x76, 0xDE, 0xDD, 0x90,
 0x78, 0x18, 0x94, 0x80, 0x78, 0xBE, 0xBF, 0x90, 0x79, 0xF8, 0x76, 0x80, 0x7A, 0x9E, 0xA1, 0x90,
 0x7B, 0xD8, 0x58, 0x80, 0x7C, 0x7E, 0x83, 0x90, 0x7D, 0xB8, 0x3A, 0x80, 0x7E, 0x5E, 0x65, 0x90,
-0x7F, 0x98, 0x1C, 0x80, 0x03, 0x01, 0x02, 0x03, 0x04, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03,
-0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03,
-0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03,
-0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03,
-0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03,
-0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03,
-0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03,
-0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x08,
-0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x10, 0xFF, 0xFF, 0xAB, 0xA0,
-0x01, 0x15, 0x2D, 0x30, 0x30, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x4D, 0x50, 0x54, 0x00, 0x4D, 0x53,
-0x54, 0x00, 0x4D, 0x44, 0x44, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00,
-0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x00, 0x00, 0x00, 0x06, 0x00,
-0x00, 0x00, 0x19, 0xFF, 0xFF, 0xFF, 0xFF, 0xBE, 0x2A, 0x18, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB,
-0x89, 0x0C, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2,
-0x61, 0x18, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x2F, 0x5A, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8,
-0x28, 0x85, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x64, 0x10, 0x00, 0x00, 0x00, 0x00, 0x14,
-0x59, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x16,
-0x39, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x18,
-0x22, 0x45, 0x80, 0x00, 0x00, 0x00, 0x00, 0x19, 0x09, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1A,
-0x02, 0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x26, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B,
-0xE2, 0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD2, 0x08, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1D,
-0xC1, 0xEB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1F,
-0xA1, 0xCD, 0x80, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x1D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21,
-0x81, 0xAF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xFF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23,
-0x6A, 0xCC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xE1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25,
-0x4A, 0xAE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xC3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27,
-0x2A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xDF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29,
-0x0A, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xC1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A,
-0xEA, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0xA3, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C,
-0xD3, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x85, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E,
-0xB3, 0x52, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x67, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30,
-0x93, 0x34, 0x80, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32,
-0x73, 0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34,
-0x52, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36,
-0x32, 0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38,
-0x1B, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39,
-0xFB, 0xD9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xEE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B,
-0xDB, 0xBB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D,
-0xBB, 0x9D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F,
-0x9B, 0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41,
-0x84, 0x9B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43,
-0x64, 0x7D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x92, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45,
-0x44, 0x5F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xC5, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47,
-0x2D, 0x7C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0xD3, 0xA7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49,
-0x0D, 0x5E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0xB3, 0x89, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A,
-0xED, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0xA5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4C,
-0xD6, 0x5C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x87, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4E,
-0xB6, 0x3E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x69, 0x90, 0x00, 0x00, 0x00, 0x00, 0x50,
-0x96, 0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x4B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52,
-0x76, 0x02, 0x80, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x2D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54,
-0x55, 0xE4, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFC, 0x0F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56,
-0x35, 0xC6, 0x80, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x2C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58,
-0x1E, 0xE3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC5, 0x0E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x59,
-0xFE, 0xC5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xF0, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5B,
-0xDE, 0xA7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xD2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D,
-0xBE, 0x89, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F,
-0x9E, 0x6B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xD0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x61,
-0x87, 0x87, 0x80, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0xB2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x63,
-0x67, 0x69, 0x80, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x65,
-0x47, 0x4B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67,
-0x27, 0x2D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69,
-0x07, 0x0F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A,
-0xE6, 0xF1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x57, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6C,
-0xD0, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6E,
-0xAF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x56, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x70,
-0x8F, 0xD2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x71, 0x35, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72,
-0x6F, 0xB4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74,
-0x4F, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFE, 0xFB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76,
-0x38, 0xB2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xDD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78,
-0x18, 0x94, 0x80, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x79,
-0xF8, 0x76, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7B,
-0xD8, 0x58, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D,
-0xB8, 0x3A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F,
-0x98, 0x1C, 0x80, 0x03, 0x01, 0x02, 0x03, 0x04, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05,
-0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05,
-0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05,
-0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05,
-0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05,
-0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05,
-0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05,
-0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x05, 0x03, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x08, 0xFF,
-0xFF, 0x9D, 0x90, 0x00, 0x0C, 0xFF, 0xFF, 0xB9, 0xB0, 0x01, 0x10, 0xFF, 0xFF, 0xAB, 0xA0, 0x01,
-0x15, 0x2D, 0x30, 0x30, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x4D, 0x50, 0x54, 0x00, 0x4D, 0x53, 0x54,
-0x00, 0x4D, 0x44, 0x44, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x4D, 0x44, 0x54, 0x2C, 0x4D,
-0x33, 0x2E, 0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0xE8,
-0x9E, 0xC7, 0x00, 0x64, 0x2C, 0x88, 0x00, 0x00, 0x00, 0x17, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61,
-0x69, 0x6E, 0x20, 0x2D, 0x20, 0x4E, 0x54, 0x20, 0x28, 0x63, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C,
-0x29, 
+0x7F, 0x98, 0x1C, 0x80, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x03, 0x04, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 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, 0xFF, 0xFF, 0x95, 0xA0, 0x00, 0x00,
+0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0,
+0x01, 0x0C, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00,
+0x4D, 0x53, 0x54, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x4D, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00,
+0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00,
+0x00, 0x14, 0xFF, 0xFF, 0xFF, 0xFF, 0x88, 0xDE, 0xCE, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0xB8,
+0xAF, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xBB, 0x07, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0x98,
+0x91, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA0, 0xD2, 0x85, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0x8A,
+0xE8, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA3, 0x84, 0x06, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0x6A,
+0xCA, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xA5, 0x35, 0xC3, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA6, 0x53,
+0xE7, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xA7, 0x15, 0xA5, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0x33,
+0xC9, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xA8, 0xFE, 0xC2, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x89,
+0x0C, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x61,
+0x18, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0x55, 0xE3, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xD6, 0x20,
+0xDC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x61, 0x19, 0x90, 0x00, 0x00, 0x00, 0x00, 0x05, 0x50,
+0xFC, 0x80, 0x00, 0x00, 0x00, 0x00, 0x06, 0x40, 0xFB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x07, 0x30,
+0xDE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x08, 0x20, 0xDD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x09, 0x10,
+0xC0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF0,
+0xA2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE0, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xD9,
+0xBF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC0, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x0E, 0xB9,
+0xA1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA9, 0xA0, 0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x99,
+0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x89, 0x82, 0x10, 0x00, 0x00, 0x00, 0x00, 0x12, 0x79,
+0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x69, 0x64, 0x10, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59,
+0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x49, 0x46, 0x10, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39,
+0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x29, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22,
+0x45, 0x80, 0x00, 0x00, 0x00, 0x00, 0x19, 0x09, 0x0A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x02,
+0x27, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF2, 0x26, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xE2,
+0x09, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD2, 0x08, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1D, 0xC1,
+0xEB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB1, 0xEA, 0x90, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xA1,
+0xCD, 0x80, 0x00, 0x00, 0x00, 0x00, 0x20, 0x76, 0x1D, 0x10, 0x00, 0x00, 0x00, 0x00, 0x21, 0x81,
+0xAF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x22, 0x55, 0xFF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x23, 0x6A,
+0xCC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x35, 0xE1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x25, 0x4A,
+0xAE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x26, 0x15, 0xC3, 0x10, 0x00, 0x00, 0x00, 0x00, 0x27, 0x2A,
+0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0xFE, 0xDF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x29, 0x0A,
+0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0xDE, 0xC1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xEA,
+0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xBE, 0xA3, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xD3,
+0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x9E, 0x85, 0x90, 0x00, 0x00, 0x00, 0x00, 0x2E, 0xB3,
+0x52, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x7E, 0x67, 0x90, 0x00, 0x00, 0x00, 0x00, 0x30, 0x93,
+0x34, 0x80, 0x00, 0x00, 0x00, 0x00, 0x31, 0x67, 0x84, 0x10, 0x00, 0x00, 0x00, 0x00, 0x32, 0x73,
+0x16, 0x80, 0x00, 0x00, 0x00, 0x00, 0x33, 0x47, 0x66, 0x10, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52,
+0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x35, 0x27, 0x48, 0x10, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32,
+0xDA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x37, 0x07, 0x2A, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B,
+0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xE7, 0x0C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB,
+0xD9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xC6, 0xEE, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB,
+0xBB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xB0, 0x0A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB,
+0x9D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x8F, 0xEC, 0x90, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B,
+0x7F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x6F, 0xCE, 0x90, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84,
+0x9B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x42, 0x4F, 0xB0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x43, 0x64,
+0x7D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x44, 0x2F, 0x92, 0x90, 0x00, 0x00, 0x00, 0x00, 0x45, 0x44,
+0x5F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x45, 0xF3, 0xC5, 0x10, 0x00, 0x00, 0x00, 0x00, 0x47, 0x2D,
+0x7C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0xD3, 0xA7, 0x10, 0x00, 0x00, 0x00, 0x00, 0x49, 0x0D,
+0x5E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0xB3, 0x89, 0x10, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xED,
+0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x9C, 0xA5, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xD6,
+0x5C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x7C, 0x87, 0x90, 0x00, 0x00, 0x00, 0x00, 0x4E, 0xB6,
+0x3E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x4F, 0x5C, 0x69, 0x90, 0x00, 0x00, 0x00, 0x00, 0x50, 0x96,
+0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x51, 0x3C, 0x4B, 0x90, 0x00, 0x00, 0x00, 0x00, 0x52, 0x76,
+0x02, 0x80, 0x00, 0x00, 0x00, 0x00, 0x53, 0x1C, 0x2D, 0x90, 0x00, 0x00, 0x00, 0x00, 0x54, 0x55,
+0xE4, 0x80, 0x00, 0x00, 0x00, 0x00, 0x54, 0xFC, 0x0F, 0x90, 0x00, 0x00, 0x00, 0x00, 0x56, 0x35,
+0xC6, 0x80, 0x00, 0x00, 0x00, 0x00, 0x56, 0xE5, 0x2C, 0x10, 0x00, 0x00, 0x00, 0x00, 0x58, 0x1E,
+0xE3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0xC5, 0x0E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x59, 0xFE,
+0xC5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5A, 0xA4, 0xF0, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xDE,
+0xA7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x84, 0xD2, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5D, 0xBE,
+0x89, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x64, 0xB4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x9E,
+0x6B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x4D, 0xD0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x61, 0x87,
+0x87, 0x80, 0x00, 0x00, 0x00, 0x00, 0x62, 0x2D, 0xB2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x63, 0x67,
+0x69, 0x80, 0x00, 0x00, 0x00, 0x00, 0x64, 0x0D, 0x94, 0x90, 0x00, 0x00, 0x00, 0x00, 0x65, 0x47,
+0x4B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x65, 0xED, 0x76, 0x90, 0x00, 0x00, 0x00, 0x00, 0x67, 0x27,
+0x2D, 0x80, 0x00, 0x00, 0x00, 0x00, 0x67, 0xCD, 0x58, 0x90, 0x00, 0x00, 0x00, 0x00, 0x69, 0x07,
+0x0F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x69, 0xAD, 0x3A, 0x90, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE6,
+0xF1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x6B, 0x96, 0x57, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xD0,
+0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xAF,
+0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x56, 0x1B, 0x10, 0x00, 0x00, 0x00, 0x00, 0x70, 0x8F,
+0xD2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x71, 0x35, 0xFD, 0x10, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6F,
+0xB4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x73, 0x15, 0xDF, 0x10, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4F,
+0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x74, 0xFE, 0xFB, 0x90, 0x00, 0x00, 0x00, 0x00, 0x76, 0x38,
+0xB2, 0x80, 0x00, 0x00, 0x00, 0x00, 0x76, 0xDE, 0xDD, 0x90, 0x00, 0x00, 0x00, 0x00, 0x78, 0x18,
+0x94, 0x80, 0x00, 0x00, 0x00, 0x00, 0x78, 0xBE, 0xBF, 0x90, 0x00, 0x00, 0x00, 0x00, 0x79, 0xF8,
+0x76, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9E, 0xA1, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xD8,
+0x58, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x7E, 0x83, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB8,
+0x3A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x5E, 0x65, 0x90, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x98,
+0x1C, 0x80, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03,
+0x04, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x01, 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, 0xFF, 0xFF, 0x95, 0xA0, 0x00, 0x00, 0xFF, 0xFF,
+0xAB, 0xA0, 0x01, 0x04, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x08, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x0C,
+0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x44, 0x54, 0x00, 0x4D, 0x53,
+0x54, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x4D, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x0A, 0x4D, 0x53, 0x54, 0x37, 0x4D, 0x44, 0x54, 0x2C, 0x4D, 0x33, 0x2E,
+0x32, 0x2E, 0x30, 0x2C, 0x4D, 0x31, 0x31, 0x2E, 0x31, 0x2E, 0x30, 0x0A, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Antarctica/Casey */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x41, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -41559,8 +42101,8 @@
 0x54, 0x60, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x35, 0x00, 0x2B, 0x30, 0x37, 0x00,
 0x2B, 0x30, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0A, 0x3C,
 0x2B, 0x30, 0x36, 0x3E, 0x2D, 0x36, 0x0A, 0x00, 0xCB, 0x52, 0xC8, 0x01, 0x88, 0x13, 0x18, 0x00,
-0x00, 0x00, 0x17, 0x4B, 0x61, 0x7A, 0x61, 0x6B, 0x68, 0x73, 0x74, 0x61, 0x6E, 0x20, 0x28, 0x6D,
-0x6F, 0x73, 0x74, 0x20, 0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 
+0x00, 0x00, 0x12, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6F, 0x66, 0x20, 0x4B, 0x61, 0x7A, 0x61, 0x6B,
+0x68, 0x73, 0x74, 0x61, 0x6E, 
 
 /* Asia/Amman */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4A, 0x4F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -43149,15 +43691,15 @@
 0x56, 0x29, 0x5C, 0x60, 0x56, 0xF5, 0xC2, 0xF0, 0x58, 0x13, 0xCA, 0x60, 0x58, 0xD5, 0xA4, 0xF0,
 0x59, 0xF3, 0xAC, 0x60, 0x5A, 0xB5, 0x86, 0xF0, 0x5B, 0xD3, 0x8E, 0x60, 0x5C, 0x9D, 0x43, 0xE0,
 0x5D, 0xB3, 0x62, 0x50, 0x5E, 0x7E, 0x77, 0x60, 0x5F, 0x93, 0x52, 0x60, 0x60, 0x5E, 0x59, 0x60,
-0x61, 0x7B, 0x1D, 0x60, 0x62, 0x3F, 0x8C, 0xE0, 0x63, 0x5C, 0x5E, 0xF0, 0x64, 0x1E, 0x39, 0x80,
-0x65, 0x3C, 0x40, 0xF0, 0x66, 0x07, 0x56, 0x00, 0x67, 0x1C, 0x22, 0xF0, 0x67, 0xE7, 0x38, 0x00,
+0x61, 0x7B, 0x1D, 0x60, 0x62, 0x3F, 0x8C, 0xE0, 0x63, 0x5C, 0x5E, 0xF0, 0x64, 0x4C, 0x5E, 0x00,
+0x65, 0x3C, 0x40, 0xF0, 0x66, 0x19, 0xCB, 0x00, 0x67, 0x1C, 0x22, 0xF0, 0x67, 0xF0, 0x72, 0x80,
 0x68, 0xFC, 0x04, 0xF0, 0x69, 0xC7, 0x1A, 0x00, 0x6A, 0xDB, 0xE6, 0xF0, 0x6B, 0xA6, 0xFC, 0x00,
 0x6C, 0xC5, 0x03, 0x70, 0x6D, 0x86, 0xDE, 0x00, 0x6E, 0xA4, 0xE5, 0x70, 0x6F, 0x66, 0xC0, 0x00,
 0x70, 0x84, 0xC7, 0x70, 0x71, 0x4F, 0xDC, 0x80, 0x72, 0x64, 0xA9, 0x70, 0x73, 0x2F, 0xBE, 0x80,
 0x74, 0x44, 0x8B, 0x70, 0x75, 0x0F, 0xA0, 0x80, 0x76, 0x2D, 0xA7, 0xF0, 0x76, 0xEF, 0x82, 0x80,
 0x78, 0x0D, 0x89, 0xF0, 0x78, 0xCF, 0x64, 0x80, 0x79, 0xED, 0x6B, 0xF0, 0x7A, 0xAF, 0x46, 0x80,
-0x7B, 0xCD, 0x4D, 0xF0, 0x7C, 0x98, 0x63, 0x00, 0x7D, 0xAD, 0x2F, 0xF0, 0x7E, 0x78, 0x45, 0x00,
-0x7F, 0x8D, 0x11, 0xF0, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x7B, 0xCD, 0x4D, 0xF0, 0x7C, 0x98, 0x63, 0x00, 0x7D, 0xA3, 0xF5, 0x70, 0x7E, 0x78, 0x45, 0x00,
+0x7F, 0x7A, 0x9C, 0xF0, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x06, 0x05, 0x06, 0x05, 0x06, 0x07, 0x08, 0x07, 0x08, 0x05,
 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05,
@@ -43175,7 +43717,7 @@
 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54,
 0x5A, 0x69, 0x66, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x96, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x15, 0xFF, 0xFF, 0xFF, 0xFF, 0x7D,
+0x00, 0x01, 0x30, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x15, 0xFF, 0xFF, 0xFF, 0xFF, 0x7D,
 0xBD, 0x4A, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x59, 0xCF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8,
 0xFA, 0xA6, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0x38, 0x9C, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC,
 0xE5, 0xEB, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xAC, 0xFE, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE,
@@ -43236,9 +43778,9 @@
 0x7E, 0x77, 0x60, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x93, 0x52, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60,
 0x5E, 0x59, 0x60, 0x00, 0x00, 0x00, 0x00, 0x61, 0x7B, 0x1D, 0x60, 0x00, 0x00, 0x00, 0x00, 0x62,
 0x3F, 0x8C, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x63, 0x5C, 0x5E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x64,
-0x1E, 0x39, 0x80, 0x00, 0x00, 0x00, 0x00, 0x65, 0x3C, 0x40, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x66,
-0x07, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x67, 0x1C, 0x22, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x67,
-0xE7, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0xFC, 0x04, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x69,
+0x4C, 0x5E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x65, 0x3C, 0x40, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x66,
+0x19, 0xCB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x67, 0x1C, 0x22, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x67,
+0xF0, 0x72, 0x80, 0x00, 0x00, 0x00, 0x00, 0x68, 0xFC, 0x04, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x69,
 0xC7, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xDB, 0xE6, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x6B,
 0xA6, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xC5, 0x03, 0x70, 0x00, 0x00, 0x00, 0x00, 0x6D,
 0x86, 0xDE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xA4, 0xE5, 0x70, 0x00, 0x00, 0x00, 0x00, 0x6F,
@@ -43249,8 +43791,85 @@
 0xEF, 0x82, 0x80, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0D, 0x89, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x78,
 0xCF, 0x64, 0x80, 0x00, 0x00, 0x00, 0x00, 0x79, 0xED, 0x6B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x7A,
 0xAF, 0x46, 0x80, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xCD, 0x4D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x7C,
-0x98, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xAD, 0x2F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x7E,
-0x78, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x8D, 0x11, 0xF0, 0x03, 0x01, 0x02, 0x01, 0x02,
+0x98, 0x63, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xA3, 0xF5, 0x70, 0x00, 0x00, 0x00, 0x00, 0x7E,
+0x78, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x7A, 0x9C, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x80,
+0x58, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x48, 0x09, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x82,
+0x38, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x1E, 0xB1, 0x70, 0x00, 0x00, 0x00, 0x00, 0x83,
+0x4C, 0xE4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x56, 0x10, 0x70, 0x00, 0x00, 0x00, 0x00, 0x84,
+0x17, 0xEB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0xEC, 0x1E, 0x70, 0x00, 0x00, 0x00, 0x00, 0x85,
+0x23, 0x8B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x85, 0x35, 0xF2, 0x70, 0x00, 0x00, 0x00, 0x00, 0x86,
+0x01, 0x07, 0x80, 0x00, 0x00, 0x00, 0x00, 0x86, 0xC2, 0xC5, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x86,
+0xF0, 0xF8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x87, 0x15, 0xD4, 0x70, 0x00, 0x00, 0x00, 0x00, 0x87,
+0xE0, 0xE9, 0x80, 0x00, 0x00, 0x00, 0x00, 0x88, 0x99, 0x6D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x88,
+0xC7, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0xF5, 0xB6, 0x70, 0x00, 0x00, 0x00, 0x00, 0x89,
+0xC0, 0xCB, 0x80, 0x00, 0x00, 0x00, 0x00, 0x8A, 0x66, 0xDA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x8A,
+0x9E, 0x47, 0x80, 0x00, 0x00, 0x00, 0x00, 0x8A, 0xD5, 0x98, 0x70, 0x00, 0x00, 0x00, 0x00, 0x8B,
+0xA0, 0xAD, 0x80, 0x00, 0x00, 0x00, 0x00, 0x8C, 0x3D, 0x81, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x8C,
+0x6B, 0xB4, 0x80, 0x00, 0x00, 0x00, 0x00, 0x8C, 0xBE, 0xB4, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x8D,
+0x80, 0x8F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x8E, 0x14, 0x29, 0x70, 0x00, 0x00, 0x00, 0x00, 0x8E,
+0x42, 0x5C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8E, 0x9E, 0x96, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x8F,
+0x60, 0x71, 0x80, 0x00, 0x00, 0x00, 0x00, 0x8F, 0xE1, 0x96, 0x70, 0x00, 0x00, 0x00, 0x00, 0x90,
+0x19, 0x03, 0x80, 0x00, 0x00, 0x00, 0x00, 0x90, 0x7E, 0x78, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x91,
+0x49, 0x8E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x91, 0xB8, 0x3D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x91,
+0xE6, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x92, 0x5E, 0x5A, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x93,
+0x29, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x93, 0x85, 0xAA, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x93,
+0xBD, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x94, 0x3E, 0x3C, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x95,
+0x09, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x95, 0x5C, 0x52, 0x70, 0x00, 0x00, 0x00, 0x00, 0x95,
+0x8A, 0x85, 0x00, 0x00, 0x00, 0x00, 0x00, 0x96, 0x27, 0x59, 0x70, 0x00, 0x00, 0x00, 0x00, 0x96,
+0xE9, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x97, 0x32, 0xF9, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x97,
+0x61, 0x2C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x98, 0x07, 0x3B, 0x70, 0x00, 0x00, 0x00, 0x00, 0x98,
+0xC9, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x99, 0x00, 0x66, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x99,
+0x37, 0xD4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x99, 0xE7, 0x1D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x9A,
+0xB2, 0x32, 0x80, 0x00, 0x00, 0x00, 0x00, 0x9A, 0xD7, 0x0E, 0x70, 0x00, 0x00, 0x00, 0x00, 0x9B,
+0x05, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9B, 0xC6, 0xFF, 0x70, 0x00, 0x00, 0x00, 0x00, 0x9C,
+0x92, 0x14, 0x80, 0x00, 0x00, 0x00, 0x00, 0x9C, 0xA4, 0x7B, 0x70, 0x00, 0x00, 0x00, 0x00, 0x9C,
+0xDB, 0xE8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x9D, 0xA6, 0xE1, 0x70, 0x00, 0x00, 0x00, 0x00, 0x9E,
+0x71, 0xF6, 0x80, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x7B, 0x22, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x9E,
+0xB2, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9F, 0x86, 0xC3, 0x70, 0x00, 0x00, 0x00, 0x00, 0xA0,
+0x7F, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA1, 0x6F, 0xDF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xA2,
+0x56, 0xA4, 0x80, 0x00, 0x00, 0x00, 0x00, 0xA3, 0x4F, 0xC1, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xA4,
+0x24, 0x11, 0x80, 0x00, 0x00, 0x00, 0x00, 0xA5, 0x2F, 0xA3, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xA5,
+0xFA, 0xB9, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA7, 0x0F, 0x85, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xA7,
+0xDA, 0x9B, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA8, 0xEF, 0x67, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xA9,
+0xBA, 0x7D, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xD8, 0x84, 0x70, 0x00, 0x00, 0x00, 0x00, 0xAB,
+0x9A, 0x5F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAC, 0xB8, 0x66, 0x70, 0x00, 0x00, 0x00, 0x00, 0xAD,
+0x7A, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAE, 0x98, 0x48, 0x70, 0x00, 0x00, 0x00, 0x00, 0xAF,
+0x5A, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB0, 0x78, 0x2A, 0x70, 0x00, 0x00, 0x00, 0x00, 0xB1,
+0x43, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0xB2, 0x58, 0x0C, 0x70, 0x00, 0x00, 0x00, 0x00, 0xB3,
+0x23, 0x21, 0x80, 0x00, 0x00, 0x00, 0x00, 0xB4, 0x37, 0xEE, 0x70, 0x00, 0x00, 0x00, 0x00, 0xB5,
+0x03, 0x03, 0x80, 0x00, 0x00, 0x00, 0x00, 0xB6, 0x21, 0x0A, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xB6,
+0xE2, 0xE5, 0x80, 0x00, 0x00, 0x00, 0x00, 0xB8, 0x00, 0xEC, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xB8,
+0xC2, 0xC7, 0x80, 0x00, 0x00, 0x00, 0x00, 0xB9, 0xD7, 0x94, 0x70, 0x00, 0x00, 0x00, 0x00, 0xBA,
+0xAB, 0xE4, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBB, 0xAE, 0x3B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xBC,
+0x8B, 0xC6, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBD, 0x84, 0xE3, 0x70, 0x00, 0x00, 0x00, 0x00, 0xBE,
+0x6B, 0xA8, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, 0x52, 0x50, 0x70, 0x00, 0x00, 0x00, 0x00, 0xC0,
+0x4B, 0x8A, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x28, 0xF7, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xC1,
+0x57, 0x2A, 0x80, 0x00, 0x00, 0x00, 0x00, 0xC2, 0xFF, 0x9F, 0x70, 0x00, 0x00, 0x00, 0x00, 0xC3,
+0x2D, 0xD2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC4, 0xCD, 0x0C, 0x70, 0x00, 0x00, 0x00, 0x00, 0xC5,
+0x04, 0x79, 0x80, 0x00, 0x00, 0x00, 0x00, 0xC6, 0xA3, 0xB3, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xC6,
+0xD1, 0xE6, 0x80, 0x00, 0x00, 0x00, 0x00, 0xC7, 0x09, 0x37, 0x70, 0x00, 0x00, 0x00, 0x00, 0xC7,
+0xD4, 0x4C, 0x80, 0x00, 0x00, 0x00, 0x00, 0xC8, 0x71, 0x20, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xC8,
+0xA8, 0x8E, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC8, 0xE9, 0x19, 0x70, 0x00, 0x00, 0x00, 0x00, 0xC9,
+0xB4, 0x2E, 0x80, 0x00, 0x00, 0x00, 0x00, 0xCA, 0x47, 0xC8, 0x70, 0x00, 0x00, 0x00, 0x00, 0xCA,
+0x7F, 0x35, 0x80, 0x00, 0x00, 0x00, 0x00, 0xCA, 0xD2, 0x35, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xCB,
+0x94, 0x10, 0x80, 0x00, 0x00, 0x00, 0x00, 0xCC, 0x1E, 0x6F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xCC,
+0x4C, 0xA2, 0x80, 0x00, 0x00, 0x00, 0x00, 0xCC, 0xB2, 0x17, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xCD,
+0x73, 0xF2, 0x80, 0x00, 0x00, 0x00, 0x00, 0xCD, 0xEB, 0xDC, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xCE,
+0x23, 0x4A, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCE, 0x91, 0xF9, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xCF,
+0x5D, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCF, 0xC2, 0x84, 0x70, 0x00, 0x00, 0x00, 0x00, 0xCF,
+0xF0, 0xB7, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD0, 0x71, 0xDB, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xD1,
+0x3C, 0xF1, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD1, 0x99, 0x2B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xD1,
+0xC7, 0x5E, 0x80, 0x00, 0x00, 0x00, 0x00, 0xD2, 0x51, 0xBD, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xD3,
+0x1C, 0xD3, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD3, 0x66, 0x98, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xD3,
+0x9E, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD4, 0x31, 0x9F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xD4,
+0xFC, 0xB5, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD5, 0x3D, 0x40, 0x70, 0x00, 0x00, 0x00, 0x00, 0xD5,
+0x6B, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD6, 0x1A, 0xBC, 0x70, 0x00, 0x00, 0x00, 0x00, 0xD6,
+0xDC, 0x97, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD7, 0x0A, 0xAD, 0x70, 0x00, 0x00, 0x00, 0x00, 0xD7,
+0x42, 0x1A, 0x80, 0x00, 0x00, 0x00, 0x00, 0xD7, 0xFA, 0x9E, 0x70, 0x00, 0x00, 0x00, 0x00, 0xD8,
+0xBC, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD8, 0xE1, 0x54, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xD9,
+0x18, 0xC2, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD9, 0xDA, 0x80, 0x70, 0x00, 0x00, 0x00, 0x00, 0xDA,
+0xA5, 0x95, 0x80, 0x00, 0x00, 0x00, 0x00, 0xDA, 0xB7, 0xFC, 0x70, 0x00, 0x00, 0x00, 0x00, 0xDA,
+0xE6, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDB, 0xBA, 0x62, 0x70, 0x03, 0x01, 0x02, 0x01, 0x02,
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x06, 0x05, 0x06,
 0x05, 0x06, 0x07, 0x08, 0x07, 0x08, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06,
@@ -43260,16 +43879,26 @@
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x00, 0x00, 0x20, 0x50, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x00, 0x00, 0x1C,
-0x20, 0x00, 0x09, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x00,
-0x00, 0x2A, 0x30, 0x01, 0x0D, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x11, 0x00, 0x00, 0x2A, 0x30, 0x01,
-0x0D, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x11, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x4C, 0x4D, 0x54,
-0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x49, 0x44, 0x54, 0x00, 0x49, 0x53,
-0x54, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x45, 0x45, 0x54, 0x2D, 0x32, 0x45, 0x45, 0x53, 0x54,
-0x2C, 0x4D, 0x33, 0x2E, 0x34, 0x2E, 0x34, 0x2F, 0x35, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x34,
-0x2E, 0x34, 0x2F, 0x35, 0x30, 0x0A, 0x00, 0xB9, 0x64, 0xF0, 0x01, 0x47, 0x40, 0x0A, 0x00, 0x00,
-0x00, 0x0A, 0x47, 0x61, 0x7A, 0x61, 0x20, 0x53, 0x74, 0x72, 0x69, 0x70, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x00, 0x00, 0x20, 0x50, 0x00,
+0x00, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x00, 0x00, 0x1C,
+0x20, 0x00, 0x09, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x0D, 0x00,
+0x00, 0x1C, 0x20, 0x00, 0x11, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x0D, 0x00, 0x00, 0x1C, 0x20, 0x00,
+0x11, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00,
+0x45, 0x45, 0x54, 0x00, 0x49, 0x44, 0x54, 0x00, 0x49, 0x53, 0x54, 0x00, 0x00, 0x01, 0x01, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x0A, 0x45, 0x45, 0x54, 0x2D, 0x32, 0x45, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x34, 0x2E,
+0x34, 0x2F, 0x35, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x34, 0x2E, 0x34, 0x2F, 0x35, 0x30, 0x0A,
+0x00, 0xB9, 0x64, 0xF0, 0x01, 0x47, 0x40, 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x47, 0x61, 0x7A, 0x61,
+0x20, 0x53, 0x74, 0x72, 0x69, 0x70, 
 
 /* Asia/Harbin */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -43343,14 +43972,14 @@
 0x58, 0x13, 0xCA, 0x60, 0x58, 0xD5, 0xA4, 0xF0, 0x59, 0xF3, 0xAC, 0x60, 0x5A, 0xB5, 0x86, 0xF0,
 0x5B, 0xD3, 0x8E, 0x60, 0x5C, 0x9D, 0x43, 0xE0, 0x5D, 0xB3, 0x62, 0x50, 0x5E, 0x7E, 0x77, 0x60,
 0x5F, 0x93, 0x52, 0x60, 0x60, 0x5E, 0x59, 0x60, 0x61, 0x7B, 0x1D, 0x60, 0x62, 0x3F, 0x8C, 0xE0,
-0x63, 0x5C, 0x5E, 0xF0, 0x64, 0x1E, 0x39, 0x80, 0x65, 0x3C, 0x40, 0xF0, 0x66, 0x07, 0x56, 0x00,
-0x67, 0x1C, 0x22, 0xF0, 0x67, 0xE7, 0x38, 0x00, 0x68, 0xFC, 0x04, 0xF0, 0x69, 0xC7, 0x1A, 0x00,
+0x63, 0x5C, 0x5E, 0xF0, 0x64, 0x4C, 0x5E, 0x00, 0x65, 0x3C, 0x40, 0xF0, 0x66, 0x19, 0xCB, 0x00,
+0x67, 0x1C, 0x22, 0xF0, 0x67, 0xF0, 0x72, 0x80, 0x68, 0xFC, 0x04, 0xF0, 0x69, 0xC7, 0x1A, 0x00,
 0x6A, 0xDB, 0xE6, 0xF0, 0x6B, 0xA6, 0xFC, 0x00, 0x6C, 0xC5, 0x03, 0x70, 0x6D, 0x86, 0xDE, 0x00,
 0x6E, 0xA4, 0xE5, 0x70, 0x6F, 0x66, 0xC0, 0x00, 0x70, 0x84, 0xC7, 0x70, 0x71, 0x4F, 0xDC, 0x80,
 0x72, 0x64, 0xA9, 0x70, 0x73, 0x2F, 0xBE, 0x80, 0x74, 0x44, 0x8B, 0x70, 0x75, 0x0F, 0xA0, 0x80,
 0x76, 0x2D, 0xA7, 0xF0, 0x76, 0xEF, 0x82, 0x80, 0x78, 0x0D, 0x89, 0xF0, 0x78, 0xCF, 0x64, 0x80,
 0x79, 0xED, 0x6B, 0xF0, 0x7A, 0xAF, 0x46, 0x80, 0x7B, 0xCD, 0x4D, 0xF0, 0x7C, 0x98, 0x63, 0x00,
-0x7D, 0xAD, 0x2F, 0xF0, 0x7E, 0x78, 0x45, 0x00, 0x7F, 0x8D, 0x11, 0xF0, 0x03, 0x01, 0x02, 0x01,
+0x7D, 0xA3, 0xF5, 0x70, 0x7E, 0x78, 0x45, 0x00, 0x7F, 0x7A, 0x9C, 0xF0, 0x03, 0x01, 0x02, 0x01,
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x06, 0x05,
 0x06, 0x05, 0x06, 0x07, 0x08, 0x07, 0x08, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05,
@@ -43368,7 +43997,7 @@
 0x00, 0x49, 0x53, 0x54, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00,
 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x33, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x00, 0x00, 0x00,
+0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x32, 0x00, 0x00, 0x00,
 0x0A, 0x00, 0x00, 0x00, 0x15, 0xFF, 0xFF, 0xFF, 0xFF, 0x7D, 0xBD, 0x4A, 0x19, 0xFF, 0xFF, 0xFF,
 0xFF, 0xC8, 0x59, 0xCF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0xFA, 0xA6, 0x00, 0xFF, 0xFF, 0xFF,
 0xFF, 0xC9, 0x38, 0x9C, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xE5, 0xEB, 0x80, 0xFF, 0xFF, 0xFF,
@@ -43430,9 +44059,9 @@
 0x00, 0x5D, 0xB3, 0x62, 0x50, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x7E, 0x77, 0x60, 0x00, 0x00, 0x00,
 0x00, 0x5F, 0x93, 0x52, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x5E, 0x59, 0x60, 0x00, 0x00, 0x00,
 0x00, 0x61, 0x7B, 0x1D, 0x60, 0x00, 0x00, 0x00, 0x00, 0x62, 0x3F, 0x8C, 0xE0, 0x00, 0x00, 0x00,
-0x00, 0x63, 0x5C, 0x5E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x64, 0x1E, 0x39, 0x80, 0x00, 0x00, 0x00,
-0x00, 0x65, 0x3C, 0x40, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x66, 0x07, 0x56, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x67, 0x1C, 0x22, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x67, 0xE7, 0x38, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x63, 0x5C, 0x5E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x64, 0x4C, 0x5E, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x65, 0x3C, 0x40, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x66, 0x19, 0xCB, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x67, 0x1C, 0x22, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x67, 0xF0, 0x72, 0x80, 0x00, 0x00, 0x00,
 0x00, 0x68, 0xFC, 0x04, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x69, 0xC7, 0x1A, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x6A, 0xDB, 0xE6, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xA6, 0xFC, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x6C, 0xC5, 0x03, 0x70, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x86, 0xDE, 0x00, 0x00, 0x00, 0x00,
@@ -43444,8 +44073,85 @@
 0x00, 0x78, 0x0D, 0x89, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x78, 0xCF, 0x64, 0x80, 0x00, 0x00, 0x00,
 0x00, 0x79, 0xED, 0x6B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xAF, 0x46, 0x80, 0x00, 0x00, 0x00,
 0x00, 0x7B, 0xCD, 0x4D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x98, 0x63, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x7D, 0xAD, 0x2F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x78, 0x45, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x7F, 0x8D, 0x11, 0xF0, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
+0x00, 0x7D, 0xA3, 0xF5, 0x70, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x78, 0x45, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x7F, 0x7A, 0x9C, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x80, 0x58, 0x27, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x81, 0x48, 0x09, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x82, 0x38, 0x09, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x83, 0x1E, 0xB1, 0x70, 0x00, 0x00, 0x00, 0x00, 0x83, 0x4C, 0xE4, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x83, 0x56, 0x10, 0x70, 0x00, 0x00, 0x00, 0x00, 0x84, 0x17, 0xEB, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x84, 0xEC, 0x1E, 0x70, 0x00, 0x00, 0x00, 0x00, 0x85, 0x23, 0x8B, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x85, 0x35, 0xF2, 0x70, 0x00, 0x00, 0x00, 0x00, 0x86, 0x01, 0x07, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x86, 0xC2, 0xC5, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x86, 0xF0, 0xF8, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x87, 0x15, 0xD4, 0x70, 0x00, 0x00, 0x00, 0x00, 0x87, 0xE0, 0xE9, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x88, 0x99, 0x6D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x88, 0xC7, 0xA0, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x88, 0xF5, 0xB6, 0x70, 0x00, 0x00, 0x00, 0x00, 0x89, 0xC0, 0xCB, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x8A, 0x66, 0xDA, 0x70, 0x00, 0x00, 0x00, 0x00, 0x8A, 0x9E, 0x47, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x8A, 0xD5, 0x98, 0x70, 0x00, 0x00, 0x00, 0x00, 0x8B, 0xA0, 0xAD, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x8C, 0x3D, 0x81, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x8C, 0x6B, 0xB4, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x8C, 0xBE, 0xB4, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x8D, 0x80, 0x8F, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x8E, 0x14, 0x29, 0x70, 0x00, 0x00, 0x00, 0x00, 0x8E, 0x42, 0x5C, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x8E, 0x9E, 0x96, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x8F, 0x60, 0x71, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x8F, 0xE1, 0x96, 0x70, 0x00, 0x00, 0x00, 0x00, 0x90, 0x19, 0x03, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x90, 0x7E, 0x78, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x91, 0x49, 0x8E, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x91, 0xB8, 0x3D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x91, 0xE6, 0x70, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x92, 0x5E, 0x5A, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x93, 0x29, 0x70, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x93, 0x85, 0xAA, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x93, 0xBD, 0x18, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x94, 0x3E, 0x3C, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x95, 0x09, 0x52, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x95, 0x5C, 0x52, 0x70, 0x00, 0x00, 0x00, 0x00, 0x95, 0x8A, 0x85, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x96, 0x27, 0x59, 0x70, 0x00, 0x00, 0x00, 0x00, 0x96, 0xE9, 0x34, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x97, 0x32, 0xF9, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x97, 0x61, 0x2C, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x98, 0x07, 0x3B, 0x70, 0x00, 0x00, 0x00, 0x00, 0x98, 0xC9, 0x16, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x99, 0x00, 0x66, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x99, 0x37, 0xD4, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x99, 0xE7, 0x1D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x9A, 0xB2, 0x32, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x9A, 0xD7, 0x0E, 0x70, 0x00, 0x00, 0x00, 0x00, 0x9B, 0x05, 0x41, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x9B, 0xC6, 0xFF, 0x70, 0x00, 0x00, 0x00, 0x00, 0x9C, 0x92, 0x14, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x9C, 0xA4, 0x7B, 0x70, 0x00, 0x00, 0x00, 0x00, 0x9C, 0xDB, 0xE8, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x9D, 0xA6, 0xE1, 0x70, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x71, 0xF6, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x9E, 0x7B, 0x22, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x9E, 0xB2, 0x90, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x9F, 0x86, 0xC3, 0x70, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x7F, 0xFD, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xA1, 0x6F, 0xDF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xA2, 0x56, 0xA4, 0x80, 0x00, 0x00, 0x00,
+0x00, 0xA3, 0x4F, 0xC1, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xA4, 0x24, 0x11, 0x80, 0x00, 0x00, 0x00,
+0x00, 0xA5, 0x2F, 0xA3, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xA5, 0xFA, 0xB9, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xA7, 0x0F, 0x85, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xA7, 0xDA, 0x9B, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xA8, 0xEF, 0x67, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xA9, 0xBA, 0x7D, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xAA, 0xD8, 0x84, 0x70, 0x00, 0x00, 0x00, 0x00, 0xAB, 0x9A, 0x5F, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xAC, 0xB8, 0x66, 0x70, 0x00, 0x00, 0x00, 0x00, 0xAD, 0x7A, 0x41, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xAE, 0x98, 0x48, 0x70, 0x00, 0x00, 0x00, 0x00, 0xAF, 0x5A, 0x23, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xB0, 0x78, 0x2A, 0x70, 0x00, 0x00, 0x00, 0x00, 0xB1, 0x43, 0x3F, 0x80, 0x00, 0x00, 0x00,
+0x00, 0xB2, 0x58, 0x0C, 0x70, 0x00, 0x00, 0x00, 0x00, 0xB3, 0x23, 0x21, 0x80, 0x00, 0x00, 0x00,
+0x00, 0xB4, 0x37, 0xEE, 0x70, 0x00, 0x00, 0x00, 0x00, 0xB5, 0x03, 0x03, 0x80, 0x00, 0x00, 0x00,
+0x00, 0xB6, 0x21, 0x0A, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xB6, 0xE2, 0xE5, 0x80, 0x00, 0x00, 0x00,
+0x00, 0xB8, 0x00, 0xEC, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xB8, 0xC2, 0xC7, 0x80, 0x00, 0x00, 0x00,
+0x00, 0xB9, 0xD7, 0x94, 0x70, 0x00, 0x00, 0x00, 0x00, 0xBA, 0xAB, 0xE4, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xBB, 0xAE, 0x3B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xBC, 0x8B, 0xC6, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xBD, 0x84, 0xE3, 0x70, 0x00, 0x00, 0x00, 0x00, 0xBE, 0x6B, 0xA8, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xBF, 0x52, 0x50, 0x70, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x4B, 0x8A, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xC1, 0x28, 0xF7, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x57, 0x2A, 0x80, 0x00, 0x00, 0x00,
+0x00, 0xC2, 0xFF, 0x9F, 0x70, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x2D, 0xD2, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xC4, 0xCD, 0x0C, 0x70, 0x00, 0x00, 0x00, 0x00, 0xC5, 0x04, 0x79, 0x80, 0x00, 0x00, 0x00,
+0x00, 0xC6, 0xA3, 0xB3, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xC6, 0xD1, 0xE6, 0x80, 0x00, 0x00, 0x00,
+0x00, 0xC7, 0x09, 0x37, 0x70, 0x00, 0x00, 0x00, 0x00, 0xC7, 0xD4, 0x4C, 0x80, 0x00, 0x00, 0x00,
+0x00, 0xC8, 0x71, 0x20, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xC8, 0xA8, 0x8E, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xC8, 0xE9, 0x19, 0x70, 0x00, 0x00, 0x00, 0x00, 0xC9, 0xB4, 0x2E, 0x80, 0x00, 0x00, 0x00,
+0x00, 0xCA, 0x47, 0xC8, 0x70, 0x00, 0x00, 0x00, 0x00, 0xCA, 0x7F, 0x35, 0x80, 0x00, 0x00, 0x00,
+0x00, 0xCA, 0xD2, 0x35, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xCB, 0x94, 0x10, 0x80, 0x00, 0x00, 0x00,
+0x00, 0xCC, 0x1E, 0x6F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xCC, 0x4C, 0xA2, 0x80, 0x00, 0x00, 0x00,
+0x00, 0xCC, 0xB2, 0x17, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xCD, 0x73, 0xF2, 0x80, 0x00, 0x00, 0x00,
+0x00, 0xCD, 0xEB, 0xDC, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xCE, 0x23, 0x4A, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xCE, 0x91, 0xF9, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xCF, 0x5D, 0x0F, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xCF, 0xC2, 0x84, 0x70, 0x00, 0x00, 0x00, 0x00, 0xCF, 0xF0, 0xB7, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xD0, 0x71, 0xDB, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xD1, 0x3C, 0xF1, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xD1, 0x99, 0x2B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xD1, 0xC7, 0x5E, 0x80, 0x00, 0x00, 0x00,
+0x00, 0xD2, 0x51, 0xBD, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xD3, 0x1C, 0xD3, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xD3, 0x66, 0x98, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xD3, 0x9E, 0x06, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xD4, 0x31, 0x9F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xD4, 0xFC, 0xB5, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xD5, 0x3D, 0x40, 0x70, 0x00, 0x00, 0x00, 0x00, 0xD5, 0x6B, 0x73, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xD6, 0x1A, 0xBC, 0x70, 0x00, 0x00, 0x00, 0x00, 0xD6, 0xDC, 0x97, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xD7, 0x0A, 0xAD, 0x70, 0x00, 0x00, 0x00, 0x00, 0xD7, 0x42, 0x1A, 0x80, 0x00, 0x00, 0x00,
+0x00, 0xD7, 0xFA, 0x9E, 0x70, 0x00, 0x00, 0x00, 0x00, 0xD8, 0xBC, 0x79, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xD8, 0xE1, 0x54, 0xF0, 0x00, 0x00, 0x00, 0x00, 0xD9, 0x18, 0xC2, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xD9, 0xDA, 0x80, 0x70, 0x00, 0x00, 0x00, 0x00, 0xDA, 0xA5, 0x95, 0x80, 0x00, 0x00, 0x00,
+0x00, 0xDA, 0xB7, 0xFC, 0x70, 0x00, 0x00, 0x00, 0x00, 0xDA, 0xE6, 0x2F, 0x00, 0x00, 0x00, 0x00,
+0x00, 0xDB, 0xBA, 0x62, 0x70, 0x03, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02,
 0x01, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03,
 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x06, 0x05, 0x06, 0x05, 0x06, 0x07, 0x08, 0x07, 0x08,
 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06, 0x05, 0x06,
@@ -43454,17 +44160,27 @@
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
-0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x00, 0x00, 0x20,
-0xE7, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x00,
-0x00, 0x1C, 0x20, 0x00, 0x09, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x00, 0x00, 0x2A, 0x30, 0x01,
-0x0D, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x11, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x0D, 0x00, 0x00, 0x1C,
-0x20, 0x00, 0x11, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x45, 0x53,
-0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x49, 0x44, 0x54, 0x00, 0x49, 0x53, 0x54, 0x00, 0x00, 0x01,
-0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x0A, 0x45, 0x45, 0x54, 0x2D, 0x32, 0x45, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E,
-0x34, 0x2E, 0x34, 0x2F, 0x35, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x34, 0x2E, 0x34, 0x2F, 0x35,
-0x30, 0x0A, 0x00, 0xB9, 0x71, 0xF5, 0x01, 0x48, 0x35, 0x7C, 0x00, 0x00, 0x00, 0x09, 0x57, 0x65,
-0x73, 0x74, 0x20, 0x42, 0x61, 0x6E, 0x6B, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04,
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x00, 0x00, 0x20, 0xE7, 0x00, 0x00, 0x00, 0x00, 0x2A,
+0x30, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x00,
+0x00, 0x2A, 0x30, 0x01, 0x04, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x0D, 0x00, 0x00, 0x1C, 0x20, 0x00,
+0x11, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x0D, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x11, 0x00, 0x00, 0x1C,
+0x20, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00,
+0x49, 0x44, 0x54, 0x00, 0x49, 0x53, 0x54, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01,
+0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x45, 0x45, 0x54,
+0x2D, 0x32, 0x45, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x34, 0x2E, 0x34, 0x2F, 0x35, 0x30,
+0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x34, 0x2E, 0x34, 0x2F, 0x35, 0x30, 0x0A, 0x00, 0xB9, 0x71, 0xF5,
+0x01, 0x48, 0x35, 0x7C, 0x00, 0x00, 0x00, 0x09, 0x57, 0x65, 0x73, 0x74, 0x20, 0x42, 0x61, 0x6E,
+0x6B, 
 
 /* Asia/Ho_Chi_Minh */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x56, 0x4E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -44387,28 +45103,30 @@
 
 /* Asia/Kuala_Lumpur */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x4D, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x20, 0x80, 0x00, 0x00, 0x00,
 0x86, 0x83, 0x85, 0xA3, 0xBA, 0x67, 0x4E, 0x90, 0xC0, 0x0A, 0xE4, 0x60, 0xCA, 0xB3, 0xE5, 0x60,
-0xCB, 0x91, 0x5F, 0x08, 0xD2, 0x48, 0x6D, 0xF0, 0x16, 0x91, 0xF5, 0x08, 0x01, 0x02, 0x03, 0x04,
+0xCB, 0x91, 0x5F, 0x08, 0xD2, 0x48, 0x6D, 0xF0, 0x16, 0x91, 0xEE, 0x00, 0x01, 0x02, 0x03, 0x04,
 0x05, 0x06, 0x05, 0x07, 0x00, 0x00, 0x5F, 0x56, 0x00, 0x00, 0x00, 0x00, 0x61, 0x5D, 0x00, 0x04,
 0x00, 0x00, 0x62, 0x70, 0x00, 0x08, 0x00, 0x00, 0x67, 0x20, 0x01, 0x0C, 0x00, 0x00, 0x67, 0x20,
 0x00, 0x0C, 0x00, 0x00, 0x69, 0x78, 0x00, 0x12, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x18, 0x00, 0x00,
 0x70, 0x80, 0x00, 0x1C, 0x4C, 0x4D, 0x54, 0x00, 0x53, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x37, 0x00,
 0x2B, 0x30, 0x37, 0x32, 0x30, 0x00, 0x2B, 0x30, 0x37, 0x33, 0x30, 0x00, 0x2B, 0x30, 0x39, 0x00,
-0x2B, 0x30, 0x38, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x2B, 0x30, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x20,
 0xFF, 0xFF, 0xFF, 0xFF, 0x7E, 0x36, 0x55, 0xAA, 0xFF, 0xFF, 0xFF, 0xFF, 0x86, 0x83, 0x85, 0xA3,
 0xFF, 0xFF, 0xFF, 0xFF, 0xBA, 0x67, 0x4E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x0A, 0xE4, 0x60,
 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xB3, 0xE5, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x91, 0x5F, 0x08,
-0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x48, 0x6D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x91, 0xF5, 0x08,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x48, 0x6D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x91, 0xEE, 0x00,
 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x05, 0x07, 0x00, 0x00, 0x5F, 0x56, 0x00, 0x00, 0x00, 0x00,
 0x61, 0x5D, 0x00, 0x04, 0x00, 0x00, 0x62, 0x70, 0x00, 0x08, 0x00, 0x00, 0x67, 0x20, 0x01, 0x0C,
 0x00, 0x00, 0x67, 0x20, 0x00, 0x0C, 0x00, 0x00, 0x69, 0x78, 0x00, 0x12, 0x00, 0x00, 0x7E, 0x90,
 0x00, 0x18, 0x00, 0x00, 0x70, 0x80, 0x00, 0x1C, 0x4C, 0x4D, 0x54, 0x00, 0x53, 0x4D, 0x54, 0x00,
 0x2B, 0x30, 0x37, 0x00, 0x2B, 0x30, 0x37, 0x32, 0x30, 0x00, 0x2B, 0x30, 0x37, 0x33, 0x30, 0x00,
-0x2B, 0x30, 0x39, 0x00, 0x2B, 0x30, 0x38, 0x00, 0x0A, 0x3C, 0x2B, 0x30, 0x38, 0x3E, 0x2D, 0x38,
+0x2B, 0x30, 0x39, 0x00, 0x2B, 0x30, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0A, 0x3C, 0x2B, 0x30, 0x38, 0x3E, 0x2D, 0x38,
 0x0A, 0x00, 0x8E, 0x29, 0x3A, 0x01, 0xAD, 0xD7, 0x10, 0x00, 0x00, 0x00, 0x14, 0x4D, 0x61, 0x6C,
 0x61, 0x79, 0x73, 0x69, 0x61, 0x20, 0x28, 0x70, 0x65, 0x6E, 0x69, 0x6E, 0x73, 0x75, 0x6C, 0x61,
 0x29, 
@@ -44886,9 +45604,8 @@
 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00,
 0x00, 0x00, 0x01, 0x01, 0x0A, 0x45, 0x45, 0x54, 0x2D, 0x32, 0x45, 0x45, 0x53, 0x54, 0x2C, 0x4D,
 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x33, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F,
-0x34, 0x0A, 0x00, 0xBE, 0xFD, 0x3A, 0x01, 0x45, 0x92, 0x5A, 0x00, 0x00, 0x00, 0x13, 0x43, 0x79,
-0x70, 0x72, 0x75, 0x73, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x61, 0x72, 0x65, 0x61, 0x73,
-0x29, 
+0x34, 0x0A, 0x00, 0xBE, 0xFD, 0x3A, 0x01, 0x45, 0x92, 0x5A, 0x00, 0x00, 0x00, 0x0E, 0x6D, 0x6F,
+0x73, 0x74, 0x20, 0x6F, 0x66, 0x20, 0x43, 0x79, 0x70, 0x72, 0x75, 0x73, 
 
 /* Asia/Novokuznetsk */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x52, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -45665,28 +46382,30 @@
 
 /* Asia/Singapore */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x53, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x20, 0x80, 0x00, 0x00, 0x00,
 0x86, 0x83, 0x85, 0xA3, 0xBA, 0x67, 0x4E, 0x90, 0xC0, 0x0A, 0xE4, 0x60, 0xCA, 0xB3, 0xE5, 0x60,
-0xCB, 0x91, 0x5F, 0x08, 0xD2, 0x48, 0x6D, 0xF0, 0x16, 0x91, 0xF5, 0x08, 0x01, 0x02, 0x03, 0x04,
+0xCB, 0x91, 0x5F, 0x08, 0xD2, 0x48, 0x6D, 0xF0, 0x16, 0x91, 0xEE, 0x00, 0x01, 0x02, 0x03, 0x04,
 0x05, 0x06, 0x05, 0x07, 0x00, 0x00, 0x61, 0x5D, 0x00, 0x00, 0x00, 0x00, 0x61, 0x5D, 0x00, 0x04,
 0x00, 0x00, 0x62, 0x70, 0x00, 0x08, 0x00, 0x00, 0x67, 0x20, 0x01, 0x0C, 0x00, 0x00, 0x67, 0x20,
 0x00, 0x0C, 0x00, 0x00, 0x69, 0x78, 0x00, 0x12, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x18, 0x00, 0x00,
 0x70, 0x80, 0x00, 0x1C, 0x4C, 0x4D, 0x54, 0x00, 0x53, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x37, 0x00,
 0x2B, 0x30, 0x37, 0x32, 0x30, 0x00, 0x2B, 0x30, 0x37, 0x33, 0x30, 0x00, 0x2B, 0x30, 0x39, 0x00,
-0x2B, 0x30, 0x38, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x2B, 0x30, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x20,
 0xFF, 0xFF, 0xFF, 0xFF, 0x7E, 0x36, 0x53, 0xA3, 0xFF, 0xFF, 0xFF, 0xFF, 0x86, 0x83, 0x85, 0xA3,
 0xFF, 0xFF, 0xFF, 0xFF, 0xBA, 0x67, 0x4E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x0A, 0xE4, 0x60,
 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xB3, 0xE5, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x91, 0x5F, 0x08,
-0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x48, 0x6D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x91, 0xF5, 0x08,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x48, 0x6D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x91, 0xEE, 0x00,
 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x05, 0x07, 0x00, 0x00, 0x61, 0x5D, 0x00, 0x00, 0x00, 0x00,
 0x61, 0x5D, 0x00, 0x04, 0x00, 0x00, 0x62, 0x70, 0x00, 0x08, 0x00, 0x00, 0x67, 0x20, 0x01, 0x0C,
 0x00, 0x00, 0x67, 0x20, 0x00, 0x0C, 0x00, 0x00, 0x69, 0x78, 0x00, 0x12, 0x00, 0x00, 0x7E, 0x90,
 0x00, 0x18, 0x00, 0x00, 0x70, 0x80, 0x00, 0x1C, 0x4C, 0x4D, 0x54, 0x00, 0x53, 0x4D, 0x54, 0x00,
 0x2B, 0x30, 0x37, 0x00, 0x2B, 0x30, 0x37, 0x32, 0x30, 0x00, 0x2B, 0x30, 0x37, 0x33, 0x30, 0x00,
-0x2B, 0x30, 0x39, 0x00, 0x2B, 0x30, 0x38, 0x00, 0x0A, 0x3C, 0x2B, 0x30, 0x38, 0x3E, 0x2D, 0x38,
+0x2B, 0x30, 0x39, 0x00, 0x2B, 0x30, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0A, 0x3C, 0x2B, 0x30, 0x38, 0x3E, 0x2D, 0x38,
 0x0A, 0x00, 0x8B, 0x49, 0x8D, 0x01, 0xB1, 0x1E, 0xE8, 0x00, 0x00, 0x00, 0x00, 
 
 /* Asia/Srednekolymsk */
@@ -45765,9 +46484,9 @@
 0x00, 0x9A, 0xB0, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x31, 0x30, 0x00, 0x2B, 0x31, 0x32,
 0x00, 0x2B, 0x31, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
 0x0A, 0x3C, 0x2B, 0x31, 0x31, 0x3E, 0x2D, 0x31, 0x31, 0x0A, 0x00, 0xF0, 0x46, 0x6A, 0x01, 0xFD,
-0x36, 0x12, 0x00, 0x00, 0x00, 0x22, 0x4D, 0x53, 0x4B, 0x2B, 0x30, 0x38, 0x20, 0x2D, 0x20, 0x53,
-0x61, 0x6B, 0x68, 0x61, 0x20, 0x28, 0x45, 0x29, 0x3B, 0x20, 0x4E, 0x6F, 0x72, 0x74, 0x68, 0x20,
-0x4B, 0x75, 0x72, 0x69, 0x6C, 0x20, 0x49, 0x73, 
+0x36, 0x12, 0x00, 0x00, 0x00, 0x1E, 0x4D, 0x53, 0x4B, 0x2B, 0x30, 0x38, 0x20, 0x2D, 0x20, 0x53,
+0x61, 0x6B, 0x68, 0x61, 0x20, 0x28, 0x45, 0x29, 0x3B, 0x20, 0x4E, 0x20, 0x4B, 0x75, 0x72, 0x69,
+0x6C, 0x20, 0x49, 0x73, 
 
 /* Asia/Taipei */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x54, 0x57, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -46369,8 +47088,8 @@
 0x00, 0x00, 0x00, 0x00, 0x62, 0x70, 0x00, 0x04, 0x00, 0x00, 0x7E, 0x90, 0x01, 0x08, 0x00, 0x00,
 0x70, 0x80, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x37, 0x00, 0x2B, 0x30, 0x39, 0x00,
 0x2B, 0x30, 0x38, 0x00, 0x0A, 0x3C, 0x2B, 0x30, 0x38, 0x3E, 0x2D, 0x38, 0x0A, 0x00, 0xD2, 0x71,
-0xB2, 0x01, 0xB5, 0xBF, 0xCD, 0x00, 0x00, 0x00, 0x15, 0x4D, 0x6F, 0x6E, 0x67, 0x6F, 0x6C, 0x69,
-0x61, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 
+0xB2, 0x01, 0xB5, 0xBF, 0xCD, 0x00, 0x00, 0x00, 0x10, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6F, 0x66,
+0x20, 0x4D, 0x6F, 0x6E, 0x67, 0x6F, 0x6C, 0x69, 0x61, 
 
 /* Asia/Ulan_Bator */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -52010,7 +52729,7 @@
 0x00, 0x00, 0x00, 0x5D, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x25, 0x80, 0x00, 0x00, 0x00,
 0x9E, 0xB8, 0xCB, 0xB0, 0x9F, 0xBB, 0x23, 0xA0, 0xA0, 0xD0, 0x0C, 0xB0, 0xA1, 0xA2, 0xD2, 0x80,
 0xCB, 0x89, 0x28, 0xB0, 0xD2, 0x23, 0xF4, 0x70, 0xD2, 0x61, 0x34, 0x20, 0xF7, 0x2F, 0x76, 0x90,
-0xF8, 0x28, 0xA2, 0x10, 0xFB, 0x1D, 0x5F, 0x10, 0x13, 0x69, 0x72, 0x20, 0x14, 0x59, 0x55, 0x10,
+0xF8, 0x28, 0xA2, 0x10, 0xF8, 0xC5, 0x84, 0x90, 0x13, 0x69, 0x72, 0x20, 0x14, 0x59, 0x55, 0x10,
 0x15, 0x49, 0x54, 0x20, 0x16, 0x39, 0x37, 0x10, 0x17, 0x29, 0x36, 0x20, 0x18, 0x22, 0x53, 0x90,
 0x19, 0x09, 0x18, 0x20, 0x1A, 0x02, 0x35, 0x90, 0x1A, 0xF2, 0x34, 0xA0, 0x1B, 0xE2, 0x17, 0x90,
 0x1C, 0xD2, 0x16, 0xA0, 0x1D, 0xC1, 0xF9, 0x90, 0x1E, 0xB1, 0xF8, 0xA0, 0x1F, 0xA1, 0xDB, 0x90,
@@ -52051,7 +52770,7 @@
 0xFF, 0xFF, 0xA0, 0xD0, 0x0C, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0xA2, 0xD2, 0x80, 0xFF, 0xFF,
 0xFF, 0xFF, 0xCB, 0x89, 0x28, 0xB0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x23, 0xF4, 0x70, 0xFF, 0xFF,
 0xFF, 0xFF, 0xD2, 0x61, 0x34, 0x20, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x2F, 0x76, 0x90, 0xFF, 0xFF,
-0xFF, 0xFF, 0xF8, 0x28, 0xA2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0x1D, 0x5F, 0x10, 0x00, 0x00,
+0xFF, 0xFF, 0xF8, 0x28, 0xA2, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xF8, 0xC5, 0x84, 0x90, 0x00, 0x00,
 0x00, 0x00, 0x13, 0x69, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00, 0x14, 0x59, 0x55, 0x10, 0x00, 0x00,
 0x00, 0x00, 0x15, 0x49, 0x54, 0x20, 0x00, 0x00, 0x00, 0x00, 0x16, 0x39, 0x37, 0x10, 0x00, 0x00,
 0x00, 0x00, 0x17, 0x29, 0x36, 0x20, 0x00, 0x00, 0x00, 0x00, 0x18, 0x22, 0x53, 0x90, 0x00, 0x00,
@@ -52972,7 +53691,7 @@
 /* Egypt */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x7F, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0D, 0x80, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x9D, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0D, 0x80, 0x00, 0x00, 0x00,
 0xC8, 0x93, 0xB4, 0xE0, 0xC8, 0xFA, 0x7B, 0xD0, 0xC9, 0xFC, 0xEF, 0xE0, 0xCA, 0xC7, 0xE8, 0xD0,
 0xCB, 0xCB, 0xAE, 0x60, 0xCC, 0xDF, 0x29, 0xD0, 0xCD, 0xAC, 0xE1, 0xE0, 0xCE, 0xC6, 0xF4, 0xD0,
 0xCF, 0x8F, 0x66, 0xE0, 0xD0, 0xA9, 0x79, 0xD0, 0xD1, 0x84, 0x60, 0xE0, 0xD2, 0x8A, 0xAD, 0x50,
@@ -53004,95 +53723,123 @@
 0x46, 0x31, 0x20, 0xE0, 0x46, 0xE0, 0x6A, 0x50, 0x48, 0x11, 0x02, 0xE0, 0x48, 0xB7, 0x11, 0xD0,
 0x49, 0xF0, 0xE4, 0xE0, 0x4A, 0x8D, 0xB9, 0x50, 0x4B, 0xDA, 0x01, 0x60, 0x4C, 0x61, 0xBD, 0xD0,
 0x4C, 0x89, 0x58, 0xE0, 0x4C, 0xA4, 0xFA, 0x50, 0x53, 0x75, 0x38, 0xE0, 0x53, 0xAC, 0x89, 0xD0,
-0x53, 0xDA, 0xBC, 0x60, 0x54, 0x24, 0x82, 0x50, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x53, 0xDA, 0xBC, 0x60, 0x54, 0x24, 0x82, 0x50, 0x64, 0x4A, 0xF0, 0x60, 0x65, 0x3A, 0xD3, 0x50,
+0x66, 0x2A, 0xD2, 0x60, 0x67, 0x23, 0xEF, 0xD0, 0x68, 0x0A, 0xB4, 0x60, 0x69, 0x03, 0xD1, 0xD0,
+0x69, 0xEA, 0x96, 0x60, 0x6A, 0xE3, 0xB3, 0xD0, 0x6B, 0xD3, 0xB2, 0xE0, 0x6C, 0xC3, 0x95, 0xD0,
+0x6D, 0xB3, 0x94, 0xE0, 0x6E, 0xA3, 0x77, 0xD0, 0x6F, 0x93, 0x76, 0xE0, 0x70, 0x83, 0x59, 0xD0,
+0x71, 0x73, 0x58, 0xE0, 0x72, 0x6C, 0x76, 0x50, 0x73, 0x53, 0x3A, 0xE0, 0x74, 0x4C, 0x58, 0x50,
+0x75, 0x3C, 0x57, 0x60, 0x76, 0x2C, 0x3A, 0x50, 0x77, 0x1C, 0x39, 0x60, 0x78, 0x0C, 0x1C, 0x50,
+0x78, 0xFC, 0x1B, 0x60, 0x79, 0xEB, 0xFE, 0x50, 0x7A, 0xDB, 0xFD, 0x60, 0x7B, 0xCB, 0xE0, 0x50,
+0x7C, 0xBB, 0xDF, 0x60, 0x7D, 0xB4, 0xFC, 0xD0, 0x7E, 0x9B, 0xC1, 0x60, 0x7F, 0x94, 0xDE, 0xD0,
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 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, 0x00, 0x00, 0x1D,
+0x55, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x00,
+0x00, 0x2A, 0x30, 0x01, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45,
+0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9D, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00,
+0x00, 0x0D, 0xFF, 0xFF, 0xFF, 0xFF, 0x7D, 0xBD, 0x4D, 0xAB, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x93,
+0xB4, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0xFA, 0x7B, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xFC,
+0xEF, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xC7, 0xE8, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xCB,
+0xAE, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xCC, 0xDF, 0x29, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xAC,
+0xE1, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCE, 0xC6, 0xF4, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x8F,
+0x66, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD0, 0xA9, 0x79, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x84,
+0x60, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x8A, 0xAD, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x36,
+0x63, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0xF4, 0x2D, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0x0B,
+0xB9, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0xD5, 0x60, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xEC,
+0xFA, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xB5, 0x6D, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xCF,
+0x7F, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xEE, 0x97, 0xF2, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0xB0,
+0xB3, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0x79, 0x25, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF1, 0x91,
+0xE6, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF2, 0x5A, 0x59, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xF3, 0x73,
+0x1A, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xF4, 0x3B, 0x8C, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x55,
+0x9F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xF6, 0x1E, 0x11, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x36,
+0xD2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0xFF, 0x45, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0x18,
+0x06, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0xE1, 0xCA, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xF9,
+0x39, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xC2, 0xFD, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xDB,
+0xBE, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xA5, 0x82, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xBC,
+0xF2, 0x70, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x86, 0xB6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E,
+0x25, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x01, 0x67, 0xE9, 0x80, 0x00, 0x00, 0x00, 0x00, 0x02, 0x7F,
+0x59, 0x70, 0x00, 0x00, 0x00, 0x00, 0x03, 0x49, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x61,
+0xDE, 0x70, 0x00, 0x00, 0x00, 0x00, 0x05, 0x2B, 0xA2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x43,
+0x11, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0C, 0xD5, 0x80, 0x00, 0x00, 0x00, 0x00, 0x08, 0x24,
+0x45, 0x70, 0x00, 0x00, 0x00, 0x00, 0x08, 0xEE, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x05,
+0x78, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xCF, 0x3C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE7,
+0xFD, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xB1, 0xC1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC9,
+0x31, 0x70, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x92, 0xF5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xAA,
+0x64, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x10, 0x74, 0x28, 0x80, 0x00, 0x00, 0x00, 0x00, 0x11, 0x8B,
+0x98, 0x70, 0x00, 0x00, 0x00, 0x00, 0x12, 0x55, 0x5C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x6E,
+0x1D, 0x70, 0x00, 0x00, 0x00, 0x00, 0x14, 0x37, 0xE1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x4F,
+0x50, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x19, 0x14, 0x80, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA0,
+0x93, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x17, 0xFA, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x70,
+0xA3, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x19, 0xDB, 0x7B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF4,
+0x3C, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBE, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD5,
+0x70, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9F, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB6,
+0xA3, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x80, 0x67, 0x80, 0x00, 0x00, 0x00, 0x00, 0x20, 0x97,
+0xD7, 0x70, 0x00, 0x00, 0x00, 0x00, 0x21, 0x61, 0x9B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x7A,
+0x5C, 0x70, 0x00, 0x00, 0x00, 0x00, 0x23, 0x44, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x62,
+0x27, 0x70, 0x00, 0x00, 0x00, 0x00, 0x25, 0x25, 0x53, 0x80, 0x00, 0x00, 0x00, 0x00, 0x26, 0x3C,
+0xC3, 0x70, 0x00, 0x00, 0x00, 0x00, 0x27, 0x06, 0x87, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x1D,
+0xF6, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x28, 0xE7, 0xBA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x00,
+0x7B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xCA, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xE1,
+0xAF, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xAB, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2D, 0xC2,
+0xE2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x8C, 0xA6, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2F, 0xA0,
+0x13, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x30, 0x6B, 0x0C, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x31, 0x7F,
+0xF5, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x32, 0x4A, 0xEE, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x33, 0x5F,
+0xD7, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x34, 0x2A, 0xD0, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x35, 0x3F,
+0xB9, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x36, 0x0A, 0xB2, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x37, 0x28,
+0xD6, 0x60, 0x00, 0x00, 0x00, 0x00, 0x37, 0xF3, 0xCF, 0x50, 0x00, 0x00, 0x00, 0x00, 0x39, 0x08,
+0xB8, 0x60, 0x00, 0x00, 0x00, 0x00, 0x39, 0xD3, 0xB1, 0x50, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xE8,
+0x9A, 0x60, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xB3, 0x93, 0x50, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xC8,
+0x7C, 0x60, 0x00, 0x00, 0x00, 0x00, 0x3D, 0x93, 0x75, 0x50, 0x00, 0x00, 0x00, 0x00, 0x3E, 0xA8,
+0x5E, 0x60, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x73, 0x57, 0x50, 0x00, 0x00, 0x00, 0x00, 0x40, 0x91,
+0x7A, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x41, 0x5C, 0x73, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x42, 0x71,
+0x5C, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x43, 0x3C, 0x55, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x44, 0x51,
+0x3E, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x45, 0x12, 0xFD, 0x50, 0x00, 0x00, 0x00, 0x00, 0x46, 0x31,
+0x20, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x46, 0xE0, 0x6A, 0x50, 0x00, 0x00, 0x00, 0x00, 0x48, 0x11,
+0x02, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x48, 0xB7, 0x11, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x49, 0xF0,
+0xE4, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x4A, 0x8D, 0xB9, 0x50, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xDA,
+0x01, 0x60, 0x00, 0x00, 0x00, 0x00, 0x4C, 0x61, 0xBD, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0x89,
+0x58, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xA4, 0xFA, 0x50, 0x00, 0x00, 0x00, 0x00, 0x53, 0x75,
+0x38, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x53, 0xAC, 0x89, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x53, 0xDA,
+0xBC, 0x60, 0x00, 0x00, 0x00, 0x00, 0x54, 0x24, 0x82, 0x50, 0x00, 0x00, 0x00, 0x00, 0x64, 0x4A,
+0xF0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x65, 0x3A, 0xD3, 0x50, 0x00, 0x00, 0x00, 0x00, 0x66, 0x2A,
+0xD2, 0x60, 0x00, 0x00, 0x00, 0x00, 0x67, 0x23, 0xEF, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x68, 0x0A,
+0xB4, 0x60, 0x00, 0x00, 0x00, 0x00, 0x69, 0x03, 0xD1, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x69, 0xEA,
+0x96, 0x60, 0x00, 0x00, 0x00, 0x00, 0x6A, 0xE3, 0xB3, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x6B, 0xD3,
+0xB2, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x6C, 0xC3, 0x95, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x6D, 0xB3,
+0x94, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x6E, 0xA3, 0x77, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x93,
+0x76, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x70, 0x83, 0x59, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x71, 0x73,
+0x58, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x72, 0x6C, 0x76, 0x50, 0x00, 0x00, 0x00, 0x00, 0x73, 0x53,
+0x3A, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x74, 0x4C, 0x58, 0x50, 0x00, 0x00, 0x00, 0x00, 0x75, 0x3C,
+0x57, 0x60, 0x00, 0x00, 0x00, 0x00, 0x76, 0x2C, 0x3A, 0x50, 0x00, 0x00, 0x00, 0x00, 0x77, 0x1C,
+0x39, 0x60, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0C, 0x1C, 0x50, 0x00, 0x00, 0x00, 0x00, 0x78, 0xFC,
+0x1B, 0x60, 0x00, 0x00, 0x00, 0x00, 0x79, 0xEB, 0xFE, 0x50, 0x00, 0x00, 0x00, 0x00, 0x7A, 0xDB,
+0xFD, 0x60, 0x00, 0x00, 0x00, 0x00, 0x7B, 0xCB, 0xE0, 0x50, 0x00, 0x00, 0x00, 0x00, 0x7C, 0xBB,
+0xDF, 0x60, 0x00, 0x00, 0x00, 0x00, 0x7D, 0xB4, 0xFC, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x9B,
+0xC1, 0x60, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x94, 0xDE, 0xD0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
+0x02, 0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
+0x02, 0x03, 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, 0x00, 0x00, 0x1D, 0x55, 0x00, 0x00, 0x00, 0x00, 0x2A,
 0x30, 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x4C,
 0x4D, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01,
-0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x7F, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0D, 0xFF, 0xFF, 0xFF, 0xFF,
-0x7D, 0xBD, 0x4D, 0xAB, 0xFF, 0xFF, 0xFF, 0xFF, 0xC8, 0x93, 0xB4, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF,
-0xC8, 0xFA, 0x7B, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xC9, 0xFC, 0xEF, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF,
-0xCA, 0xC7, 0xE8, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0xCB, 0xAE, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
-0xCC, 0xDF, 0x29, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCD, 0xAC, 0xE1, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF,
-0xCE, 0xC6, 0xF4, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF, 0x8F, 0x66, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF,
-0xD0, 0xA9, 0x79, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xD1, 0x84, 0x60, 0xE0, 0xFF, 0xFF, 0xFF, 0xFF,
-0xD2, 0x8A, 0xAD, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xE8, 0x36, 0x63, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
-0xE8, 0xF4, 0x2D, 0x50, 0xFF, 0xFF, 0xFF, 0xFF, 0xEA, 0x0B, 0xB9, 0x60, 0xFF, 0xFF, 0xFF, 0xFF,
-0xEA, 0xD5, 0x60, 0xD0, 0xFF, 0xFF, 0xFF, 0xFF, 0xEB, 0xEC, 0xFA, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
-0xEC, 0xB5, 0x6D, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xED, 0xCF, 0x7F, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
-0xEE, 0x97, 0xF2, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0xB0, 0xB3, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
-0xF0, 0x79, 0x25, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF1, 0x91, 0xE6, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
-0xF2, 0x5A, 0x59, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xF3, 0x73, 0x1A, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
-0xF4, 0x3B, 0x8C, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF5, 0x55, 0x9F, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
-0xF6, 0x1E, 0x11, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0x36, 0xD2, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
-0xF7, 0xFF, 0x45, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xF9, 0x18, 0x06, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
-0xF9, 0xE1, 0xCA, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFA, 0xF9, 0x39, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
-0xFB, 0xC2, 0xFD, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFC, 0xDB, 0xBE, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF,
-0xFD, 0xA5, 0x82, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0xBC, 0xF2, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
-0xFF, 0x86, 0xB6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0x25, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x01, 0x67, 0xE9, 0x80, 0x00, 0x00, 0x00, 0x00, 0x02, 0x7F, 0x59, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x03, 0x49, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x61, 0xDE, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x05, 0x2B, 0xA2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x43, 0x11, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x07, 0x0C, 0xD5, 0x80, 0x00, 0x00, 0x00, 0x00, 0x08, 0x24, 0x45, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x08, 0xEE, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x05, 0x78, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x0A, 0xCF, 0x3C, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xE7, 0xFD, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x0C, 0xB1, 0xC1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xC9, 0x31, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x0E, 0x92, 0xF5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xAA, 0x64, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x10, 0x74, 0x28, 0x80, 0x00, 0x00, 0x00, 0x00, 0x11, 0x8B, 0x98, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x12, 0x55, 0x5C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x6E, 0x1D, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x14, 0x37, 0xE1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x4F, 0x50, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x16, 0x19, 0x14, 0x80, 0x00, 0x00, 0x00, 0x00, 0x17, 0xA0, 0x93, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x17, 0xFA, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x70, 0xA3, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x19, 0xDB, 0x7B, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xF4, 0x3C, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x1B, 0xBE, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xD5, 0x70, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x1D, 0x9F, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xB6, 0xA3, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x1F, 0x80, 0x67, 0x80, 0x00, 0x00, 0x00, 0x00, 0x20, 0x97, 0xD7, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x21, 0x61, 0x9B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x7A, 0x5C, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x23, 0x44, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x62, 0x27, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x25, 0x25, 0x53, 0x80, 0x00, 0x00, 0x00, 0x00, 0x26, 0x3C, 0xC3, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x27, 0x06, 0x87, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x1D, 0xF6, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x28, 0xE7, 0xBA, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x00, 0x7B, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x2A, 0xCA, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xE1, 0xAF, 0x70, 0x00, 0x00, 0x00, 0x00,
-0x2C, 0xAB, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2D, 0xC2, 0xE2, 0xF0, 0x00, 0x00, 0x00, 0x00,
-0x2E, 0x8C, 0xA6, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2F, 0xA0, 0x13, 0xE0, 0x00, 0x00, 0x00, 0x00,
-0x30, 0x6B, 0x0C, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x31, 0x7F, 0xF5, 0xE0, 0x00, 0x00, 0x00, 0x00,
-0x32, 0x4A, 0xEE, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x33, 0x5F, 0xD7, 0xE0, 0x00, 0x00, 0x00, 0x00,
-0x34, 0x2A, 0xD0, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x35, 0x3F, 0xB9, 0xE0, 0x00, 0x00, 0x00, 0x00,
-0x36, 0x0A, 0xB2, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x37, 0x28, 0xD6, 0x60, 0x00, 0x00, 0x00, 0x00,
-0x37, 0xF3, 0xCF, 0x50, 0x00, 0x00, 0x00, 0x00, 0x39, 0x08, 0xB8, 0x60, 0x00, 0x00, 0x00, 0x00,
-0x39, 0xD3, 0xB1, 0x50, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xE8, 0x9A, 0x60, 0x00, 0x00, 0x00, 0x00,
-0x3B, 0xB3, 0x93, 0x50, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xC8, 0x7C, 0x60, 0x00, 0x00, 0x00, 0x00,
-0x3D, 0x93, 0x75, 0x50, 0x00, 0x00, 0x00, 0x00, 0x3E, 0xA8, 0x5E, 0x60, 0x00, 0x00, 0x00, 0x00,
-0x3F, 0x73, 0x57, 0x50, 0x00, 0x00, 0x00, 0x00, 0x40, 0x91, 0x7A, 0xE0, 0x00, 0x00, 0x00, 0x00,
-0x41, 0x5C, 0x73, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x42, 0x71, 0x5C, 0xE0, 0x00, 0x00, 0x00, 0x00,
-0x43, 0x3C, 0x55, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x44, 0x51, 0x3E, 0xE0, 0x00, 0x00, 0x00, 0x00,
-0x45, 0x12, 0xFD, 0x50, 0x00, 0x00, 0x00, 0x00, 0x46, 0x31, 0x20, 0xE0, 0x00, 0x00, 0x00, 0x00,
-0x46, 0xE0, 0x6A, 0x50, 0x00, 0x00, 0x00, 0x00, 0x48, 0x11, 0x02, 0xE0, 0x00, 0x00, 0x00, 0x00,
-0x48, 0xB7, 0x11, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x49, 0xF0, 0xE4, 0xE0, 0x00, 0x00, 0x00, 0x00,
-0x4A, 0x8D, 0xB9, 0x50, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xDA, 0x01, 0x60, 0x00, 0x00, 0x00, 0x00,
-0x4C, 0x61, 0xBD, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0x89, 0x58, 0xE0, 0x00, 0x00, 0x00, 0x00,
-0x4C, 0xA4, 0xFA, 0x50, 0x00, 0x00, 0x00, 0x00, 0x53, 0x75, 0x38, 0xE0, 0x00, 0x00, 0x00, 0x00,
-0x53, 0xAC, 0x89, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x53, 0xDA, 0xBC, 0x60, 0x00, 0x00, 0x00, 0x00,
-0x54, 0x24, 0x82, 0x50, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x01, 0x02, 0x01,
-0x02, 0x01, 0x02, 0x00, 0x00, 0x1D, 0x55, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x00,
-0x00, 0x1C, 0x20, 0x00, 0x09, 0x00, 0x00, 0x2A, 0x30, 0x01, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x45,
-0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0A, 0x45, 0x45, 0x54,
-0x2D, 0x32, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x0A, 0x45, 0x45, 0x54, 0x2D, 0x32, 0x45, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x34, 0x2E, 0x35, 0x2E,
+0x35, 0x2F, 0x30, 0x2C, 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x34, 0x2F, 0x32, 0x34, 0x0A, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Eire */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -54868,8 +55615,8 @@
 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x0A, 0x43,
 0x45, 0x54, 0x2D, 0x31, 0x43, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2C,
 0x4D, 0x31, 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x33, 0x0A, 0x00, 0xD9, 0x70, 0x10, 0x01, 0x27,
-0x0D, 0xDA, 0x00, 0x00, 0x00, 0x14, 0x47, 0x65, 0x72, 0x6D, 0x61, 0x6E, 0x79, 0x20, 0x28, 0x6D,
-0x6F, 0x73, 0x74, 0x20, 0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 
+0x0D, 0xDA, 0x00, 0x00, 0x00, 0x0F, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6F, 0x66, 0x20, 0x47, 0x65,
+0x72, 0x6D, 0x61, 0x6E, 0x79, 
 
 /* Europe/Bratislava */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x53, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -57513,8 +58260,8 @@
 
 /* Europe/Kirov */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x52, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x10, 0xA1, 0x00, 0x39, 0x80,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x18, 0xA1, 0x00, 0x39, 0x80,
 0xB5, 0xA4, 0x0B, 0x50, 0x15, 0x27, 0x99, 0xC0, 0x16, 0x18, 0xCE, 0x30, 0x17, 0x08, 0xCD, 0x40,
 0x17, 0xFA, 0x01, 0xB0, 0x18, 0xEA, 0x00, 0xC0, 0x19, 0xDB, 0x35, 0x30, 0x1A, 0xCC, 0x85, 0xC0,
 0x1B, 0xBC, 0x92, 0xE0, 0x1C, 0xAC, 0x83, 0xE0, 0x1D, 0x9C, 0x74, 0xE0, 0x1E, 0x8C, 0x65, 0xE0,
@@ -57534,57 +58281,60 @@
 0x02, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x06, 0x07, 0x06, 0x07, 0x04, 0x06,
 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06,
 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06,
-0x07, 0x06, 0x07, 0x06, 0x07, 0x04, 0x07, 0x00, 0x00, 0x2E, 0x98, 0x00, 0x00, 0x00, 0x00, 0x2A,
+0x07, 0x06, 0x07, 0x06, 0x07, 0x08, 0x07, 0x00, 0x00, 0x2E, 0x98, 0x00, 0x00, 0x00, 0x00, 0x2A,
 0x30, 0x00, 0x04, 0x00, 0x00, 0x46, 0x50, 0x01, 0x08, 0x00, 0x00, 0x38, 0x40, 0x00, 0x0C, 0x00,
 0x00, 0x38, 0x40, 0x00, 0x0C, 0x00, 0x00, 0x46, 0x50, 0x01, 0x08, 0x00, 0x00, 0x38, 0x40, 0x01,
-0x0C, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x33, 0x00, 0x2B,
-0x30, 0x35, 0x00, 0x2B, 0x30, 0x34, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00,
-0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00,
-0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x08, 0x00,
-0x00, 0x00, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0x00, 0x39, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB5,
-0xA4, 0x0B, 0x50, 0x00, 0x00, 0x00, 0x00, 0x15, 0x27, 0x99, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x16,
-0x18, 0xCE, 0x30, 0x00, 0x00, 0x00, 0x00, 0x17, 0x08, 0xCD, 0x40, 0x00, 0x00, 0x00, 0x00, 0x17,
-0xFA, 0x01, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x18, 0xEA, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x19,
-0xDB, 0x35, 0x30, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xCC, 0x85, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x1B,
-0xBC, 0x92, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0x83, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x1D,
-0x9C, 0x74, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x65, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x1F,
-0x7C, 0x56, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x47, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x21,
-0x5C, 0x38, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x29, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x23,
-0x3C, 0x1A, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x0B, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x25,
-0x1C, 0x0A, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0B, 0xFB, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x27,
-0x05, 0x27, 0x70, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x18, 0x70, 0x00, 0x00, 0x00, 0x00, 0x29,
-0xD4, 0xEC, 0x60, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC4, 0xEB, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2B,
-0xB4, 0xDC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xCD, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2D,
-0x94, 0xBE, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xAF, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2F,
-0x74, 0xA0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0x91, 0x70, 0x00, 0x00, 0x00, 0x00, 0x31,
-0x5D, 0xBC, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0x97, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x33,
-0x3D, 0x9E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0x79, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x35,
-0x1D, 0x80, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0x5B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x36,
-0xFD, 0x62, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0x78, 0x70, 0x00, 0x00, 0x00, 0x00, 0x38,
-0xDD, 0x44, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0x5A, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3A,
-0xBD, 0x26, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x3C, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3C,
-0xA6, 0x43, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x1E, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3E,
-0x86, 0x25, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x40,
-0x66, 0x07, 0x70, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x1C, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x42,
-0x45, 0xE9, 0x70, 0x00, 0x00, 0x00, 0x00, 0x43, 0x63, 0xFE, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x44,
-0x25, 0xCB, 0x70, 0x00, 0x00, 0x00, 0x00, 0x45, 0x43, 0xE0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x46,
-0x05, 0xAD, 0x70, 0x00, 0x00, 0x00, 0x00, 0x47, 0x23, 0xC2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x47,
-0xEE, 0xC9, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x49, 0x03, 0xA4, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x49,
-0xCE, 0xAB, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0x86, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4B,
-0xAE, 0x8D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCC, 0xA3, 0x70, 0x00, 0x00, 0x00, 0x00, 0x4D,
-0x8E, 0x6F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x1D, 0x60, 0x01, 0x03, 0x02, 0x03, 0x02,
-0x03, 0x02, 0x03, 0x02, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x06, 0x07, 0x06,
-0x07, 0x04, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07,
+0x10, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x14, 0x00, 0x00, 0x38, 0x40, 0x00, 0x14, 0x00, 0x00, 0x2A,
+0x30, 0x00, 0x14, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x33, 0x00, 0x2B, 0x30, 0x35, 0x00, 0x2B,
+0x30, 0x34, 0x00, 0x4D, 0x53, 0x44, 0x00, 0x4D, 0x53, 0x4B, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01,
+0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54,
+0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1,
+0x00, 0x39, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xB5, 0xA4, 0x0B, 0x50, 0x00, 0x00, 0x00, 0x00, 0x15,
+0x27, 0x99, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x18, 0xCE, 0x30, 0x00, 0x00, 0x00, 0x00, 0x17,
+0x08, 0xCD, 0x40, 0x00, 0x00, 0x00, 0x00, 0x17, 0xFA, 0x01, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x18,
+0xEA, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x19, 0xDB, 0x35, 0x30, 0x00, 0x00, 0x00, 0x00, 0x1A,
+0xCC, 0x85, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0x92, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x1C,
+0xAC, 0x83, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x74, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x1E,
+0x8C, 0x65, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x56, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x20,
+0x6C, 0x47, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x38, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x22,
+0x4C, 0x29, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x1A, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x24,
+0x2C, 0x0B, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x0A, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x26,
+0x0B, 0xFB, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x27, 0x70, 0x00, 0x00, 0x00, 0x00, 0x27,
+0xF5, 0x18, 0x70, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD4, 0xEC, 0x60, 0x00, 0x00, 0x00, 0x00, 0x2A,
+0xC4, 0xEB, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xDC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2C,
+0xA4, 0xCD, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xBE, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2E,
+0x84, 0xAF, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xA0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x30,
+0x64, 0x91, 0x70, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xBC, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x32,
+0x72, 0x97, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0x9E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x34,
+0x52, 0x79, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x80, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x36,
+0x32, 0x5B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x62, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x38,
+0x1B, 0x78, 0x70, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x44, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x39,
+0xFB, 0x5A, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x26, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3B,
+0xDB, 0x3C, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x43, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3D,
+0xBB, 0x1E, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x25, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3F,
+0x9B, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x07, 0x70, 0x00, 0x00, 0x00, 0x00, 0x41,
+0x84, 0x1C, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x42, 0x45, 0xE9, 0x70, 0x00, 0x00, 0x00, 0x00, 0x43,
+0x63, 0xFE, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xCB, 0x70, 0x00, 0x00, 0x00, 0x00, 0x45,
+0x43, 0xE0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xAD, 0x70, 0x00, 0x00, 0x00, 0x00, 0x47,
+0x23, 0xC2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xC9, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x49,
+0x03, 0xA4, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xAB, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4A,
+0xE3, 0x86, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0x8D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4C,
+0xCC, 0xA3, 0x70, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x6F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x54,
+0x4C, 0x1D, 0x60, 0x01, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x04, 0x05, 0x04, 0x05,
+0x04, 0x05, 0x04, 0x05, 0x04, 0x06, 0x07, 0x06, 0x07, 0x04, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07,
 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07,
-0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x04, 0x07, 0x00, 0x00, 0x2E, 0x98, 0x00, 0x00,
-0x00, 0x00, 0x2A, 0x30, 0x00, 0x04, 0x00, 0x00, 0x46, 0x50, 0x01, 0x08, 0x00, 0x00, 0x38, 0x40,
-0x00, 0x0C, 0x00, 0x00, 0x38, 0x40, 0x00, 0x0C, 0x00, 0x00, 0x46, 0x50, 0x01, 0x08, 0x00, 0x00,
-0x38, 0x40, 0x01, 0x0C, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x04, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30,
-0x33, 0x00, 0x2B, 0x30, 0x35, 0x00, 0x2B, 0x30, 0x34, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01,
-0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x3C, 0x2B, 0x30, 0x33, 0x3E,
-0x2D, 0x33, 0x0A, 0x00, 0xE2, 0xBE, 0xE0, 0x01, 0x5E, 0x6B, 0x08, 0x00, 0x00, 0x00, 0x0E, 0x4D,
-0x53, 0x4B, 0x2B, 0x30, 0x30, 0x20, 0x2D, 0x20, 0x4B, 0x69, 0x72, 0x6F, 0x76, 
+0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07,
+0x08, 0x07, 0x00, 0x00, 0x2E, 0x98, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x04, 0x00, 0x00,
+0x46, 0x50, 0x01, 0x08, 0x00, 0x00, 0x38, 0x40, 0x00, 0x0C, 0x00, 0x00, 0x38, 0x40, 0x00, 0x0C,
+0x00, 0x00, 0x46, 0x50, 0x01, 0x08, 0x00, 0x00, 0x38, 0x40, 0x01, 0x10, 0x00, 0x00, 0x2A, 0x30,
+0x00, 0x14, 0x00, 0x00, 0x38, 0x40, 0x00, 0x14, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x14, 0x4C, 0x4D,
+0x54, 0x00, 0x2B, 0x30, 0x33, 0x00, 0x2B, 0x30, 0x35, 0x00, 0x2B, 0x30, 0x34, 0x00, 0x4D, 0x53,
+0x44, 0x00, 0x4D, 0x53, 0x4B, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x4D, 0x53, 0x4B, 0x2D, 0x33,
+0x0A, 0x00, 0xE2, 0xBE, 0xE0, 0x01, 0x5E, 0x6B, 0x08, 0x00, 0x00, 0x00, 0x0E, 0x4D, 0x53, 0x4B,
+0x2B, 0x30, 0x30, 0x20, 0x2D, 0x20, 0x4B, 0x69, 0x72, 0x6F, 0x76, 
 
 /* Europe/Kyiv */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x55, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -57720,8 +58470,8 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x0A, 0x45, 0x45, 0x54, 0x2D, 0x32,
 0x45, 0x45, 0x53, 0x54, 0x2C, 0x4D, 0x33, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x33, 0x2C, 0x4D, 0x31,
 0x30, 0x2E, 0x35, 0x2E, 0x30, 0x2F, 0x34, 0x0A, 0x00, 0xD6, 0x48, 0xC5, 0x01, 0x41, 0x39, 0x12,
-0x00, 0x00, 0x00, 0x14, 0x55, 0x6B, 0x72, 0x61, 0x69, 0x6E, 0x65, 0x20, 0x28, 0x6D, 0x6F, 0x73,
-0x74, 0x20, 0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 
+0x00, 0x00, 0x00, 0x0F, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6F, 0x66, 0x20, 0x55, 0x6B, 0x72, 0x61,
+0x69, 0x6E, 0x65, 
 
 /* Europe/Lisbon */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -62491,8 +63241,8 @@
 
 /* Europe/Volgograd */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x52, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x10, 0xA1, 0xF5, 0x46, 0xDC,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x18, 0xA1, 0xF5, 0x46, 0xDC,
 0xB5, 0xA4, 0x0B, 0x50, 0x15, 0x27, 0x99, 0xC0, 0x16, 0x18, 0xCE, 0x30, 0x17, 0x08, 0xCD, 0x40,
 0x17, 0xFA, 0x01, 0xB0, 0x18, 0xEA, 0x00, 0xC0, 0x19, 0xDB, 0x35, 0x30, 0x1A, 0xCC, 0x85, 0xC0,
 0x1B, 0xBC, 0x92, 0xE0, 0x1C, 0xAC, 0x83, 0xE0, 0x1D, 0x9C, 0x74, 0xE0, 0x1E, 0x8C, 0x65, 0xE0,
@@ -62512,58 +63262,61 @@
 0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04,
 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x04, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06,
 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06,
-0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x04, 0x07, 0x04,
+0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x08, 0x07, 0x04,
 0x07, 0x00, 0x00, 0x29, 0xA4, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x04, 0x00, 0x00, 0x38,
 0x40, 0x00, 0x08, 0x00, 0x00, 0x46, 0x50, 0x01, 0x0C, 0x00, 0x00, 0x38, 0x40, 0x00, 0x08, 0x00,
-0x00, 0x46, 0x50, 0x01, 0x0C, 0x00, 0x00, 0x38, 0x40, 0x01, 0x08, 0x00, 0x00, 0x2A, 0x30, 0x00,
-0x04, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x33, 0x00, 0x2B, 0x30, 0x34, 0x00, 0x2B, 0x30, 0x35,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00,
-0x08, 0x00, 0x00, 0x00, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1, 0xF5, 0x46, 0xDC, 0xFF, 0xFF, 0xFF,
-0xFF, 0xB5, 0xA4, 0x0B, 0x50, 0x00, 0x00, 0x00, 0x00, 0x15, 0x27, 0x99, 0xC0, 0x00, 0x00, 0x00,
-0x00, 0x16, 0x18, 0xCE, 0x30, 0x00, 0x00, 0x00, 0x00, 0x17, 0x08, 0xCD, 0x40, 0x00, 0x00, 0x00,
-0x00, 0x17, 0xFA, 0x01, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x18, 0xEA, 0x00, 0xC0, 0x00, 0x00, 0x00,
-0x00, 0x19, 0xDB, 0x35, 0x30, 0x00, 0x00, 0x00, 0x00, 0x1A, 0xCC, 0x85, 0xC0, 0x00, 0x00, 0x00,
-0x00, 0x1B, 0xBC, 0x92, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x1C, 0xAC, 0x83, 0xE0, 0x00, 0x00, 0x00,
-0x00, 0x1D, 0x9C, 0x74, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x8C, 0x65, 0xE0, 0x00, 0x00, 0x00,
-0x00, 0x1F, 0x7C, 0x56, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x20, 0x6C, 0x47, 0xE0, 0x00, 0x00, 0x00,
-0x00, 0x21, 0x5C, 0x38, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x22, 0x4C, 0x29, 0xE0, 0x00, 0x00, 0x00,
-0x00, 0x23, 0x3C, 0x28, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x24, 0x2C, 0x19, 0xF0, 0x00, 0x00, 0x00,
-0x00, 0x25, 0x1C, 0x0A, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x26, 0x0B, 0xFB, 0xF0, 0x00, 0x00, 0x00,
-0x00, 0x27, 0x05, 0x27, 0x70, 0x00, 0x00, 0x00, 0x00, 0x27, 0xF5, 0x18, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x29, 0xD4, 0xEC, 0x60, 0x00, 0x00, 0x00, 0x00, 0x2A, 0xC4, 0xEB, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x2B, 0xB4, 0xDC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2C, 0xA4, 0xCD, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x2D, 0x94, 0xBE, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2E, 0x84, 0xAF, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x2F, 0x74, 0xA0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x30, 0x64, 0x91, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x31, 0x5D, 0xBC, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x32, 0x72, 0x97, 0xF0, 0x00, 0x00, 0x00,
-0x00, 0x33, 0x3D, 0x9E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x34, 0x52, 0x79, 0xF0, 0x00, 0x00, 0x00,
-0x00, 0x35, 0x1D, 0x80, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x36, 0x32, 0x5B, 0xF0, 0x00, 0x00, 0x00,
-0x00, 0x36, 0xFD, 0x62, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x38, 0x1B, 0x78, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x38, 0xDD, 0x44, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x39, 0xFB, 0x5A, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x3A, 0xBD, 0x26, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3B, 0xDB, 0x3C, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x3C, 0xA6, 0x43, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3D, 0xBB, 0x1E, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x3E, 0x86, 0x25, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x9B, 0x00, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x40, 0x66, 0x07, 0x70, 0x00, 0x00, 0x00, 0x00, 0x41, 0x84, 0x1C, 0xF0, 0x00, 0x00, 0x00,
-0x00, 0x42, 0x45, 0xE9, 0x70, 0x00, 0x00, 0x00, 0x00, 0x43, 0x63, 0xFE, 0xF0, 0x00, 0x00, 0x00,
-0x00, 0x44, 0x25, 0xCB, 0x70, 0x00, 0x00, 0x00, 0x00, 0x45, 0x43, 0xE0, 0xF0, 0x00, 0x00, 0x00,
-0x00, 0x46, 0x05, 0xAD, 0x70, 0x00, 0x00, 0x00, 0x00, 0x47, 0x23, 0xC2, 0xF0, 0x00, 0x00, 0x00,
-0x00, 0x47, 0xEE, 0xC9, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x49, 0x03, 0xA4, 0xF0, 0x00, 0x00, 0x00,
-0x00, 0x49, 0xCE, 0xAB, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4A, 0xE3, 0x86, 0xF0, 0x00, 0x00, 0x00,
-0x00, 0x4B, 0xAE, 0x8D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xCC, 0xA3, 0x70, 0x00, 0x00, 0x00,
-0x00, 0x4D, 0x8E, 0x6F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x54, 0x4C, 0x1D, 0x60, 0x00, 0x00, 0x00,
-0x00, 0x5B, 0xD4, 0xED, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x5F, 0xE7, 0xB2, 0x60, 0x01, 0x02, 0x03,
-0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x06, 0x07, 0x06,
-0x07, 0x06, 0x07, 0x04, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07,
-0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07,
-0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x04, 0x07, 0x04, 0x07, 0x00, 0x00,
-0x29, 0xA4, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x04, 0x00, 0x00, 0x38, 0x40, 0x00, 0x08,
-0x00, 0x00, 0x46, 0x50, 0x01, 0x0C, 0x00, 0x00, 0x38, 0x40, 0x00, 0x08, 0x00, 0x00, 0x46, 0x50,
-0x01, 0x0C, 0x00, 0x00, 0x38, 0x40, 0x01, 0x08, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x04, 0x4C, 0x4D,
-0x54, 0x00, 0x2B, 0x30, 0x33, 0x00, 0x2B, 0x30, 0x34, 0x00, 0x2B, 0x30, 0x35, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x0A, 0x3C, 0x2B, 0x30, 0x33, 0x3E, 0x2D, 0x33, 0x0A, 0x00,
-0xD3, 0xB0, 0xB5, 0x01, 0x56, 0x6E, 0xC2, 0x00, 0x00, 0x00, 0x12, 0x4D, 0x53, 0x4B, 0x2B, 0x30,
-0x30, 0x20, 0x2D, 0x20, 0x56, 0x6F, 0x6C, 0x67, 0x6F, 0x67, 0x72, 0x61, 0x64, 
+0x00, 0x46, 0x50, 0x01, 0x0C, 0x00, 0x00, 0x38, 0x40, 0x01, 0x10, 0x00, 0x00, 0x2A, 0x30, 0x00,
+0x14, 0x00, 0x00, 0x38, 0x40, 0x00, 0x14, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x14, 0x4C, 0x4D, 0x54,
+0x00, 0x2B, 0x30, 0x33, 0x00, 0x2B, 0x30, 0x34, 0x00, 0x2B, 0x30, 0x35, 0x00, 0x4D, 0x53, 0x44,
+0x00, 0x4D, 0x53, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x54,
+0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x18, 0xFF, 0xFF, 0xFF, 0xFF, 0xA1,
+0xF5, 0x46, 0xDC, 0xFF, 0xFF, 0xFF, 0xFF, 0xB5, 0xA4, 0x0B, 0x50, 0x00, 0x00, 0x00, 0x00, 0x15,
+0x27, 0x99, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x18, 0xCE, 0x30, 0x00, 0x00, 0x00, 0x00, 0x17,
+0x08, 0xCD, 0x40, 0x00, 0x00, 0x00, 0x00, 0x17, 0xFA, 0x01, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x18,
+0xEA, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x19, 0xDB, 0x35, 0x30, 0x00, 0x00, 0x00, 0x00, 0x1A,
+0xCC, 0x85, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x1B, 0xBC, 0x92, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x1C,
+0xAC, 0x83, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x9C, 0x74, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x1E,
+0x8C, 0x65, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x7C, 0x56, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x20,
+0x6C, 0x47, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x21, 0x5C, 0x38, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x22,
+0x4C, 0x29, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x23, 0x3C, 0x28, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x24,
+0x2C, 0x19, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x25, 0x1C, 0x0A, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x26,
+0x0B, 0xFB, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x27, 0x05, 0x27, 0x70, 0x00, 0x00, 0x00, 0x00, 0x27,
+0xF5, 0x18, 0x70, 0x00, 0x00, 0x00, 0x00, 0x29, 0xD4, 0xEC, 0x60, 0x00, 0x00, 0x00, 0x00, 0x2A,
+0xC4, 0xEB, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2B, 0xB4, 0xDC, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2C,
+0xA4, 0xCD, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x94, 0xBE, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2E,
+0x84, 0xAF, 0x70, 0x00, 0x00, 0x00, 0x00, 0x2F, 0x74, 0xA0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x30,
+0x64, 0x91, 0x70, 0x00, 0x00, 0x00, 0x00, 0x31, 0x5D, 0xBC, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x32,
+0x72, 0x97, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x33, 0x3D, 0x9E, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x34,
+0x52, 0x79, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x35, 0x1D, 0x80, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x36,
+0x32, 0x5B, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x36, 0xFD, 0x62, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x38,
+0x1B, 0x78, 0x70, 0x00, 0x00, 0x00, 0x00, 0x38, 0xDD, 0x44, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x39,
+0xFB, 0x5A, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3A, 0xBD, 0x26, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x3B,
+0xDB, 0x3C, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3C, 0xA6, 0x43, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3D,
+0xBB, 0x1E, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3E, 0x86, 0x25, 0x70, 0x00, 0x00, 0x00, 0x00, 0x3F,
+0x9B, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x07, 0x70, 0x00, 0x00, 0x00, 0x00, 0x41,
+0x84, 0x1C, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x42, 0x45, 0xE9, 0x70, 0x00, 0x00, 0x00, 0x00, 0x43,
+0x63, 0xFE, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25, 0xCB, 0x70, 0x00, 0x00, 0x00, 0x00, 0x45,
+0x43, 0xE0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x46, 0x05, 0xAD, 0x70, 0x00, 0x00, 0x00, 0x00, 0x47,
+0x23, 0xC2, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x47, 0xEE, 0xC9, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x49,
+0x03, 0xA4, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x49, 0xCE, 0xAB, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4A,
+0xE3, 0x86, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4B, 0xAE, 0x8D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x4C,
+0xCC, 0xA3, 0x70, 0x00, 0x00, 0x00, 0x00, 0x4D, 0x8E, 0x6F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x54,
+0x4C, 0x1D, 0x60, 0x00, 0x00, 0x00, 0x00, 0x5B, 0xD4, 0xED, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x5F,
+0xE7, 0xB2, 0x60, 0x01, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x04, 0x05, 0x04, 0x05,
+0x04, 0x05, 0x04, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x04, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07,
+0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07,
+0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07,
+0x08, 0x07, 0x04, 0x07, 0x00, 0x00, 0x29, 0xA4, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x04,
+0x00, 0x00, 0x38, 0x40, 0x00, 0x08, 0x00, 0x00, 0x46, 0x50, 0x01, 0x0C, 0x00, 0x00, 0x38, 0x40,
+0x00, 0x08, 0x00, 0x00, 0x46, 0x50, 0x01, 0x0C, 0x00, 0x00, 0x38, 0x40, 0x01, 0x10, 0x00, 0x00,
+0x2A, 0x30, 0x00, 0x14, 0x00, 0x00, 0x38, 0x40, 0x00, 0x14, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x14,
+0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x33, 0x00, 0x2B, 0x30, 0x34, 0x00, 0x2B, 0x30, 0x35, 0x00,
+0x4D, 0x53, 0x44, 0x00, 0x4D, 0x53, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01,
+0x01, 0x01, 0x0A, 0x4D, 0x53, 0x4B, 0x2D, 0x33, 0x0A, 0x00, 0xD3, 0xB0, 0xB5, 0x01, 0x56, 0x6E,
+0xC2, 0x00, 0x00, 0x00, 0x12, 0x4D, 0x53, 0x4B, 0x2B, 0x30, 0x30, 0x20, 0x2D, 0x20, 0x56, 0x6F,
+0x6C, 0x67, 0x6F, 0x67, 0x72, 0x61, 0x64, 
 
 /* Europe/Warsaw */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x50, 0x4C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -65491,8 +66244,8 @@
 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x0A, 0x4E, 0x5A, 0x53, 0x54, 0x2D, 0x31, 0x32,
 0x4E, 0x5A, 0x44, 0x54, 0x2C, 0x4D, 0x39, 0x2E, 0x35, 0x2E, 0x30, 0x2C, 0x4D, 0x34, 0x2E, 0x31,
 0x2E, 0x30, 0x2F, 0x33, 0x0A, 0x00, 0x51, 0x13, 0x35, 0x02, 0x1D, 0x54, 0xBA, 0x00, 0x00, 0x00,
-0x18, 0x4E, 0x65, 0x77, 0x20, 0x5A, 0x65, 0x61, 0x6C, 0x61, 0x6E, 0x64, 0x20, 0x28, 0x6D, 0x6F,
-0x73, 0x74, 0x20, 0x61, 0x72, 0x65, 0x61, 0x73, 0x29, 
+0x13, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6F, 0x66, 0x20, 0x4E, 0x65, 0x77, 0x20, 0x5A, 0x65, 0x61,
+0x6C, 0x61, 0x6E, 0x64, 
 
 /* Pacific/Bougainville */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x50, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -66161,9 +66914,8 @@
 0x8C, 0xA0, 0x00, 0x0C, 0x00, 0x00, 0xA8, 0xC0, 0x00, 0x10, 0x4C, 0x4D, 0x54, 0x00, 0x2B, 0x31,
 0x31, 0x00, 0x2B, 0x30, 0x39, 0x00, 0x2B, 0x31, 0x30, 0x00, 0x2B, 0x31, 0x32, 0x00, 0x0A, 0x3C,
 0x2B, 0x31, 0x32, 0x3E, 0x2D, 0x31, 0x32, 0x0A, 0x00, 0x94, 0x3D, 0x38, 0x02, 0x17, 0xE3, 0x80,
-0x00, 0x00, 0x00, 0x1D, 0x4D, 0x61, 0x72, 0x73, 0x68, 0x61, 0x6C, 0x6C, 0x20, 0x49, 0x73, 0x6C,
-0x61, 0x6E, 0x64, 0x73, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x61, 0x72, 0x65, 0x61, 0x73,
-0x29, 
+0x00, 0x00, 0x00, 0x18, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6F, 0x66, 0x20, 0x4D, 0x61, 0x72, 0x73,
+0x68, 0x61, 0x6C, 0x6C, 0x20, 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64, 0x73, 
 
 /* Pacific/Marquesas */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x50, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -66398,9 +67150,9 @@
 0x90, 0x01, 0x02, 0x00, 0x00, 0x89, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x89, 0xF0, 0x00, 0x04, 0x00,
 0x00, 0x8C, 0xA0, 0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x50, 0x4D, 0x4D, 0x54, 0x00, 0x2B, 0x31,
 0x30, 0x00, 0x0A, 0x3C, 0x2B, 0x31, 0x30, 0x3E, 0x2D, 0x31, 0x30, 0x0A, 0x00, 0x7A, 0xD5, 0x50,
-0x01, 0xF3, 0x37, 0x7A, 0x00, 0x00, 0x00, 0x1D, 0x50, 0x61, 0x70, 0x75, 0x61, 0x20, 0x4E, 0x65,
-0x77, 0x20, 0x47, 0x75, 0x69, 0x6E, 0x65, 0x61, 0x20, 0x28, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x61,
-0x72, 0x65, 0x61, 0x73, 0x29, 
+0x01, 0xF3, 0x37, 0x7A, 0x00, 0x00, 0x00, 0x18, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6F, 0x66, 0x20,
+0x50, 0x61, 0x70, 0x75, 0x61, 0x20, 0x4E, 0x65, 0x77, 0x20, 0x47, 0x75, 0x69, 0x6E, 0x65, 0x61,
+
 
 /* Pacific/Rarotonga */
 0x50, 0x48, 0x50, 0x32, 0x01, 0x43, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -67269,28 +68021,30 @@
 
 /* Singapore */
 0x50, 0x48, 0x50, 0x32, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x20, 0x80, 0x00, 0x00, 0x00,
 0x86, 0x83, 0x85, 0xA3, 0xBA, 0x67, 0x4E, 0x90, 0xC0, 0x0A, 0xE4, 0x60, 0xCA, 0xB3, 0xE5, 0x60,
-0xCB, 0x91, 0x5F, 0x08, 0xD2, 0x48, 0x6D, 0xF0, 0x16, 0x91, 0xF5, 0x08, 0x01, 0x02, 0x03, 0x04,
+0xCB, 0x91, 0x5F, 0x08, 0xD2, 0x48, 0x6D, 0xF0, 0x16, 0x91, 0xEE, 0x00, 0x01, 0x02, 0x03, 0x04,
 0x05, 0x06, 0x05, 0x07, 0x00, 0x00, 0x61, 0x5D, 0x00, 0x00, 0x00, 0x00, 0x61, 0x5D, 0x00, 0x04,
 0x00, 0x00, 0x62, 0x70, 0x00, 0x08, 0x00, 0x00, 0x67, 0x20, 0x01, 0x0C, 0x00, 0x00, 0x67, 0x20,
 0x00, 0x0C, 0x00, 0x00, 0x69, 0x78, 0x00, 0x12, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x18, 0x00, 0x00,
 0x70, 0x80, 0x00, 0x1C, 0x4C, 0x4D, 0x54, 0x00, 0x53, 0x4D, 0x54, 0x00, 0x2B, 0x30, 0x37, 0x00,
 0x2B, 0x30, 0x37, 0x32, 0x30, 0x00, 0x2B, 0x30, 0x37, 0x33, 0x30, 0x00, 0x2B, 0x30, 0x39, 0x00,
-0x2B, 0x30, 0x38, 0x00, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x2B, 0x30, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x01, 0x54, 0x5A, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x20,
 0xFF, 0xFF, 0xFF, 0xFF, 0x7E, 0x36, 0x53, 0xA3, 0xFF, 0xFF, 0xFF, 0xFF, 0x86, 0x83, 0x85, 0xA3,
 0xFF, 0xFF, 0xFF, 0xFF, 0xBA, 0x67, 0x4E, 0x90, 0xFF, 0xFF, 0xFF, 0xFF, 0xC0, 0x0A, 0xE4, 0x60,
 0xFF, 0xFF, 0xFF, 0xFF, 0xCA, 0xB3, 0xE5, 0x60, 0xFF, 0xFF, 0xFF, 0xFF, 0xCB, 0x91, 0x5F, 0x08,
-0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x48, 0x6D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x91, 0xF5, 0x08,
+0xFF, 0xFF, 0xFF, 0xFF, 0xD2, 0x48, 0x6D, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x16, 0x91, 0xEE, 0x00,
 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x05, 0x07, 0x00, 0x00, 0x61, 0x5D, 0x00, 0x00, 0x00, 0x00,
 0x61, 0x5D, 0x00, 0x04, 0x00, 0x00, 0x62, 0x70, 0x00, 0x08, 0x00, 0x00, 0x67, 0x20, 0x01, 0x0C,
 0x00, 0x00, 0x67, 0x20, 0x00, 0x0C, 0x00, 0x00, 0x69, 0x78, 0x00, 0x12, 0x00, 0x00, 0x7E, 0x90,
 0x00, 0x18, 0x00, 0x00, 0x70, 0x80, 0x00, 0x1C, 0x4C, 0x4D, 0x54, 0x00, 0x53, 0x4D, 0x54, 0x00,
 0x2B, 0x30, 0x37, 0x00, 0x2B, 0x30, 0x37, 0x32, 0x30, 0x00, 0x2B, 0x30, 0x37, 0x33, 0x30, 0x00,
-0x2B, 0x30, 0x39, 0x00, 0x2B, 0x30, 0x38, 0x00, 0x0A, 0x3C, 0x2B, 0x30, 0x38, 0x3E, 0x2D, 0x38,
+0x2B, 0x30, 0x39, 0x00, 0x2B, 0x30, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0A, 0x3C, 0x2B, 0x30, 0x38, 0x3E, 0x2D, 0x38,
 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 
 /* Turkey */
@@ -69245,4 +69999,4 @@
 };
 #endif
 
-const timelib_tzdb timezonedb_builtin = { "2022.6", 596, timezonedb_idx_builtin, timelib_timezone_db_data_builtin };
+const timelib_tzdb timezonedb_builtin = { "2023.3", 597, timezonedb_idx_builtin, timelib_timezone_db_data_builtin };

php-8.1.13.tar.xz/ext/date/php_date.c -> php-8.1.21.tar.xz/ext/date/php_date.c Changed

@@ -716,7 +716,7 @@
 			/* timezone */
 			case 'I': length = slprintf(buffer, sizeof(buffer), "%d", localtime ? offset->is_dst : 0); break;
 			case 'p':
-				if (!localtime || strcmp(offset->abbr, "UTC") == 0 || strcmp(offset->abbr, "Z") == 0) {
+				if (!localtime || strcmp(offset->abbr, "UTC") == 0 || strcmp(offset->abbr, "Z") == 0 || strcmp(offset->abbr, "GMT+0000") == 0) {
 					length = slprintf(buffer, sizeof(buffer), "%s", "Z");
 					break;
 				}
@@ -1957,13 +1957,25 @@
 			ZVAL_STRING(zv, tzobj->tzi.tz->name);
 			break;
 		case TIMELIB_ZONETYPE_OFFSET: {
-			zend_string *tmpstr = zend_string_alloc(sizeof("UTC+05:00")-1, 0);
 			timelib_sll utc_offset = tzobj->tzi.utc_offset;
+			int seconds = utc_offset % 60;
+			size_t size;
+			const char *format;
+			if (seconds == 0) {
+				size = sizeof("+05:00");
+				format = "%c%02d:%02d";
+			} else {
+				size = sizeof("+05:00:01");
+				format = "%c%02d:%02d:%02d";
+			}
+			zend_string *tmpstr = zend_string_alloc(size - 1, 0);
 
-			ZSTR_LEN(tmpstr) = snprintf(ZSTR_VAL(tmpstr), sizeof("+05:00"), "%c%02d:%02d",
+			/* Note: if seconds == 0, the seconds argument will be excessive and therefore ignored. */
+			ZSTR_LEN(tmpstr) = snprintf(ZSTR_VAL(tmpstr), size, format,
 				utc_offset < 0 ? '-' : '+',
 				abs((int)(utc_offset / 3600)),
-				abs((int)(utc_offset % 3600) / 60));
+				abs((int)(utc_offset % 3600) / 60),
+				abs(seconds));
 
 			ZVAL_NEW_STR(zv, tmpstr);
 			}
@@ -2897,6 +2909,16 @@
 		dateobj->time->us = tmp_time->us;
 	}
 
+	/* Reset timezone to UTC if we detect a "@<ts>" modification */
+	if (
+		tmp_time->y == 1970 && tmp_time->m == 1 && tmp_time->d == 1 &&
+		tmp_time->h == 0 && tmp_time->i == 0 && tmp_time->s == 0 && tmp_time->us == 0 &&
+		tmp_time->have_zone && tmp_time->zone_type == TIMELIB_ZONETYPE_OFFSET &&
+		tmp_time->z == 0 && tmp_time->dst == 0
+	) {
+		timelib_set_timezone_from_offset(dateobj->time, 0);
+	}
+
 	timelib_time_dtor(tmp_time);
 
 	timelib_update_ts(dateobj->time, NULL);

php-8.1.13.tar.xz/ext/date/tests/DateTime_add-fall-type2-type3.phpt -> php-8.1.21.tar.xz/ext/date/tests/DateTime_add-fall-type2-type3.phpt Changed

@@ -2,8 +2,6 @@
 DateTime::add() -- fall type2 type3
 --CREDITS--
 Daniel Convissor <danielc@php.net>
---XFAIL--
-Various bugs exist
 --FILE--
 <?php
 
@@ -16,38 +14,38 @@
 test_time_fall_type2_prev_type3_prev: ADD: 2010-10-04 02:18:48 EDT + P+0Y1M2DT16H19M40S = **2010-11-06 18:38:28 EDT**
 test_time_fall_type2_prev_type3_dt: ADD: 2010-11-06 18:38:28 EDT + P+0Y0M0DT5H31M52S = **2010-11-07 00:10:20 EDT**
 test_time_fall_type2_prev_type3_redodt: ADD: 2010-11-06 18:38:28 EDT + P+0Y0M0DT6H34M5S = **2010-11-07 01:12:33 EDT**
-test_time_fall_type2_prev_type3_redost: ADD: 2010-11-06 18:38:28 EDT + P+0Y0M0DT7H36M16S = **2010-11-07 01:14:44 EST**
-test_time_fall_type2_prev_type3_st: ADD: 2010-11-06 18:38:28 EDT + P+0Y0M0DT9H38M27S = **2010-11-07 03:16:55 EST**
-test_time_fall_type2_prev_type3_post: ADD: 2010-11-06 18:38:28 EDT + P+0Y0M2DT1H21M31S = **2010-11-08 19:59:59 EST**
+test_time_fall_type2_prev_type3_redost: ADD: 2010-11-06 18:38:28 EDT + P+0Y0M0DT7H36M16S = **2010-11-07 02:14:44 EDT**
+test_time_fall_type2_prev_type3_st: ADD: 2010-11-06 18:38:28 EDT + P+0Y0M0DT9H38M27S = **2010-11-07 04:16:55 EDT**
+test_time_fall_type2_prev_type3_post: ADD: 2010-11-06 18:38:28 EDT + P+0Y0M2DT1H21M31S = **2010-11-08 19:59:59 EDT**
 test_time_fall_type2_dt_type3_prev: ADD: 2010-11-07 00:10:20 EDT + P-0Y0M0DT5H31M52S = **2010-11-06 18:38:28 EDT**
 test_time_fall_type2_dt_type3_dt: ADD: 2010-11-07 00:10:20 EDT + P+0Y0M0DT0H5M15S = **2010-11-07 00:15:35 EDT**
 test_time_fall_type2_dt_type3_redodt: ADD: 2010-11-07 00:10:20 EDT + P+0Y0M0DT1H2M13S = **2010-11-07 01:12:33 EDT**
-test_time_fall_type2_dt_type3_redost: ADD: 2010-11-07 00:10:20 EDT + P+0Y0M0DT2H4M24S = **2010-11-07 01:14:44 EST**
-test_time_fall_type2_dt_type3_st: ADD: 2010-11-07 00:10:20 EDT + P+0Y0M0DT4H6M35S = **2010-11-07 03:16:55 EST**
-test_time_fall_type2_dt_type3_post: ADD: 2010-11-07 00:10:20 EDT + P+0Y0M1DT20H49M39S = **2010-11-08 19:59:59 EST**
+test_time_fall_type2_dt_type3_redost: ADD: 2010-11-07 00:10:20 EDT + P+0Y0M0DT2H4M24S = **2010-11-07 02:14:44 EDT**
+test_time_fall_type2_dt_type3_st: ADD: 2010-11-07 00:10:20 EDT + P+0Y0M0DT4H6M35S = **2010-11-07 04:16:55 EDT**
+test_time_fall_type2_dt_type3_post: ADD: 2010-11-07 00:10:20 EDT + P+0Y0M1DT20H49M39S = **2010-11-08 20:59:59 EDT**
 test_time_fall_type2_redodt_type3_prev: ADD: 2010-11-07 01:12:33 EDT + P-0Y0M0DT6H34M5S = **2010-11-06 18:38:28 EDT**
 test_time_fall_type2_redodt_type3_dt: ADD: 2010-11-07 01:12:33 EDT + P-0Y0M0DT1H2M13S = **2010-11-07 00:10:20 EDT**
 test_time_fall_type2_redodt_type3_redodt: ADD: 2010-11-07 01:12:33 EDT + P+0Y0M0DT0H3M2S = **2010-11-07 01:15:35 EDT**
-test_time_fall_type2_redodt_type3_redost: ADD: 2010-11-07 01:12:33 EDT + P+0Y0M0DT1H2M11S = **2010-11-07 01:14:44 EST**
-test_time_fall_type2_redodt_type3_st: ADD: 2010-11-07 01:12:33 EDT + P+0Y0M0DT3H4M22S = **2010-11-07 03:16:55 EST**
-test_time_fall_type2_redodt_type3_post: ADD: 2010-11-07 01:12:33 EDT + P+0Y0M1DT19H47M26S = **2010-11-08 19:59:59 EST**
-test_time_fall_type2_redost_type3_prev: ADD: 2010-11-07 01:14:44 EST + P-0Y0M0DT7H36M16S = **2010-11-06 18:38:28 EDT**
-test_time_fall_type2_redost_type3_dt: ADD: 2010-11-07 01:14:44 EST + P-0Y0M0DT2H4M24S = **2010-11-07 00:10:20 EDT**
-test_time_fall_type2_redost_type3_redodt: ADD: 2010-11-07 01:14:44 EST + P-0Y0M0DT1H2M11S = **2010-11-07 01:12:33 EDT**
+test_time_fall_type2_redodt_type3_redost: ADD: 2010-11-07 01:12:33 EDT + P+0Y0M0DT1H2M11S = **2010-11-07 02:14:44 EDT**
+test_time_fall_type2_redodt_type3_st: ADD: 2010-11-07 01:12:33 EDT + P+0Y0M0DT3H4M22S = **2010-11-07 04:16:55 EDT**
+test_time_fall_type2_redodt_type3_post: ADD: 2010-11-07 01:12:33 EDT + P+0Y0M1DT19H47M26S = **2010-11-08 20:59:59 EDT**
+test_time_fall_type2_redost_type3_prev: ADD: 2010-11-07 01:14:44 EST + P-0Y0M0DT7H36M16S = **2010-11-06 17:38:28 EST**
+test_time_fall_type2_redost_type3_dt: ADD: 2010-11-07 01:14:44 EST + P-0Y0M0DT2H4M24S = **2010-11-06 23:10:20 EST**
+test_time_fall_type2_redost_type3_redodt: ADD: 2010-11-07 01:14:44 EST + P-0Y0M0DT1H2M11S = **2010-11-07 00:12:33 EST**
 test_time_fall_type2_redost_type3_redost: ADD: 2010-11-07 01:14:44 EST + P+0Y0M0DT0H2M10S = **2010-11-07 01:16:54 EST**
 test_time_fall_type2_redost_type3_st: ADD: 2010-11-07 01:14:44 EST + P+0Y0M0DT2H2M11S = **2010-11-07 03:16:55 EST**
 test_time_fall_type2_redost_type3_post: ADD: 2010-11-07 01:14:44 EST + P+0Y0M1DT18H45M15S = **2010-11-08 19:59:59 EST**
-test_time_fall_type2_st_type3_prev: ADD: 2010-11-07 03:16:55 EST + P-0Y0M0DT9H38M27S = **2010-11-06 18:38:28 EDT**
-test_time_fall_type2_st_type3_dt: ADD: 2010-11-07 03:16:55 EST + P-0Y0M0DT4H6M35S = **2010-11-07 00:10:20 EDT**
-test_time_fall_type2_st_type3_redodt: ADD: 2010-11-07 03:16:55 EST + P-0Y0M0DT3H4M22S = **2010-11-07 01:12:33 EDT**
+test_time_fall_type2_st_type3_prev: ADD: 2010-11-07 03:16:55 EST + P-0Y0M0DT9H38M27S = **2010-11-06 17:38:28 EST**
+test_time_fall_type2_st_type3_dt: ADD: 2010-11-07 03:16:55 EST + P-0Y0M0DT4H6M35S = **2010-11-06 23:10:20 EST**
+test_time_fall_type2_st_type3_redodt: ADD: 2010-11-07 03:16:55 EST + P-0Y0M0DT3H4M22S = **2010-11-07 00:12:33 EST**
 test_time_fall_type2_st_type3_redost: ADD: 2010-11-07 03:16:55 EST + P-0Y0M0DT2H2M11S = **2010-11-07 01:14:44 EST**
 test_time_fall_type2_st_type3_st: ADD: 2010-11-07 03:16:55 EST + P+0Y0M0DT2H3M1S = **2010-11-07 05:19:56 EST**
 test_time_fall_type2_st_type3_post: ADD: 2010-11-07 03:16:55 EST + P+0Y0M1DT16H43M4S = **2010-11-08 19:59:59 EST**
-test_time_fall_type2_post_type3_prev: ADD: 2010-11-08 19:59:59 EST + P-0Y0M2DT1H21M31S = **2010-11-06 18:38:28 EDT**
-test_time_fall_type2_post_type3_dt: ADD: 2010-11-08 19:59:59 EST + P-0Y0M1DT20H49M39S = **2010-11-07 00:10:20 EDT**
-test_time_fall_type2_post_type3_redodt: ADD: 2010-11-08 19:59:59 EST + P-0Y0M1DT19H47M26S = **2010-11-07 01:12:33 EDT**
+test_time_fall_type2_post_type3_prev: ADD: 2010-11-08 19:59:59 EST + P-0Y0M2DT1H21M31S = **2010-11-06 18:38:28 EST**
+test_time_fall_type2_post_type3_dt: ADD: 2010-11-08 19:59:59 EST + P-0Y0M1DT20H49M39S = **2010-11-06 23:10:20 EST**
+test_time_fall_type2_post_type3_redodt: ADD: 2010-11-08 19:59:59 EST + P-0Y0M1DT19H47M26S = **2010-11-07 00:12:33 EST**
 test_time_fall_type2_post_type3_redost: ADD: 2010-11-08 19:59:59 EST + P-0Y0M1DT18H45M15S = **2010-11-07 01:14:44 EST**
 test_time_fall_type2_post_type3_st: ADD: 2010-11-08 19:59:59 EST + P-0Y0M1DT16H43M4S = **2010-11-07 03:16:55 EST**
 test_time_fall_type2_post_type3_post: ADD: 2010-11-08 18:57:55 EST + P+0Y0M0DT1H2M4S = **2010-11-08 19:59:59 EST**
-test_time_fall_type2_dtsec_type3_stsec: ADD: 2010-11-07 01:59:59 EDT + P+0Y0M0DT0H0M1S = **2010-11-07 01:00:00 EST**
-test_time_fall_type2_stsec_type3_dtsec: ADD: 2010-11-07 01:00:00 EST + P-0Y0M0DT0H0M1S = **2010-11-07 01:59:59 EDT**
+test_time_fall_type2_dtsec_type3_stsec: ADD: 2010-11-07 01:59:59 EDT + P+0Y0M0DT0H0M1S = **2010-11-07 02:00:00 EDT**
+test_time_fall_type2_stsec_type3_dtsec: ADD: 2010-11-07 01:00:00 EST + P-0Y0M0DT0H0M1S = **2010-11-07 00:59:59 EST**

php-8.1.13.tar.xz/ext/date/tests/DateTime_add-fall-type3-type2.phpt -> php-8.1.21.tar.xz/ext/date/tests/DateTime_add-fall-type3-type2.phpt Changed

@@ -2,8 +2,6 @@
 DateTime::add() -- fall type3 type2
 --CREDITS--
 Daniel Convissor <danielc@php.net>
---XFAIL--
-Various bugs exist
 --FILE--
 <?php
 
@@ -24,13 +22,13 @@
 test_time_fall_type3_dt_type2_redodt: ADD: 2010-11-07 00:10:20 EDT + P+0Y0M0DT1H2M13S = **2010-11-07 01:12:33 EDT**
 test_time_fall_type3_dt_type2_redost: ADD: 2010-11-07 00:10:20 EDT + P+0Y0M0DT2H4M24S = **2010-11-07 01:14:44 EST**
 test_time_fall_type3_dt_type2_st: ADD: 2010-11-07 00:10:20 EDT + P+0Y0M0DT4H6M35S = **2010-11-07 03:16:55 EST**
-test_time_fall_type3_dt_type2_post: ADD: 2010-11-07 00:10:20 EDT + P+0Y0M1DT20H49M39S = **2010-11-08 19:59:59 EST**
+test_time_fall_type3_dt_type2_post: ADD: 2010-11-07 00:10:20 EDT + P+0Y0M1DT20H49M39S = **2010-11-08 20:59:59 EST**
 test_time_fall_type3_redodt_type2_prev: ADD: 2010-11-07 01:12:33 EDT + P-0Y0M0DT6H34M5S = **2010-11-06 18:38:28 EDT**
 test_time_fall_type3_redodt_type2_dt: ADD: 2010-11-07 01:12:33 EDT + P-0Y0M0DT1H2M13S = **2010-11-07 00:10:20 EDT**
 test_time_fall_type3_redodt_type2_redodt: ADD: 2010-11-07 01:12:33 EDT + P+0Y0M0DT0H3M2S = **2010-11-07 01:15:35 EDT**
 test_time_fall_type3_redodt_type2_redost: ADD: 2010-11-07 01:12:33 EDT + P+0Y0M0DT1H2M11S = **2010-11-07 01:14:44 EST**
 test_time_fall_type3_redodt_type2_st: ADD: 2010-11-07 01:12:33 EDT + P+0Y0M0DT3H4M22S = **2010-11-07 03:16:55 EST**
-test_time_fall_type3_redodt_type2_post: ADD: 2010-11-07 01:12:33 EDT + P+0Y0M1DT19H47M26S = **2010-11-08 19:59:59 EST**
+test_time_fall_type3_redodt_type2_post: ADD: 2010-11-07 01:12:33 EDT + P+0Y0M1DT19H47M26S = **2010-11-08 20:59:59 EST**
 test_time_fall_type3_redost_type2_prev: ADD: 2010-11-07 01:14:44 EST + P-0Y0M0DT7H36M16S = **2010-11-06 18:38:28 EDT**
 test_time_fall_type3_redost_type2_dt: ADD: 2010-11-07 01:14:44 EST + P-0Y0M0DT2H4M24S = **2010-11-07 00:10:20 EDT**
 test_time_fall_type3_redost_type2_redodt: ADD: 2010-11-07 01:14:44 EST + P-0Y0M0DT1H2M11S = **2010-11-07 01:12:33 EDT**

php-8.1.13.tar.xz/ext/date/tests/DateTime_add-fall-type3-type3.phpt -> php-8.1.21.tar.xz/ext/date/tests/DateTime_add-fall-type3-type3.phpt Changed

@@ -2,8 +2,6 @@
 DateTime::add() -- fall type3 type3
 --CREDITS--
 Daniel Convissor <danielc@php.net>
---XFAIL--
-Various bugs exist
 --FILE--
 <?php
 
@@ -24,13 +22,13 @@
 test_time_fall_type3_dt_type3_redodt: ADD: 2010-11-07 00:10:20 EDT + P+0Y0M0DT1H2M13S = **2010-11-07 01:12:33 EDT**
 test_time_fall_type3_dt_type3_redost: ADD: 2010-11-07 00:10:20 EDT + P+0Y0M0DT2H4M24S = **2010-11-07 01:14:44 EST**
 test_time_fall_type3_dt_type3_st: ADD: 2010-11-07 00:10:20 EDT + P+0Y0M0DT4H6M35S = **2010-11-07 03:16:55 EST**
-test_time_fall_type3_dt_type3_post: ADD: 2010-11-07 00:10:20 EDT + P+0Y0M1DT20H49M39S = **2010-11-08 19:59:59 EST**
+test_time_fall_type3_dt_type3_post: ADD: 2010-11-07 00:10:20 EDT + P+0Y0M1DT20H49M39S = **2010-11-08 20:59:59 EST**
 test_time_fall_type3_redodt_type3_prev: ADD: 2010-11-07 01:12:33 EDT + P-0Y0M0DT6H34M5S = **2010-11-06 18:38:28 EDT**
 test_time_fall_type3_redodt_type3_dt: ADD: 2010-11-07 01:12:33 EDT + P-0Y0M0DT1H2M13S = **2010-11-07 00:10:20 EDT**
 test_time_fall_type3_redodt_type3_redodt: ADD: 2010-11-07 01:12:33 EDT + P+0Y0M0DT0H3M2S = **2010-11-07 01:15:35 EDT**
 test_time_fall_type3_redodt_type3_redost: ADD: 2010-11-07 01:12:33 EDT + P+0Y0M0DT1H2M11S = **2010-11-07 01:14:44 EST**
 test_time_fall_type3_redodt_type3_st: ADD: 2010-11-07 01:12:33 EDT + P+0Y0M0DT3H4M22S = **2010-11-07 03:16:55 EST**
-test_time_fall_type3_redodt_type3_post: ADD: 2010-11-07 01:12:33 EDT + P+0Y0M1DT19H47M26S = **2010-11-08 19:59:59 EST**
+test_time_fall_type3_redodt_type3_post: ADD: 2010-11-07 01:12:33 EDT + P+0Y0M1DT19H47M26S = **2010-11-08 20:59:59 EST**
 test_time_fall_type3_redost_type3_prev: ADD: 2010-11-07 01:14:44 EST + P-0Y0M0DT7H36M16S = **2010-11-06 18:38:28 EDT**
 test_time_fall_type3_redost_type3_dt: ADD: 2010-11-07 01:14:44 EST + P-0Y0M0DT2H4M24S = **2010-11-07 00:10:20 EDT**
 test_time_fall_type3_redost_type3_redodt: ADD: 2010-11-07 01:14:44 EST + P-0Y0M0DT1H2M11S = **2010-11-07 01:12:33 EDT**

php-8.1.13.tar.xz/ext/date/tests/DateTime_add-spring-type2-type3.phpt -> php-8.1.21.tar.xz/ext/date/tests/DateTime_add-spring-type2-type3.phpt Changed

@@ -2,8 +2,6 @@
 DateTime::add() -- spring type2 type3
 --CREDITS--
 Daniel Convissor <danielc@php.net>
---XFAIL--
-Various bugs exist
 --FILE--
 <?php
 
@@ -15,19 +13,19 @@
 --EXPECT--
 test_time_spring_type2_prev_type3_prev: ADD: 2010-02-11 02:18:48 EST + P+0Y1M2DT16H19M40S = **2010-03-13 18:38:28 EST**
 test_time_spring_type2_prev_type3_st: ADD: 2010-03-13 18:38:28 EST + P+0Y0M0DT5H31M52S = **2010-03-14 00:10:20 EST**
-test_time_spring_type2_prev_type3_dt: ADD: 2010-03-13 18:38:28 EST + P+0Y0M0DT7H38M27S = **2010-03-14 03:16:55 EDT**
-test_time_spring_type2_prev_type3_post: ADD: 2010-03-13 18:38:28 EST + P+0Y0M2DT1H21M31S = **2010-03-15 19:59:59 EDT**
+test_time_spring_type2_prev_type3_dt: ADD: 2010-03-13 18:38:28 EST + P+0Y0M0DT7H38M27S = **2010-03-14 02:16:55 EST**
+test_time_spring_type2_prev_type3_post: ADD: 2010-03-13 18:38:28 EST + P+0Y0M2DT1H21M31S = **2010-03-15 19:59:59 EST**
 test_time_spring_type2_st_type3_prev: ADD: 2010-03-14 00:10:20 EST + P-0Y0M0DT5H31M52S = **2010-03-13 18:38:28 EST**
 test_time_spring_type2_st_type3_st: ADD: 2010-03-14 00:10:20 EST + P+0Y0M0DT0H5M15S = **2010-03-14 00:15:35 EST**
-test_time_spring_type2_st_type3_dt: ADD: 2010-03-14 00:10:20 EST + P+0Y0M0DT2H6M35S = **2010-03-14 03:16:55 EDT**
-test_time_spring_type2_st_type3_post: ADD: 2010-03-14 00:10:20 EST + P+0Y0M1DT18H49M39S = **2010-03-15 19:59:59 EDT**
-test_time_spring_type2_dt_type3_prev: ADD: 2010-03-14 03:16:55 EDT + P-0Y0M0DT7H38M27S = **2010-03-13 18:38:28 EST**
-test_time_spring_type2_dt_type3_st: ADD: 2010-03-14 03:16:55 EDT + P-0Y0M0DT2H6M35S = **2010-03-14 00:10:20 EST**
+test_time_spring_type2_st_type3_dt: ADD: 2010-03-14 00:10:20 EST + P+0Y0M0DT2H6M35S = **2010-03-14 02:16:55 EST**
+test_time_spring_type2_st_type3_post: ADD: 2010-03-14 00:10:20 EST + P+0Y0M1DT18H49M39S = **2010-03-15 18:59:59 EST**
+test_time_spring_type2_dt_type3_prev: ADD: 2010-03-14 03:16:55 EDT + P-0Y0M0DT7H38M27S = **2010-03-13 19:38:28 EDT**
+test_time_spring_type2_dt_type3_st: ADD: 2010-03-14 03:16:55 EDT + P-0Y0M0DT2H6M35S = **2010-03-14 01:10:20 EDT**
 test_time_spring_type2_dt_type3_dt: ADD: 2010-03-14 03:16:55 EDT + P+0Y0M0DT2H3M1S = **2010-03-14 05:19:56 EDT**
 test_time_spring_type2_dt_type3_post: ADD: 2010-03-14 03:16:55 EDT + P+0Y0M1DT16H43M4S = **2010-03-15 19:59:59 EDT**
-test_time_spring_type2_post_type3_prev: ADD: 2010-03-15 19:59:59 EDT + P-0Y0M2DT1H21M31S = **2010-03-13 18:38:28 EST**
-test_time_spring_type2_post_type3_st: ADD: 2010-03-15 19:59:59 EDT + P-0Y0M1DT18H49M39S = **2010-03-14 00:10:20 EST**
+test_time_spring_type2_post_type3_prev: ADD: 2010-03-15 19:59:59 EDT + P-0Y0M2DT1H21M31S = **2010-03-13 18:38:28 EDT**
+test_time_spring_type2_post_type3_st: ADD: 2010-03-15 19:59:59 EDT + P-0Y0M1DT18H49M39S = **2010-03-14 01:10:20 EDT**
 test_time_spring_type2_post_type3_dt: ADD: 2010-03-15 19:59:59 EDT + P-0Y0M1DT16H43M4S = **2010-03-14 03:16:55 EDT**
 test_time_spring_type2_post_type3_post: ADD: 2010-03-15 18:57:55 EDT + P+0Y0M0DT1H2M4S = **2010-03-15 19:59:59 EDT**
-test_time_spring_type2_stsec_type3_dtsec: ADD: 2010-03-13 01:59:59 EST + P+0Y0M0DT0H0M1S = **2010-03-15 03:00:00 EDT**
-test_time_spring_type2_dtsec_type3_stsec: ADD: 2010-03-15 03:00:00 EDT + P-0Y0M0DT0H0M1S = **2010-03-15 01:59:59 EST**
+test_time_spring_type2_stsec_type3_dtsec: ADD: 2010-03-14 01:59:59 EST + P+0Y0M0DT0H0M1S = **2010-03-14 02:00:00 EST**
+test_time_spring_type2_dtsec_type3_stsec: ADD: 2010-03-14 03:00:00 EDT + P-0Y0M0DT0H0M1S = **2010-03-14 02:59:59 EDT**

php-8.1.13.tar.xz/ext/date/tests/DateTime_add-spring-type3-type2.phpt -> php-8.1.21.tar.xz/ext/date/tests/DateTime_add-spring-type3-type2.phpt Changed

@@ -2,8 +2,6 @@
 DateTime::add() -- spring type3 type2
 --CREDITS--
 Daniel Convissor <danielc@php.net>
---XFAIL--
-Various bugs exist
 --FILE--
 <?php
 
@@ -20,7 +18,7 @@
 test_time_spring_type3_st_type2_prev: ADD: 2010-03-14 00:10:20 EST + P-0Y0M0DT5H31M52S = **2010-03-13 18:38:28 EST**
 test_time_spring_type3_st_type2_st: ADD: 2010-03-14 00:10:20 EST + P+0Y0M0DT0H5M15S = **2010-03-14 00:15:35 EST**
 test_time_spring_type3_st_type2_dt: ADD: 2010-03-14 00:10:20 EST + P+0Y0M0DT2H6M35S = **2010-03-14 03:16:55 EDT**
-test_time_spring_type3_st_type2_post: ADD: 2010-03-14 00:10:20 EST + P+0Y0M1DT18H49M39S = **2010-03-15 19:59:59 EDT**
+test_time_spring_type3_st_type2_post: ADD: 2010-03-14 00:10:20 EST + P+0Y0M1DT18H49M39S = **2010-03-15 18:59:59 EDT**
 test_time_spring_type3_dt_type2_prev: ADD: 2010-03-14 03:16:55 EDT + P-0Y0M0DT7H38M27S = **2010-03-13 18:38:28 EST**
 test_time_spring_type3_dt_type2_st: ADD: 2010-03-14 03:16:55 EDT + P-0Y0M0DT2H6M35S = **2010-03-14 00:10:20 EST**
 test_time_spring_type3_dt_type2_dt: ADD: 2010-03-14 03:16:55 EDT + P+0Y0M0DT2H3M1S = **2010-03-14 05:19:56 EDT**
@@ -29,5 +27,5 @@
 test_time_spring_type3_post_type2_st: ADD: 2010-03-15 19:59:59 EDT + P-0Y0M1DT18H49M39S = **2010-03-14 00:10:20 EST**
 test_time_spring_type3_post_type2_dt: ADD: 2010-03-15 19:59:59 EDT + P-0Y0M1DT16H43M4S = **2010-03-14 03:16:55 EDT**
 test_time_spring_type3_post_type2_post: ADD: 2010-03-15 18:57:55 EDT + P+0Y0M0DT1H2M4S = **2010-03-15 19:59:59 EDT**
-test_time_spring_type3_stsec_type2_dtsec: ADD: 2010-03-13 01:59:59 EST + P+0Y0M0DT0H0M1S = **2010-03-15 03:00:00 EDT**
-test_time_spring_type3_dtsec_type2_stsec: ADD: 2010-03-15 03:00:00 EDT + P-0Y0M0DT0H0M1S = **2010-03-15 01:59:59 EST**
+test_time_spring_type3_stsec_type2_dtsec: ADD: 2010-03-14 01:59:59 EST + P+0Y0M0DT0H0M1S = **2010-03-14 03:00:00 EDT**
+test_time_spring_type3_dtsec_type2_stsec: ADD: 2010-03-14 03:00:00 EDT + P-0Y0M0DT0H0M1S = **2010-03-14 01:59:59 EST**

php-8.1.13.tar.xz/ext/date/tests/DateTime_add-spring-type3-type3.phpt -> php-8.1.21.tar.xz/ext/date/tests/DateTime_add-spring-type3-type3.phpt Changed

@@ -2,8 +2,6 @@
 DateTime::add() -- spring type3 type3
 --CREDITS--
 Daniel Convissor <danielc@php.net>
---XFAIL--
-Various bugs exist
 --FILE--
 <?php
 
@@ -20,7 +18,7 @@
 test_time_spring_type3_st_type3_prev: ADD: 2010-03-14 00:10:20 EST + P-0Y0M0DT5H31M52S = **2010-03-13 18:38:28 EST**
 test_time_spring_type3_st_type3_st: ADD: 2010-03-14 00:10:20 EST + P+0Y0M0DT0H5M15S = **2010-03-14 00:15:35 EST**
 test_time_spring_type3_st_type3_dt: ADD: 2010-03-14 00:10:20 EST + P+0Y0M0DT2H6M35S = **2010-03-14 03:16:55 EDT**
-test_time_spring_type3_st_type3_post: ADD: 2010-03-14 00:10:20 EST + P+0Y0M1DT18H49M39S = **2010-03-15 19:59:59 EDT**
+test_time_spring_type3_st_type3_post: ADD: 2010-03-14 00:10:20 EST + P+0Y0M1DT18H49M39S = **2010-03-15 18:59:59 EDT**
 test_time_spring_type3_dt_type3_prev: ADD: 2010-03-14 03:16:55 EDT + P-0Y0M0DT7H38M27S = **2010-03-13 18:38:28 EST**
 test_time_spring_type3_dt_type3_st: ADD: 2010-03-14 03:16:55 EDT + P-0Y0M0DT2H6M35S = **2010-03-14 00:10:20 EST**
 test_time_spring_type3_dt_type3_dt: ADD: 2010-03-14 03:16:55 EDT + P+0Y0M0DT2H3M1S = **2010-03-14 05:19:56 EDT**
@@ -29,5 +27,5 @@
 test_time_spring_type3_post_type3_st: ADD: 2010-03-15 19:59:59 EDT + P-0Y0M1DT18H49M39S = **2010-03-14 00:10:20 EST**
 test_time_spring_type3_post_type3_dt: ADD: 2010-03-15 19:59:59 EDT + P-0Y0M1DT16H43M4S = **2010-03-14 03:16:55 EDT**
 test_time_spring_type3_post_type3_post: ADD: 2010-03-15 18:57:55 EDT + P+0Y0M0DT1H2M4S = **2010-03-15 19:59:59 EDT**
-test_time_spring_type3_stsec_type3_dtsec: ADD: 2010-03-13 01:59:59 EST + P+0Y0M0DT0H0M1S = **2010-03-15 03:00:00 EDT**
-test_time_spring_type3_dtsec_type3_stsec: ADD: 2010-03-15 03:00:00 EDT + P-0Y0M0DT0H0M1S = **2010-03-15 01:59:59 EST**
+test_time_spring_type3_stsec_type3_dtsec: ADD: 2010-03-14 01:59:59 EST + P+0Y0M0DT0H0M1S = **2010-03-14 03:00:00 EDT**
+test_time_spring_type3_dtsec_type3_stsec: ADD: 2010-03-14 03:00:00 EDT + P-0Y0M0DT0H0M1S = **2010-03-14 01:59:59 EST**

php-8.1.13.tar.xz/ext/date/tests/DateTime_diff-fall-type2-type3.phpt -> php-8.1.21.tar.xz/ext/date/tests/DateTime_diff-fall-type2-type3.phpt Changed

@@ -2,8 +2,6 @@
 DateTime::diff() -- fall type2 type3
 --CREDITS--
 Daniel Convissor <danielc@php.net>
---XFAIL--
-Various bugs exist
 --FILE--
 <?php
 
@@ -18,7 +16,7 @@
 test_time_fall_type2_prev_type3_redodt: DIFF: 2010-11-07 01:12:33 EDT - 2010-11-06 18:38:28 EDT = **P+0Y0M0DT6H34M5S**
 test_time_fall_type2_prev_type3_redost: DIFF: 2010-11-07 01:14:44 EST - 2010-11-06 18:38:28 EDT = **P+0Y0M0DT7H36M16S**
 test_time_fall_type2_prev_type3_st: DIFF: 2010-11-07 03:16:55 EST - 2010-11-06 18:38:28 EDT = **P+0Y0M0DT9H38M27S**
-test_time_fall_type2_prev_type3_post: DIFF: 2010-11-08 19:59:59 EST - 2010-11-06 18:38:28 EDT = **P+0Y0M2DT1H21M31S**
+test_time_fall_type2_prev_type3_post: DIFF: 2010-11-08 19:59:59 EST - 2010-11-06 18:38:28 EDT = **P+0Y0M2DT2H21M31S**
 test_time_fall_type2_dt_type3_prev: DIFF: 2010-11-06 18:38:28 EDT - 2010-11-07 00:10:20 EDT = **P-0Y0M0DT5H31M52S**
 test_time_fall_type2_dt_type3_dt: DIFF: 2010-11-07 00:15:35 EDT - 2010-11-07 00:10:20 EDT = **P+0Y0M0DT0H5M15S**
 test_time_fall_type2_dt_type3_redodt: DIFF: 2010-11-07 01:12:33 EDT - 2010-11-07 00:10:20 EDT = **P+0Y0M0DT1H2M13S**
@@ -43,7 +41,7 @@
 test_time_fall_type2_st_type3_redost: DIFF: 2010-11-07 01:14:44 EST - 2010-11-07 03:16:55 EST = **P-0Y0M0DT2H2M11S**
 test_time_fall_type2_st_type3_st: DIFF: 2010-11-07 05:19:56 EST - 2010-11-07 03:16:55 EST = **P+0Y0M0DT2H3M1S**
 test_time_fall_type2_st_type3_post: DIFF: 2010-11-08 19:59:59 EST - 2010-11-07 03:16:55 EST = **P+0Y0M1DT16H43M4S**
-test_time_fall_type2_post_type3_prev: DIFF: 2010-11-06 18:38:28 EDT - 2010-11-08 19:59:59 EST = **P-0Y0M2DT1H21M31S**
+test_time_fall_type2_post_type3_prev: DIFF: 2010-11-06 18:38:28 EDT - 2010-11-08 19:59:59 EST = **P-0Y0M2DT2H21M31S**
 test_time_fall_type2_post_type3_dt: DIFF: 2010-11-07 00:10:20 EDT - 2010-11-08 19:59:59 EST = **P-0Y0M1DT20H49M39S**
 test_time_fall_type2_post_type3_redodt: DIFF: 2010-11-07 01:12:33 EDT - 2010-11-08 19:59:59 EST = **P-0Y0M1DT19H47M26S**
 test_time_fall_type2_post_type3_redost: DIFF: 2010-11-07 01:14:44 EST - 2010-11-08 19:59:59 EST = **P-0Y0M1DT18H45M15S**

php-8.1.13.tar.xz/ext/date/tests/DateTime_diff-fall-type3-type2.phpt -> php-8.1.21.tar.xz/ext/date/tests/DateTime_diff-fall-type3-type2.phpt Changed

@@ -2,8 +2,6 @@
 DateTime::diff() -- fall type3 type2
 --CREDITS--
 Daniel Convissor <danielc@php.net>
---XFAIL--
-Various bugs exist
 --FILE--
 <?php
 
@@ -18,7 +16,7 @@
 test_time_fall_type3_prev_type2_redodt: DIFF: 2010-11-07 01:12:33 EDT - 2010-11-06 18:38:28 EDT = **P+0Y0M0DT6H34M5S**
 test_time_fall_type3_prev_type2_redost: DIFF: 2010-11-07 01:14:44 EST - 2010-11-06 18:38:28 EDT = **P+0Y0M0DT7H36M16S**
 test_time_fall_type3_prev_type2_st: DIFF: 2010-11-07 03:16:55 EST - 2010-11-06 18:38:28 EDT = **P+0Y0M0DT9H38M27S**
-test_time_fall_type3_prev_type2_post: DIFF: 2010-11-08 19:59:59 EST - 2010-11-06 18:38:28 EDT = **P+0Y0M2DT1H21M31S**
+test_time_fall_type3_prev_type2_post: DIFF: 2010-11-08 19:59:59 EST - 2010-11-06 18:38:28 EDT = **P+0Y0M2DT2H21M31S**
 test_time_fall_type3_dt_type2_prev: DIFF: 2010-11-06 18:38:28 EDT - 2010-11-07 00:10:20 EDT = **P-0Y0M0DT5H31M52S**
 test_time_fall_type3_dt_type2_dt: DIFF: 2010-11-07 00:15:35 EDT - 2010-11-07 00:10:20 EDT = **P+0Y0M0DT0H5M15S**
 test_time_fall_type3_dt_type2_redodt: DIFF: 2010-11-07 01:12:33 EDT - 2010-11-07 00:10:20 EDT = **P+0Y0M0DT1H2M13S**
@@ -43,7 +41,7 @@
 test_time_fall_type3_st_type2_redost: DIFF: 2010-11-07 01:14:44 EST - 2010-11-07 03:16:55 EST = **P-0Y0M0DT2H2M11S**
 test_time_fall_type3_st_type2_st: DIFF: 2010-11-07 05:19:56 EST - 2010-11-07 03:16:55 EST = **P+0Y0M0DT2H3M1S**
 test_time_fall_type3_st_type2_post: DIFF: 2010-11-08 19:59:59 EST - 2010-11-07 03:16:55 EST = **P+0Y0M1DT16H43M4S**
-test_time_fall_type3_post_type2_prev: DIFF: 2010-11-06 18:38:28 EDT - 2010-11-08 19:59:59 EST = **P-0Y0M2DT1H21M31S**
+test_time_fall_type3_post_type2_prev: DIFF: 2010-11-06 18:38:28 EDT - 2010-11-08 19:59:59 EST = **P-0Y0M2DT2H21M31S**
 test_time_fall_type3_post_type2_dt: DIFF: 2010-11-07 00:10:20 EDT - 2010-11-08 19:59:59 EST = **P-0Y0M1DT20H49M39S**
 test_time_fall_type3_post_type2_redodt: DIFF: 2010-11-07 01:12:33 EDT - 2010-11-08 19:59:59 EST = **P-0Y0M1DT19H47M26S**
 test_time_fall_type3_post_type2_redost: DIFF: 2010-11-07 01:14:44 EST - 2010-11-08 19:59:59 EST = **P-0Y0M1DT18H45M15S**

php-8.1.13.tar.xz/ext/date/tests/DateTime_diff-fall-type3-type3.phpt -> php-8.1.21.tar.xz/ext/date/tests/DateTime_diff-fall-type3-type3.phpt Changed

@@ -24,7 +24,7 @@
 test_time_fall_type3_dt_type3_redodt: DIFF: 2010-11-07 01:12:33 EDT - 2010-11-07 00:10:20 EDT = **P+0Y0M0DT1H2M13S**
 test_time_fall_type3_dt_type3_redost: DIFF: 2010-11-07 01:14:44 EST - 2010-11-07 00:10:20 EDT = **P+0Y0M0DT2H4M24S**
 test_time_fall_type3_dt_type3_st: DIFF: 2010-11-07 03:16:55 EST - 2010-11-07 00:10:20 EDT = **P+0Y0M0DT4H6M35S**
-test_time_fall_type3_dt_type3_post: DIFF: 2010-11-08 19:59:59 EST - 2010-11-07 00:10:20 EDT = **P+0Y0M1DT20H49M39S**
+test_time_fall_type3_dt_type3_post: DIFF: 2010-11-08 19:59:59 EST - 2010-11-07 00:10:20 EDT = **P+0Y0M1DT19H49M39S**
 test_time_fall_type3_redodt_type3_prev: DIFF: 2010-11-06 18:38:28 EDT - 2010-11-07 01:12:33 EDT = **P-0Y0M0DT6H34M5S**
 test_time_fall_type3_redodt_type3_dt: DIFF: 2010-11-07 00:10:20 EDT - 2010-11-07 01:12:33 EDT = **P-0Y0M0DT1H2M13S**
 test_time_fall_type3_redodt_type3_redodt: DIFF: 2010-11-07 01:15:35 EDT - 2010-11-07 01:12:33 EDT = **P+0Y0M0DT0H3M2S**
@@ -44,7 +44,7 @@
 test_time_fall_type3_st_type3_st: DIFF: 2010-11-07 05:19:56 EST - 2010-11-07 03:16:55 EST = **P+0Y0M0DT2H3M1S**
 test_time_fall_type3_st_type3_post: DIFF: 2010-11-08 19:59:59 EST - 2010-11-07 03:16:55 EST = **P+0Y0M1DT16H43M4S**
 test_time_fall_type3_post_type3_prev: DIFF: 2010-11-06 18:38:28 EDT - 2010-11-08 19:59:59 EST = **P-0Y0M2DT1H21M31S**
-test_time_fall_type3_post_type3_dt: DIFF: 2010-11-07 00:10:20 EDT - 2010-11-08 19:59:59 EST = **P-0Y0M1DT20H49M39S**
+test_time_fall_type3_post_type3_dt: DIFF: 2010-11-07 00:10:20 EDT - 2010-11-08 19:59:59 EST = **P-0Y0M1DT19H49M39S**
 test_time_fall_type3_post_type3_redodt: DIFF: 2010-11-07 01:12:33 EDT - 2010-11-08 19:59:59 EST = **P-0Y0M1DT19H47M26S**
 test_time_fall_type3_post_type3_redost: DIFF: 2010-11-07 01:14:44 EST - 2010-11-08 19:59:59 EST = **P-0Y0M1DT18H45M15S**
 test_time_fall_type3_post_type3_st: DIFF: 2010-11-07 03:16:55 EST - 2010-11-08 19:59:59 EST = **P-0Y0M1DT16H43M4S**

php-8.1.13.tar.xz/ext/date/tests/DateTime_diff-spring-type2-type3.phpt -> php-8.1.21.tar.xz/ext/date/tests/DateTime_diff-spring-type2-type3.phpt Changed

@@ -2,8 +2,6 @@
 DateTime::diff() -- spring type2 type3
 --CREDITS--
 Daniel Convissor <danielc@php.net>
---XFAIL--
-Various bugs exist
 --FILE--
 <?php
 
@@ -16,7 +14,7 @@
 test_time_spring_type2_prev_type3_prev: DIFF: 2010-03-13 18:38:28 EST - 2010-02-11 02:18:48 EST = **P+0Y1M2DT16H19M40S**
 test_time_spring_type2_prev_type3_st: DIFF: 2010-03-14 00:10:20 EST - 2010-03-13 18:38:28 EST = **P+0Y0M0DT5H31M52S**
 test_time_spring_type2_prev_type3_dt: DIFF: 2010-03-14 03:16:55 EDT - 2010-03-13 18:38:28 EST = **P+0Y0M0DT7H38M27S**
-test_time_spring_type2_prev_type3_post: DIFF: 2010-03-15 19:59:59 EDT - 2010-03-13 18:38:28 EST = **P+0Y0M2DT1H21M31S**
+test_time_spring_type2_prev_type3_post: DIFF: 2010-03-15 19:59:59 EDT - 2010-03-13 18:38:28 EST = **P+0Y0M2DT0H21M31S**
 test_time_spring_type2_st_type3_prev: DIFF: 2010-03-13 18:38:28 EST - 2010-03-14 00:10:20 EST = **P-0Y0M0DT5H31M52S**
 test_time_spring_type2_st_type3_st: DIFF: 2010-03-14 00:15:35 EST - 2010-03-14 00:10:20 EST = **P+0Y0M0DT0H5M15S**
 test_time_spring_type2_st_type3_dt: DIFF: 2010-03-14 03:16:55 EDT - 2010-03-14 00:10:20 EST = **P+0Y0M0DT2H6M35S**
@@ -25,9 +23,9 @@
 test_time_spring_type2_dt_type3_st: DIFF: 2010-03-14 00:10:20 EST - 2010-03-14 03:16:55 EDT = **P-0Y0M0DT2H6M35S**
 test_time_spring_type2_dt_type3_dt: DIFF: 2010-03-14 05:19:56 EDT - 2010-03-14 03:16:55 EDT = **P+0Y0M0DT2H3M1S**
 test_time_spring_type2_dt_type3_post: DIFF: 2010-03-15 19:59:59 EDT - 2010-03-14 03:16:55 EDT = **P+0Y0M1DT16H43M4S**
-test_time_spring_type2_post_type3_prev: DIFF: 2010-03-13 18:38:28 EST - 2010-03-15 19:59:59 EDT = **P-0Y0M2DT1H21M31S**
+test_time_spring_type2_post_type3_prev: DIFF: 2010-03-13 18:38:28 EST - 2010-03-15 19:59:59 EDT = **P-0Y0M2DT0H21M31S**
 test_time_spring_type2_post_type3_st: DIFF: 2010-03-14 00:10:20 EST - 2010-03-15 19:59:59 EDT = **P-0Y0M1DT18H49M39S**
 test_time_spring_type2_post_type3_dt: DIFF: 2010-03-14 03:16:55 EDT - 2010-03-15 19:59:59 EDT = **P-0Y0M1DT16H43M4S**
 test_time_spring_type2_post_type3_post: DIFF: 2010-03-15 19:59:59 EDT - 2010-03-15 18:57:55 EDT = **P+0Y0M0DT1H2M4S**
-test_time_spring_type2_stsec_type3_dtsec: DIFF: 2010-03-15 03:00:00 EDT - 2010-03-13 01:59:59 EST = **P+0Y0M0DT0H0M1S**
-test_time_spring_type2_dtsec_type3_stsec: DIFF: 2010-03-15 01:59:59 EST - 2010-03-15 03:00:00 EDT = **P-0Y0M0DT0H0M1S**
+test_time_spring_type2_stsec_type3_dtsec: DIFF: 2010-03-14 03:00:00 EDT - 2010-03-14 01:59:59 EST = **P+0Y0M0DT0H0M1S**
+test_time_spring_type2_dtsec_type3_stsec: DIFF: 2010-03-14 01:59:59 EST - 2010-03-14 03:00:00 EDT = **P-0Y0M0DT0H0M1S**

php-8.1.13.tar.xz/ext/date/tests/DateTime_diff-spring-type3-type2.phpt -> php-8.1.21.tar.xz/ext/date/tests/DateTime_diff-spring-type3-type2.phpt Changed

@@ -2,8 +2,6 @@
 DateTime::diff() -- spring type3 type2
 --CREDITS--
 Daniel Convissor <danielc@php.net>
---XFAIL--
-Various bugs exist
 --FILE--
 <?php
 
@@ -16,7 +14,7 @@
 test_time_spring_type3_prev_type2_prev: DIFF: 2010-03-13 18:38:28 EST - 2010-02-11 02:18:48 EST = **P+0Y1M2DT16H19M40S**
 test_time_spring_type3_prev_type2_st: DIFF: 2010-03-14 00:10:20 EST - 2010-03-13 18:38:28 EST = **P+0Y0M0DT5H31M52S**
 test_time_spring_type3_prev_type2_dt: DIFF: 2010-03-14 03:16:55 EDT - 2010-03-13 18:38:28 EST = **P+0Y0M0DT7H38M27S**
-test_time_spring_type3_prev_type2_post: DIFF: 2010-03-15 19:59:59 EDT - 2010-03-13 18:38:28 EST = **P+0Y0M2DT1H21M31S**
+test_time_spring_type3_prev_type2_post: DIFF: 2010-03-15 19:59:59 EDT - 2010-03-13 18:38:28 EST = **P+0Y0M2DT0H21M31S**
 test_time_spring_type3_st_type2_prev: DIFF: 2010-03-13 18:38:28 EST - 2010-03-14 00:10:20 EST = **P-0Y0M0DT5H31M52S**
 test_time_spring_type3_st_type2_st: DIFF: 2010-03-14 00:15:35 EST - 2010-03-14 00:10:20 EST = **P+0Y0M0DT0H5M15S**
 test_time_spring_type3_st_type2_dt: DIFF: 2010-03-14 03:16:55 EDT - 2010-03-14 00:10:20 EST = **P+0Y0M0DT2H6M35S**
@@ -25,9 +23,9 @@
 test_time_spring_type3_dt_type2_st: DIFF: 2010-03-14 00:10:20 EST - 2010-03-14 03:16:55 EDT = **P-0Y0M0DT2H6M35S**
 test_time_spring_type3_dt_type2_dt: DIFF: 2010-03-14 05:19:56 EDT - 2010-03-14 03:16:55 EDT = **P+0Y0M0DT2H3M1S**
 test_time_spring_type3_dt_type2_post: DIFF: 2010-03-15 19:59:59 EDT - 2010-03-14 03:16:55 EDT = **P+0Y0M1DT16H43M4S**
-test_time_spring_type3_post_type2_prev: DIFF: 2010-03-13 18:38:28 EST - 2010-03-15 19:59:59 EDT = **P-0Y0M2DT1H21M31S**
+test_time_spring_type3_post_type2_prev: DIFF: 2010-03-13 18:38:28 EST - 2010-03-15 19:59:59 EDT = **P-0Y0M2DT0H21M31S**
 test_time_spring_type3_post_type2_st: DIFF: 2010-03-14 00:10:20 EST - 2010-03-15 19:59:59 EDT = **P-0Y0M1DT18H49M39S**
 test_time_spring_type3_post_type2_dt: DIFF: 2010-03-14 03:16:55 EDT - 2010-03-15 19:59:59 EDT = **P-0Y0M1DT16H43M4S**
 test_time_spring_type3_post_type2_post: DIFF: 2010-03-15 19:59:59 EDT - 2010-03-15 18:57:55 EDT = **P+0Y0M0DT1H2M4S**
-test_time_spring_type3_stsec_type2_dtsec: DIFF: 2010-03-15 03:00:00 EDT - 2010-03-13 01:59:59 EST = **P+0Y0M0DT0H0M1S**
-test_time_spring_type3_dtsec_type2_stsec: DIFF: 2010-03-15 01:59:59 EST - 2010-03-15 03:00:00 EDT = **P-0Y0M0DT0H0M1S**
+test_time_spring_type3_stsec_type2_dtsec: DIFF: 2010-03-14 03:00:00 EDT - 2010-03-14 01:59:59 EST = **P+0Y0M0DT0H0M1S**
+test_time_spring_type3_dtsec_type2_stsec: DIFF: 2010-03-14 01:59:59 EST - 2010-03-14 03:00:00 EDT = **P-0Y0M0DT0H0M1S**

php-8.1.13.tar.xz/ext/date/tests/DateTime_diff-spring-type3-type3.phpt -> php-8.1.21.tar.xz/ext/date/tests/DateTime_diff-spring-type3-type3.phpt Changed

@@ -2,8 +2,6 @@
 DateTime::diff() -- spring type3 type3
 --CREDITS--
 Daniel Convissor <danielc@php.net>
---XFAIL--
-Various bugs exist
 --FILE--
 <?php
 
@@ -20,14 +18,14 @@
 test_time_spring_type3_st_type3_prev: DIFF: 2010-03-13 18:38:28 EST - 2010-03-14 00:10:20 EST = **P-0Y0M0DT5H31M52S**
 test_time_spring_type3_st_type3_st: DIFF: 2010-03-14 00:15:35 EST - 2010-03-14 00:10:20 EST = **P+0Y0M0DT0H5M15S**
 test_time_spring_type3_st_type3_dt: DIFF: 2010-03-14 03:16:55 EDT - 2010-03-14 00:10:20 EST = **P+0Y0M0DT2H6M35S**
-test_time_spring_type3_st_type3_post: DIFF: 2010-03-15 19:59:59 EDT - 2010-03-14 00:10:20 EST = **P+0Y0M1DT18H49M39S**
+test_time_spring_type3_st_type3_post: DIFF: 2010-03-15 19:59:59 EDT - 2010-03-14 00:10:20 EST = **P+0Y0M1DT19H49M39S**
 test_time_spring_type3_dt_type3_prev: DIFF: 2010-03-13 18:38:28 EST - 2010-03-14 03:16:55 EDT = **P-0Y0M0DT7H38M27S**
 test_time_spring_type3_dt_type3_st: DIFF: 2010-03-14 00:10:20 EST - 2010-03-14 03:16:55 EDT = **P-0Y0M0DT2H6M35S**
 test_time_spring_type3_dt_type3_dt: DIFF: 2010-03-14 05:19:56 EDT - 2010-03-14 03:16:55 EDT = **P+0Y0M0DT2H3M1S**
 test_time_spring_type3_dt_type3_post: DIFF: 2010-03-15 19:59:59 EDT - 2010-03-14 03:16:55 EDT = **P+0Y0M1DT16H43M4S**
 test_time_spring_type3_post_type3_prev: DIFF: 2010-03-13 18:38:28 EST - 2010-03-15 19:59:59 EDT = **P-0Y0M2DT1H21M31S**
-test_time_spring_type3_post_type3_st: DIFF: 2010-03-14 00:10:20 EST - 2010-03-15 19:59:59 EDT = **P-0Y0M1DT18H49M39S**
+test_time_spring_type3_post_type3_st: DIFF: 2010-03-14 00:10:20 EST - 2010-03-15 19:59:59 EDT = **P-0Y0M1DT19H49M39S**
 test_time_spring_type3_post_type3_dt: DIFF: 2010-03-14 03:16:55 EDT - 2010-03-15 19:59:59 EDT = **P-0Y0M1DT16H43M4S**
 test_time_spring_type3_post_type3_post: DIFF: 2010-03-15 19:59:59 EDT - 2010-03-15 18:57:55 EDT = **P+0Y0M0DT1H2M4S**
-test_time_spring_type3_stsec_type2_dtsec: DIFF: 2010-03-15 03:00:00 EDT - 2010-03-13 01:59:59 EST = **P+0Y0M0DT0H0M1S**
-test_time_spring_type3_dtsec_type2_stsec: DIFF: 2010-03-15 01:59:59 EST - 2010-03-15 03:00:00 EDT = **P-0Y0M0DT0H0M1S**
+test_time_spring_type3_stsec_type3_dtsec: DIFF: 2010-03-14 03:00:00 EDT - 2010-03-14 01:59:59 EST = **P+0Y0M0DT0H0M1S**
+test_time_spring_type3_dtsec_type3_stsec: DIFF: 2010-03-14 01:59:59 EST - 2010-03-14 03:00:00 EDT = **P-0Y0M0DT0H0M1S**

php-8.1.13.tar.xz/ext/date/tests/DateTime_sub-fall-type2-type3.phpt -> php-8.1.21.tar.xz/ext/date/tests/DateTime_sub-fall-type2-type3.phpt Changed

@@ -2,8 +2,6 @@
 DateTime::sub() -- fall type2 type3
 --CREDITS--
 Daniel Convissor <danielc@php.net>
---XFAIL--
-Various bugs exist
 --FILE--
 <?php
 
@@ -44,8 +42,8 @@
 test_time_fall_type2_st_type3_st: SUB: 2010-11-07 05:19:56 EST - P+0Y0M0DT2H3M1S = **2010-11-07 03:16:55 EST**
 test_time_fall_type2_st_type3_post: SUB: 2010-11-08 19:59:59 EST - P+0Y0M1DT16H43M4S = **2010-11-07 03:16:55 EST**
 test_time_fall_type2_post_type3_prev: SUB: 2010-11-06 18:38:28 EDT - P-0Y0M2DT1H21M31S = **2010-11-08 19:59:59 EST**
-test_time_fall_type2_post_type3_dt: SUB: 2010-11-07 00:10:20 EDT - P-0Y0M1DT20H49M39S = **2010-11-08 19:59:59 EST**
-test_time_fall_type2_post_type3_redodt: SUB: 2010-11-07 01:12:33 EDT - P-0Y0M1DT19H47M26S = **2010-11-08 19:59:59 EST**
+test_time_fall_type2_post_type3_dt: SUB: 2010-11-07 00:10:20 EDT - P-0Y0M1DT20H49M39S = **2010-11-08 20:59:59 EST**
+test_time_fall_type2_post_type3_redodt: SUB: 2010-11-07 01:12:33 EDT - P-0Y0M1DT19H47M26S = **2010-11-08 20:59:59 EST**
 test_time_fall_type2_post_type3_redost: SUB: 2010-11-07 01:14:44 EST - P-0Y0M1DT18H45M15S = **2010-11-08 19:59:59 EST**
 test_time_fall_type2_post_type3_st: SUB: 2010-11-07 03:16:55 EST - P-0Y0M1DT16H43M4S = **2010-11-08 19:59:59 EST**
 test_time_fall_type2_post_type3_post: SUB: 2010-11-08 19:59:59 EST - P+0Y0M0DT1H2M4S = **2010-11-08 18:57:55 EST**

php-8.1.13.tar.xz/ext/date/tests/DateTime_sub-fall-type3-type2.phpt -> php-8.1.21.tar.xz/ext/date/tests/DateTime_sub-fall-type3-type2.phpt Changed

@@ -2,8 +2,6 @@
 DateTime::sub() -- fall type3 type2
 --CREDITS--
 Daniel Convissor <danielc@php.net>
---XFAIL--
-Various bugs exist
 --FILE--
 <?php
 
@@ -17,37 +15,37 @@
 test_time_fall_type3_prev_type2_dt: SUB: 2010-11-07 00:10:20 EDT - P+0Y0M0DT5H31M52S = **2010-11-06 18:38:28 EDT**
 test_time_fall_type3_prev_type2_redodt: SUB: 2010-11-07 01:12:33 EDT - P+0Y0M0DT6H34M5S = **2010-11-06 18:38:28 EDT**
 test_time_fall_type3_prev_type2_redost: SUB: 2010-11-07 01:14:44 EST - P+0Y0M0DT7H36M16S = **2010-11-06 18:38:28 EDT**
-test_time_fall_type3_prev_type2_st: SUB: 2010-11-07 03:16:55 EST - P+0Y0M0DT9H38M27S = **2010-11-06 18:38:28 EDT**
-test_time_fall_type3_prev_type2_post: SUB: 2010-11-08 19:59:59 EST - P+0Y0M2DT1H21M31S = **2010-11-06 18:38:28 EDT**
+test_time_fall_type3_prev_type2_st: SUB: 2010-11-07 03:16:55 EST - P+0Y0M0DT9H38M27S = **2010-11-06 17:38:28 EST**
+test_time_fall_type3_prev_type2_post: SUB: 2010-11-08 19:59:59 EST - P+0Y0M2DT1H21M31S = **2010-11-06 18:38:28 EST**
 test_time_fall_type3_dt_type2_prev: SUB: 2010-11-06 18:38:28 EDT - P-0Y0M0DT5H31M52S = **2010-11-07 00:10:20 EDT**
 test_time_fall_type3_dt_type2_dt: SUB: 2010-11-07 00:15:35 EDT - P+0Y0M0DT0H5M15S = **2010-11-07 00:10:20 EDT**
 test_time_fall_type3_dt_type2_redodt: SUB: 2010-11-07 01:12:33 EDT - P+0Y0M0DT1H2M13S = **2010-11-07 00:10:20 EDT**
-test_time_fall_type3_dt_type2_redost: SUB: 2010-11-07 01:14:44 EST - P+0Y0M0DT2H4M24S = **2010-11-07 00:10:20 EDT**
-test_time_fall_type3_dt_type2_st: SUB: 2010-11-07 03:16:55 EST - P+0Y0M0DT4H6M35S = **2010-11-07 00:10:20 EDT**
-test_time_fall_type3_dt_type2_post: SUB: 2010-11-08 19:59:59 EST - P+0Y0M1DT20H49M39S = **2010-11-07 00:10:20 EDT**
+test_time_fall_type3_dt_type2_redost: SUB: 2010-11-07 01:14:44 EST - P+0Y0M0DT2H4M24S = **2010-11-06 23:10:20 EST**
+test_time_fall_type3_dt_type2_st: SUB: 2010-11-07 03:16:55 EST - P+0Y0M0DT4H6M35S = **2010-11-06 23:10:20 EST**
+test_time_fall_type3_dt_type2_post: SUB: 2010-11-08 19:59:59 EST - P+0Y0M1DT20H49M39S = **2010-11-06 23:10:20 EST**
 test_time_fall_type3_redodt_type2_prev: SUB: 2010-11-06 18:38:28 EDT - P-0Y0M0DT6H34M5S = **2010-11-07 01:12:33 EDT**
 test_time_fall_type3_redodt_type2_dt: SUB: 2010-11-07 00:10:20 EDT - P-0Y0M0DT1H2M13S = **2010-11-07 01:12:33 EDT**
 test_time_fall_type3_redodt_type2_redodt: SUB: 2010-11-07 01:15:35 EDT - P+0Y0M0DT0H3M2S = **2010-11-07 01:12:33 EDT**
-test_time_fall_type3_redodt_type2_redost: SUB: 2010-11-07 01:14:44 EST - P+0Y0M0DT1H2M11S = **2010-11-07 01:12:33 EDT**
-test_time_fall_type3_redodt_type2_st: SUB: 2010-11-07 03:16:55 EST - P+0Y0M0DT3H4M22S = **2010-11-07 01:12:33 EDT**
-test_time_fall_type3_redodt_type2_post: SUB: 2010-11-08 19:59:59 EST - P+0Y0M1DT19H47M26S = **2010-11-07 01:12:33 EDT**
-test_time_fall_type3_redost_type2_prev: SUB: 2010-11-06 18:38:28 EDT - P-0Y0M0DT7H36M16S = **2010-11-07 01:14:44 EST**
-test_time_fall_type3_redost_type2_dt: SUB: 2010-11-07 00:10:20 EDT - P-0Y0M0DT2H4M24S = **2010-11-07 01:14:44 EST**
-test_time_fall_type3_redost_type2_redodt: SUB: 2010-11-07 01:12:33 EDT - P-0Y0M0DT1H2M11S = **2010-11-07 01:14:44 EST**
+test_time_fall_type3_redodt_type2_redost: SUB: 2010-11-07 01:14:44 EST - P+0Y0M0DT1H2M11S = **2010-11-07 00:12:33 EST**
+test_time_fall_type3_redodt_type2_st: SUB: 2010-11-07 03:16:55 EST - P+0Y0M0DT3H4M22S = **2010-11-07 00:12:33 EST**
+test_time_fall_type3_redodt_type2_post: SUB: 2010-11-08 19:59:59 EST - P+0Y0M1DT19H47M26S = **2010-11-07 00:12:33 EST**
+test_time_fall_type3_redost_type2_prev: SUB: 2010-11-06 18:38:28 EDT - P-0Y0M0DT7H36M16S = **2010-11-07 02:14:44 EDT**
+test_time_fall_type3_redost_type2_dt: SUB: 2010-11-07 00:10:20 EDT - P-0Y0M0DT2H4M24S = **2010-11-07 02:14:44 EDT**
+test_time_fall_type3_redost_type2_redodt: SUB: 2010-11-07 01:12:33 EDT - P-0Y0M0DT1H2M11S = **2010-11-07 02:14:44 EDT**
 test_time_fall_type3_redost_type2_redost: SUB: 2010-11-07 01:16:54 EST - P+0Y0M0DT0H2M10S = **2010-11-07 01:14:44 EST**
 test_time_fall_type3_redost_type2_st: SUB: 2010-11-07 03:16:55 EST - P+0Y0M0DT2H2M11S = **2010-11-07 01:14:44 EST**
 test_time_fall_type3_redost_type2_post: SUB: 2010-11-08 19:59:59 EST - P+0Y0M1DT18H45M15S = **2010-11-07 01:14:44 EST**
-test_time_fall_type3_st_type2_prev: SUB: 2010-11-06 18:38:28 EDT - P-0Y0M0DT9H38M27S = **2010-11-07 03:16:55 EST**
-test_time_fall_type3_st_type2_dt: SUB: 2010-11-07 00:10:20 EDT - P-0Y0M0DT4H6M35S = **2010-11-07 03:16:55 EST**
-test_time_fall_type3_st_type2_redodt: SUB: 2010-11-07 01:12:33 EDT - P-0Y0M0DT3H4M22S = **2010-11-07 03:16:55 EST**
+test_time_fall_type3_st_type2_prev: SUB: 2010-11-06 18:38:28 EDT - P-0Y0M0DT9H38M27S = **2010-11-07 04:16:55 EDT**
+test_time_fall_type3_st_type2_dt: SUB: 2010-11-07 00:10:20 EDT - P-0Y0M0DT4H6M35S = **2010-11-07 04:16:55 EDT**
+test_time_fall_type3_st_type2_redodt: SUB: 2010-11-07 01:12:33 EDT - P-0Y0M0DT3H4M22S = **2010-11-07 04:16:55 EDT**
 test_time_fall_type3_st_type2_redost: SUB: 2010-11-07 01:14:44 EST - P-0Y0M0DT2H2M11S = **2010-11-07 03:16:55 EST**
 test_time_fall_type3_st_type2_st: SUB: 2010-11-07 05:19:56 EST - P+0Y0M0DT2H3M1S = **2010-11-07 03:16:55 EST**
 test_time_fall_type3_st_type2_post: SUB: 2010-11-08 19:59:59 EST - P+0Y0M1DT16H43M4S = **2010-11-07 03:16:55 EST**
-test_time_fall_type3_post_type2_prev: SUB: 2010-11-06 18:38:28 EDT - P-0Y0M2DT1H21M31S = **2010-11-08 19:59:59 EST**
-test_time_fall_type3_post_type2_dt: SUB: 2010-11-07 00:10:20 EDT - P-0Y0M1DT20H49M39S = **2010-11-08 19:59:59 EST**
-test_time_fall_type3_post_type2_redodt: SUB: 2010-11-07 01:12:33 EDT - P-0Y0M1DT19H47M26S = **2010-11-08 19:59:59 EST**
+test_time_fall_type3_post_type2_prev: SUB: 2010-11-06 18:38:28 EDT - P-0Y0M2DT1H21M31S = **2010-11-08 19:59:59 EDT**
+test_time_fall_type3_post_type2_dt: SUB: 2010-11-07 00:10:20 EDT - P-0Y0M1DT20H49M39S = **2010-11-08 20:59:59 EDT**
+test_time_fall_type3_post_type2_redodt: SUB: 2010-11-07 01:12:33 EDT - P-0Y0M1DT19H47M26S = **2010-11-08 20:59:59 EDT**
 test_time_fall_type3_post_type2_redost: SUB: 2010-11-07 01:14:44 EST - P-0Y0M1DT18H45M15S = **2010-11-08 19:59:59 EST**
 test_time_fall_type3_post_type2_st: SUB: 2010-11-07 03:16:55 EST - P-0Y0M1DT16H43M4S = **2010-11-08 19:59:59 EST**
 test_time_fall_type3_post_type2_post: SUB: 2010-11-08 19:59:59 EST - P+0Y0M0DT1H2M4S = **2010-11-08 18:57:55 EST**
-test_time_fall_type3_dtsec_type2_stsec: SUB: 2010-11-07 01:00:00 EST - P+0Y0M0DT0H0M1S = **2010-11-07 01:59:59 EDT**
-test_time_fall_type3_stsec_type2_dtsec: SUB: 2010-11-07 01:59:59 EDT - P-0Y0M0DT0H0M1S = **2010-11-07 01:00:00 EST**
+test_time_fall_type3_dtsec_type2_stsec: SUB: 2010-11-07 01:00:00 EST - P+0Y0M0DT0H0M1S = **2010-11-07 00:59:59 EST**
+test_time_fall_type3_stsec_type2_dtsec: SUB: 2010-11-07 01:59:59 EDT - P-0Y0M0DT0H0M1S = **2010-11-07 02:00:00 EDT**

php-8.1.13.tar.xz/ext/date/tests/DateTime_sub-fall-type3-type3.phpt -> php-8.1.21.tar.xz/ext/date/tests/DateTime_sub-fall-type3-type3.phpt Changed

@@ -2,8 +2,6 @@
 DateTime::sub() -- fall type3 type3
 --CREDITS--
 Daniel Convissor <danielc@php.net>
---XFAIL--
-Various bugs exist
 --FILE--
 <?php
 
@@ -44,8 +42,8 @@
 test_time_fall_type3_st_type3_st: SUB: 2010-11-07 05:19:56 EST - P+0Y0M0DT2H3M1S = **2010-11-07 03:16:55 EST**
 test_time_fall_type3_st_type3_post: SUB: 2010-11-08 19:59:59 EST - P+0Y0M1DT16H43M4S = **2010-11-07 03:16:55 EST**
 test_time_fall_type3_post_type3_prev: SUB: 2010-11-06 18:38:28 EDT - P-0Y0M2DT1H21M31S = **2010-11-08 19:59:59 EST**
-test_time_fall_type3_post_type3_dt: SUB: 2010-11-07 00:10:20 EDT - P-0Y0M1DT20H49M39S = **2010-11-08 19:59:59 EST**
-test_time_fall_type3_post_type3_redodt: SUB: 2010-11-07 01:12:33 EDT - P-0Y0M1DT19H47M26S = **2010-11-08 19:59:59 EST**
+test_time_fall_type3_post_type3_dt: SUB: 2010-11-07 00:10:20 EDT - P-0Y0M1DT20H49M39S = **2010-11-08 20:59:59 EST**
+test_time_fall_type3_post_type3_redodt: SUB: 2010-11-07 01:12:33 EDT - P-0Y0M1DT19H47M26S = **2010-11-08 20:59:59 EST**
 test_time_fall_type3_post_type3_redost: SUB: 2010-11-07 01:14:44 EST - P-0Y0M1DT18H45M15S = **2010-11-08 19:59:59 EST**
 test_time_fall_type3_post_type3_st: SUB: 2010-11-07 03:16:55 EST - P-0Y0M1DT16H43M4S = **2010-11-08 19:59:59 EST**
 test_time_fall_type3_post_type3_post: SUB: 2010-11-08 19:59:59 EST - P+0Y0M0DT1H2M4S = **2010-11-08 18:57:55 EST**

php-8.1.13.tar.xz/ext/date/tests/DateTime_sub-spring-type2-type3.phpt -> php-8.1.21.tar.xz/ext/date/tests/DateTime_sub-spring-type2-type3.phpt Changed

@@ -2,8 +2,6 @@
 DateTime::sub() -- spring type2 type3
 --CREDITS--
 Daniel Convissor <danielc@php.net>
---XFAIL--
-Various bugs exist
 --FILE--
 <?php
 
@@ -26,8 +24,8 @@
 test_time_spring_type2_dt_type3_dt: SUB: 2010-03-14 05:19:56 EDT - P+0Y0M0DT2H3M1S = **2010-03-14 03:16:55 EDT**
 test_time_spring_type2_dt_type3_post: SUB: 2010-03-15 19:59:59 EDT - P+0Y0M1DT16H43M4S = **2010-03-14 03:16:55 EDT**
 test_time_spring_type2_post_type3_prev: SUB: 2010-03-13 18:38:28 EST - P-0Y0M2DT1H21M31S = **2010-03-15 19:59:59 EDT**
-test_time_spring_type2_post_type3_st: SUB: 2010-03-14 00:10:20 EST - P-0Y0M1DT18H49M39S = **2010-03-15 19:59:59 EDT**
+test_time_spring_type2_post_type3_st: SUB: 2010-03-14 00:10:20 EST - P-0Y0M1DT18H49M39S = **2010-03-15 18:59:59 EDT**
 test_time_spring_type2_post_type3_dt: SUB: 2010-03-14 03:16:55 EDT - P-0Y0M1DT16H43M4S = **2010-03-15 19:59:59 EDT**
 test_time_spring_type2_post_type3_post: SUB: 2010-03-15 19:59:59 EDT - P+0Y0M0DT1H2M4S = **2010-03-15 18:57:55 EDT**
-test_time_spring_type2_stsec_type3_dtsec: SUB: 2010-03-15 03:00:00 EDT - P+0Y0M0DT0H0M1S = **2010-03-13 01:59:59 EST**
-test_time_spring_type2_dtsec_type3_stsec: SUB: 2010-03-15 01:59:59 EST - P-0Y0M0DT0H0M1S = **2010-03-15 03:00:00 EDT**
+test_time_spring_type2_stsec_type3_dtsec: SUB: 2010-03-14 03:00:00 EDT - P+0Y0M0DT0H0M1S = **2010-03-14 01:59:59 EST**
+test_time_spring_type2_dtsec_type3_stsec: SUB: 2010-03-14 01:59:59 EST - P-0Y0M0DT0H0M1S = **2010-03-14 03:00:00 EDT**

php-8.1.13.tar.xz/ext/date/tests/DateTime_sub-spring-type3-type2.phpt -> php-8.1.21.tar.xz/ext/date/tests/DateTime_sub-spring-type3-type2.phpt Changed

@@ -2,8 +2,6 @@
 DateTime::sub() -- spring type3 type2
 --CREDITS--
 Daniel Convissor <danielc@php.net>
---XFAIL--
-Various bugs exist
 --FILE--
 <?php
 
@@ -15,19 +13,19 @@
 --EXPECT--
 test_time_spring_type3_prev_type2_prev: SUB: 2010-03-13 18:38:28 EST - P+0Y1M2DT16H19M40S = **2010-02-11 02:18:48 EST**
 test_time_spring_type3_prev_type2_st: SUB: 2010-03-14 00:10:20 EST - P+0Y0M0DT5H31M52S = **2010-03-13 18:38:28 EST**
-test_time_spring_type3_prev_type2_dt: SUB: 2010-03-14 03:16:55 EDT - P+0Y0M0DT7H38M27S = **2010-03-13 18:38:28 EST**
-test_time_spring_type3_prev_type2_post: SUB: 2010-03-15 19:59:59 EDT - P+0Y0M2DT1H21M31S = **2010-03-13 18:38:28 EST**
+test_time_spring_type3_prev_type2_dt: SUB: 2010-03-14 03:16:55 EDT - P+0Y0M0DT7H38M27S = **2010-03-13 19:38:28 EDT**
+test_time_spring_type3_prev_type2_post: SUB: 2010-03-15 19:59:59 EDT - P+0Y0M2DT1H21M31S = **2010-03-13 18:38:28 EDT**
 test_time_spring_type3_st_type2_prev: SUB: 2010-03-13 18:38:28 EST - P-0Y0M0DT5H31M52S = **2010-03-14 00:10:20 EST**
 test_time_spring_type3_st_type2_st: SUB: 2010-03-14 00:15:35 EST - P+0Y0M0DT0H5M15S = **2010-03-14 00:10:20 EST**
-test_time_spring_type3_st_type2_dt: SUB: 2010-03-14 03:16:55 EDT - P+0Y0M0DT2H6M35S = **2010-03-14 00:10:20 EST**
-test_time_spring_type3_st_type2_post: SUB: 2010-03-15 19:59:59 EDT - P+0Y0M1DT18H49M39S = **2010-03-14 00:10:20 EST**
-test_time_spring_type3_dt_type2_prev: SUB: 2010-03-13 18:38:28 EST - P-0Y0M0DT7H38M27S = **2010-03-14 03:16:55 EDT**
-test_time_spring_type3_dt_type2_st: SUB: 2010-03-14 00:10:20 EST - P-0Y0M0DT2H6M35S = **2010-03-14 03:16:55 EDT**
+test_time_spring_type3_st_type2_dt: SUB: 2010-03-14 03:16:55 EDT - P+0Y0M0DT2H6M35S = **2010-03-14 01:10:20 EDT**
+test_time_spring_type3_st_type2_post: SUB: 2010-03-15 19:59:59 EDT - P+0Y0M1DT18H49M39S = **2010-03-14 01:10:20 EDT**
+test_time_spring_type3_dt_type2_prev: SUB: 2010-03-13 18:38:28 EST - P-0Y0M0DT7H38M27S = **2010-03-14 02:16:55 EST**
+test_time_spring_type3_dt_type2_st: SUB: 2010-03-14 00:10:20 EST - P-0Y0M0DT2H6M35S = **2010-03-14 02:16:55 EST**
 test_time_spring_type3_dt_type2_dt: SUB: 2010-03-14 05:19:56 EDT - P+0Y0M0DT2H3M1S = **2010-03-14 03:16:55 EDT**
 test_time_spring_type3_dt_type2_post: SUB: 2010-03-15 19:59:59 EDT - P+0Y0M1DT16H43M4S = **2010-03-14 03:16:55 EDT**
-test_time_spring_type3_post_type2_prev: SUB: 2010-03-13 18:38:28 EST - P-0Y0M2DT1H21M31S = **2010-03-15 19:59:59 EDT**
-test_time_spring_type3_post_type2_st: SUB: 2010-03-14 00:10:20 EST - P-0Y0M1DT18H49M39S = **2010-03-15 19:59:59 EDT**
+test_time_spring_type3_post_type2_prev: SUB: 2010-03-13 18:38:28 EST - P-0Y0M2DT1H21M31S = **2010-03-15 19:59:59 EST**
+test_time_spring_type3_post_type2_st: SUB: 2010-03-14 00:10:20 EST - P-0Y0M1DT18H49M39S = **2010-03-15 18:59:59 EST**
 test_time_spring_type3_post_type2_dt: SUB: 2010-03-14 03:16:55 EDT - P-0Y0M1DT16H43M4S = **2010-03-15 19:59:59 EDT**
 test_time_spring_type3_post_type2_post: SUB: 2010-03-15 19:59:59 EDT - P+0Y0M0DT1H2M4S = **2010-03-15 18:57:55 EDT**
-test_time_spring_type3_stsec_type2_dtsec: SUB: 2010-03-15 03:00:00 EDT - P+0Y0M0DT0H0M1S = **2010-03-13 01:59:59 EST**
-test_time_spring_type3_dtsec_type2_stsec: SUB: 2010-03-15 01:59:59 EST - P-0Y0M0DT0H0M1S = **2010-03-15 03:00:00 EDT**
+test_time_spring_type3_stsec_type2_dtsec: SUB: 2010-03-14 03:00:00 EDT - P+0Y0M0DT0H0M1S = **2010-03-14 02:59:59 EDT**
+test_time_spring_type3_dtsec_type2_stsec: SUB: 2010-03-14 01:59:59 EST - P-0Y0M0DT0H0M1S = **2010-03-14 02:00:00 EST**

php-8.1.13.tar.xz/ext/date/tests/DateTime_sub-spring-type3-type3.phpt -> php-8.1.21.tar.xz/ext/date/tests/DateTime_sub-spring-type3-type3.phpt Changed

@@ -2,8 +2,6 @@
 DateTime::sub() -- spring type3 type3
 --CREDITS--
 Daniel Convissor <danielc@php.net>
---XFAIL--
-Various bugs exist
 --FILE--
 <?php
 
@@ -26,8 +24,8 @@
 test_time_spring_type3_dt_type3_dt: SUB: 2010-03-14 05:19:56 EDT - P+0Y0M0DT2H3M1S = **2010-03-14 03:16:55 EDT**
 test_time_spring_type3_dt_type3_post: SUB: 2010-03-15 19:59:59 EDT - P+0Y0M1DT16H43M4S = **2010-03-14 03:16:55 EDT**
 test_time_spring_type3_post_type3_prev: SUB: 2010-03-13 18:38:28 EST - P-0Y0M2DT1H21M31S = **2010-03-15 19:59:59 EDT**
-test_time_spring_type3_post_type3_st: SUB: 2010-03-14 00:10:20 EST - P-0Y0M1DT18H49M39S = **2010-03-15 19:59:59 EDT**
+test_time_spring_type3_post_type3_st: SUB: 2010-03-14 00:10:20 EST - P-0Y0M1DT18H49M39S = **2010-03-15 18:59:59 EDT**
 test_time_spring_type3_post_type3_dt: SUB: 2010-03-14 03:16:55 EDT - P-0Y0M1DT16H43M4S = **2010-03-15 19:59:59 EDT**
 test_time_spring_type3_post_type3_post: SUB: 2010-03-15 19:59:59 EDT - P+0Y0M0DT1H2M4S = **2010-03-15 18:57:55 EDT**
-test_time_spring_type3_stsec_type3_dtsec: SUB: 2010-03-15 03:00:00 EDT - P+0Y0M0DT0H0M1S = **2010-03-13 01:59:59 EST**
-test_time_spring_type3_dtsec_type3_stsec: SUB: 2010-03-15 01:59:59 EST - P-0Y0M0DT0H0M1S = **2010-03-15 03:00:00 EDT**
+test_time_spring_type3_stsec_type3_dtsec: SUB: 2010-03-14 03:00:00 EDT - P+0Y0M0DT0H0M1S = **2010-03-14 01:59:59 EST**
+test_time_spring_type3_dtsec_type3_stsec: SUB: 2010-03-14 01:59:59 EST - P-0Y0M0DT0H0M1S = **2010-03-14 03:00:00 EDT**

php-8.1.13.tar.xz/ext/date/tests/bug81097.phpt -> php-8.1.21.tar.xz/ext/date/tests/bug81097.phpt Changed

php-8.1.13.tar.xz/ext/date/tests/bug81263.phpt -> php-8.1.21.tar.xz/ext/date/tests/bug81263.phpt Changed

php-8.1.13.tar.xz/ext/date/tests/bug81565.phpt -> php-8.1.21.tar.xz/ext/date/tests/bug81565.phpt Changed

php-8.1.13.tar.xz/ext/date/tests/examine_diff.inc -> php-8.1.21.tar.xz/ext/date/tests/examine_diff.inc Changed

php-8.1.21.tar.xz/ext/date/tests/gh10218.phpt Added

php-8.1.21.tar.xz/ext/date/tests/gh10447.phpt Added

php-8.1.21.tar.xz/ext/date/tests/gh10583.phpt Added

php-8.1.21.tar.xz/ext/date/tests/gh11281.phpt Added

php-8.1.13.tar.xz/ext/date/tests/gh7758.phpt -> php-8.1.21.tar.xz/ext/date/tests/gh7758.phpt Changed

php-8.1.13.tar.xz/ext/date/tests/gh9165.phpt -> php-8.1.21.tar.xz/ext/date/tests/gh9165.phpt Changed

php-8.1.21.tar.xz/ext/date/tests/gh9699.phpt Added

php-8.1.21.tar.xz/ext/date/tests/gh9700.phpt Added

php-8.1.21.tar.xz/ext/date/tests/gh9866.phpt Added

php-8.1.21.tar.xz/ext/date/tests/gh9880.phpt Added

php-8.1.21.tar.xz/ext/date/tests/gh9891.phpt Added

php-8.1.13.tar.xz/ext/date/tests/rfc-datetime_and_daylight_saving_time-type3-bd2.phpt -> php-8.1.21.tar.xz/ext/date/tests/rfc-datetime_and_daylight_saving_time-type3-bd2.phpt Changed

php-8.1.13.tar.xz/ext/date/tests/rfc-datetime_and_daylight_saving_time-type3-fa.phpt -> php-8.1.21.tar.xz/ext/date/tests/rfc-datetime_and_daylight_saving_time-type3-fa.phpt Changed

@@ -26,6 +26,12 @@
     . $start->add($interval)->format($date_format) . "\n";
 
 $start = new DateTime('2010-03-13 04:30:00');
+$interval_spec = 'PT23H';
+$interval = new DateInterval($interval_spec);
+echo 'fa2.5 ' . $start->format($date_format) . " + $interval_spec = "
+    . $start->add($interval)->format($date_format) . "\n";
+
+$start = new DateTime('2010-03-13 04:30:00');
 $interval_spec = 'PT22H';
 $interval = new DateInterval($interval_spec);
 echo 'fa3 ' . $start->format($date_format) . " + $interval_spec = "
@@ -52,6 +58,7 @@
 --EXPECT--
 fa1 2010-03-14 01:59:59 EST America/New_York + PT1S = 2010-03-14 03:00:00 EDT America/New_York
 fa2 2010-03-13 04:30:00 EST America/New_York + P1D = 2010-03-14 04:30:00 EDT America/New_York
+fa2.5 2010-03-13 04:30:00 EST America/New_York + PT23H = 2010-03-14 04:30:00 EDT America/New_York
 fa3 2010-03-13 04:30:00 EST America/New_York + PT22H = 2010-03-14 03:30:00 EDT America/New_York
 fa4 2010-03-13 04:30:00 EST America/New_York + PT21H = 2010-03-14 01:30:00 EST America/New_York
 fa5 2010-03-13 01:30:00 EST America/New_York + P1D = 2010-03-14 01:30:00 EST America/New_York

php-8.1.13.tar.xz/ext/dom/document.c -> php-8.1.21.tar.xz/ext/dom/document.c Changed

@@ -1008,6 +1008,19 @@
 }
 /* }}} end dom_document_get_elements_by_tag_name_ns */
 
+static bool php_dom_is_node_attached(const xmlNode *node)
+{
+	ZEND_ASSERT(node != NULL);
+	node = node->parent;
+	while (node != NULL) {
+		if (node->type == XML_DOCUMENT_NODE || node->type == XML_HTML_DOCUMENT_NODE) {
+			return true;
+		}
+		node = node->parent;
+	}
+	return false;
+}
+
 /* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getElBId
 Since: DOM Level 2
 */
@@ -1030,7 +1043,13 @@
 
 	attrp = xmlGetID(docp, (xmlChar *) idname);
 
-	if (attrp && attrp->parent) {
+	/* From the moment an ID is created, libxml2's behaviour is to cache that element, even
+	 * if that element is not yet attached to the document. Similarly, only upon destruction of
+	 * the element the ID is actually removed by libxml2. Since libxml2 has such behaviour deeply
+	 * ingrained in the library, and uses the cache for various purposes, it seems like a bad
+	 * idea and lost cause to fight it. Instead, we'll simply walk the tree upwards to check
+	 * if the node is attached to the document. */
+	if (attrp && attrp->parent && php_dom_is_node_attached(attrp->parent)) {
 		DOM_RET_OBJ((xmlNodePtr) attrp->parent, &ret, intern);
 	} else {
 		RETVAL_NULL();
@@ -1182,7 +1201,7 @@
 	int validate, recover, resolve_externals, keep_blanks, substitute_ent;
 	int resolved_path_len;
 	int old_error_reporting = 0;
-	char *directory=NULL, resolved_pathMAXPATHLEN;
+	char *directory=NULL, resolved_pathMAXPATHLEN + 1;
 
 	if (id != NULL) {
 		intern = Z_DOMOBJ_P(id);

php-8.1.13.tar.xz/ext/dom/element.c -> php-8.1.21.tar.xz/ext/dom/element.c Changed

@@ -150,6 +150,7 @@
 
 /* }}} */
 
+/* Note: the object returned is not necessarily a node, but can be an attribute or a namespace declaration. */
 static xmlNodePtr dom_get_dom1_attribute(xmlNodePtr elem, xmlChar *name) /* {{{ */
 {
 	int len;
@@ -376,25 +377,13 @@
 	}
 
 	if (attrp->type == XML_NAMESPACE_DECL) {
-		xmlNsPtr curns;
-		xmlNodePtr nsparent;
-
-		nsparent = attrp->_private;
-		curns = xmlNewNs(NULL, attrp->name, NULL);
-		if (attrp->children) {
-			curns->prefix = xmlStrdup((xmlChar *) attrp->children);
-		}
-		if (attrp->children) {
-			attrp = xmlNewDocNode(nodep->doc, NULL, (xmlChar *) attrp->children, attrp->name);
-		} else {
-			attrp = xmlNewDocNode(nodep->doc, NULL, (xmlChar *)"xmlns", attrp->name);
-		}
-		attrp->type = XML_NAMESPACE_DECL;
-		attrp->parent = nsparent;
-		attrp->ns = curns;
+		xmlNsPtr original = (xmlNsPtr) attrp;
+		/* Keep parent alive, because we're a fake child. */
+		GC_ADDREF(&intern->std);
+		(void) php_dom_create_fake_namespace_decl(nodep, original, return_value, intern);
+	} else {
+		DOM_RET_OBJ((xmlNodePtr) attrp, &ret, intern);
 	}
-
-	DOM_RET_OBJ((xmlNodePtr) attrp, &ret, intern);
 }
 /* }}} end dom_element_get_attribute_node */
 
@@ -798,7 +787,7 @@
 PHP_METHOD(DOMElement, getAttributeNodeNS)
 {
 	zval *id;
-	xmlNodePtr elemp, fakeAttrp;
+	xmlNodePtr elemp;
 	xmlAttrPtr attrp;
 	dom_object *intern;
 	size_t uri_len, name_len;
@@ -819,21 +808,9 @@
 			xmlNsPtr nsptr;
 			nsptr = dom_get_nsdecl(elemp, (xmlChar *)name);
 			if (nsptr != NULL) {
-				xmlNsPtr curns;
-				curns = xmlNewNs(NULL, nsptr->href, NULL);
-				if (nsptr->prefix) {
-					curns->prefix = xmlStrdup((xmlChar *) nsptr->prefix);
-				}
-				if (nsptr->prefix) {
-					fakeAttrp = xmlNewDocNode(elemp->doc, NULL, (xmlChar *) nsptr->prefix, nsptr->href);
-				} else {
-					fakeAttrp = xmlNewDocNode(elemp->doc, NULL, (xmlChar *)"xmlns", nsptr->href);
-				}
-				fakeAttrp->type = XML_NAMESPACE_DECL;
-				fakeAttrp->parent = elemp;
-				fakeAttrp->ns = curns;
-
-				DOM_RET_OBJ(fakeAttrp, &ret, intern);
+				/* Keep parent alive, because we're a fake child. */
+				GC_ADDREF(&intern->std);
+				(void) php_dom_create_fake_namespace_decl(elemp, nsptr, return_value, intern);
 			} else {
 				RETURN_NULL();
 			}
@@ -1234,7 +1211,7 @@
 }
 /* }}} end DOMElement::prepend */
 
-/* {{{ URL: https://dom.spec.whatwg.org/#dom-parentnode-prepend
+/* {{{ URL: https://dom.spec.whatwg.org/#dom-parentnode-replacechildren
 Since: DOM Living Standard (DOM4)
 */
 PHP_METHOD(DOMElement, replaceWith)
@@ -1251,8 +1228,7 @@
 	id = ZEND_THIS;
 	DOM_GET_OBJ(context, id, xmlNodePtr, intern);
 
-	dom_parent_node_after(intern, args, argc);
-	dom_child_node_remove(intern);
+	dom_child_replace_with(intern, args, argc);
 }
 /* }}} end DOMElement::prepend */

php-8.1.13.tar.xz/ext/dom/namednodemap.c -> php-8.1.21.tar.xz/ext/dom/namednodemap.c Changed

@@ -31,7 +31,7 @@
 * Since:
 */
 
-static int get_namednodemap_length(dom_object *obj)
+int php_dom_get_namednodemap_length(dom_object *obj)
 {
 	dom_nnodemap_object *objmap = (dom_nnodemap_object *) obj->ptr;
 	if (!objmap) {
@@ -65,95 +65,74 @@
 */
 int dom_namednodemap_length_read(dom_object *obj, zval *retval)
 {
-	ZVAL_LONG(retval, get_namednodemap_length(obj));
+	ZVAL_LONG(retval, php_dom_get_namednodemap_length(obj));
 	return SUCCESS;
 }
 
 /* }}} */
 
-/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1074577549
-Since:
-*/
-PHP_METHOD(DOMNamedNodeMap, getNamedItem)
+xmlNodePtr php_dom_named_node_map_get_named_item(dom_nnodemap_object *objmap, const char *named, bool may_transform)
 {
-	zval *id;
-	int ret;
-	size_t namedlen=0;
-	dom_object *intern;
 	xmlNodePtr itemnode = NULL;
-	char *named;
-
-	dom_nnodemap_object *objmap;
-	xmlNodePtr nodep;
-	xmlNotation *notep = NULL;
-
-	id = ZEND_THIS;
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &named, &namedlen) == FAILURE) {
-		RETURN_THROWS();
-	}
-
-	intern = Z_DOMOBJ_P(id);
-
-	objmap = (dom_nnodemap_object *)intern->ptr;
-
 	if (objmap != NULL) {
 		if ((objmap->nodetype == XML_NOTATION_NODE) ||
 			objmap->nodetype == XML_ENTITY_NODE) {
 			if (objmap->ht) {
 				if (objmap->nodetype == XML_ENTITY_NODE) {
-					itemnode = (xmlNodePtr)xmlHashLookup(objmap->ht, (xmlChar *) named);
+					itemnode = (xmlNodePtr)xmlHashLookup(objmap->ht, (const xmlChar *) named);
 				} else {
-					notep = (xmlNotation *)xmlHashLookup(objmap->ht, (xmlChar *) named);
+					xmlNotationPtr notep = xmlHashLookup(objmap->ht, (const xmlChar *) named);
 					if (notep) {
-						itemnode = create_notation(notep->name, notep->PublicID, notep->SystemID);
+						if (may_transform) {
+							itemnode = create_notation(notep->name, notep->PublicID, notep->SystemID);
+						} else {
+							itemnode = (xmlNodePtr) notep;
+						}
 					}
 				}
 			}
 		} else {
-			nodep = dom_object_get_node(objmap->baseobj);
+			xmlNodePtr nodep = dom_object_get_node(objmap->baseobj);
 			if (nodep) {
-				itemnode = (xmlNodePtr)xmlHasProp(nodep, (xmlChar *) named);
+				itemnode = (xmlNodePtr)xmlHasProp(nodep, (const xmlChar *) named);
 			}
 		}
 	}
+	return itemnode;
+}
 
+void php_dom_named_node_map_get_named_item_into_zval(dom_nnodemap_object *objmap, const char *named, zval *return_value)
+{
+	int ret;
+	xmlNodePtr itemnode = php_dom_named_node_map_get_named_item(objmap, named, true);
 	if (itemnode) {
 		DOM_RET_OBJ(itemnode, &ret, objmap->baseobj);
-		return;
 	} else {
-		RETVAL_NULL();
+		RETURN_NULL();
 	}
 }
-/* }}} end dom_namednodemap_get_named_item */
 
-/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-349467F9
+/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1074577549
 Since:
 */
-PHP_METHOD(DOMNamedNodeMap, item)
+PHP_METHOD(DOMNamedNodeMap, getNamedItem)
 {
-	zval *id;
-	zend_long index;
-	int ret;
-	dom_object *intern;
-	xmlNodePtr itemnode = NULL;
-
-	dom_nnodemap_object *objmap;
-	xmlNodePtr nodep, curnode;
-	int count;
+	size_t namedlen;
+	char *named;
 
-	id = ZEND_THIS;
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &index) == FAILURE) {
-		RETURN_THROWS();
-	}
-	if (index < 0 || ZEND_LONG_INT_OVFL(index)) {
-		zend_argument_value_error(1, "must be between 0 and %d", INT_MAX);
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &named, &namedlen) == FAILURE) {
 		RETURN_THROWS();
 	}
 
-	intern = Z_DOMOBJ_P(id);
-
-	objmap = (dom_nnodemap_object *)intern->ptr;
+	zval *id = ZEND_THIS;
+	dom_nnodemap_object *objmap = Z_DOMOBJ_P(id)->ptr;
+	php_dom_named_node_map_get_named_item_into_zval(objmap, named, return_value);
+}
+/* }}} end dom_namednodemap_get_named_item */
 
+xmlNodePtr php_dom_named_node_map_get_item(dom_nnodemap_object *objmap, zend_long index)
+{
+	xmlNodePtr itemnode = NULL;
 	if (objmap != NULL) {
 		if ((objmap->nodetype == XML_NOTATION_NODE) ||
 			objmap->nodetype == XML_ENTITY_NODE) {
@@ -165,10 +144,10 @@
 				}
 			}
 		} else {
-			nodep = dom_object_get_node(objmap->baseobj);
+			xmlNodePtr nodep = dom_object_get_node(objmap->baseobj);
 			if (nodep) {
-				curnode = (xmlNodePtr)nodep->properties;
-				count = 0;
+				xmlNodePtr curnode = (xmlNodePtr)nodep->properties;
+				zend_long count = 0;
 				while (count < index && curnode != NULL) {
 					count++;
 					curnode = (xmlNodePtr)curnode->next;
@@ -177,13 +156,38 @@
 			}
 		}
 	}
+	return itemnode;
+}
 
+void php_dom_named_node_map_get_item_into_zval(dom_nnodemap_object *objmap, zend_long index, zval *return_value)
+{
+	int ret;
+	xmlNodePtr itemnode = php_dom_named_node_map_get_item(objmap, index);
 	if (itemnode) {
 		DOM_RET_OBJ(itemnode, &ret, objmap->baseobj);
-		return;
+	} else {
+		RETURN_NULL();
+	}
+}
+
+/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-349467F9
+Since:
+*/
+PHP_METHOD(DOMNamedNodeMap, item)
+{
+	zend_long index;
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &index) == FAILURE) {
+		RETURN_THROWS();
+	}
+	if (index < 0 || ZEND_LONG_INT_OVFL(index)) {
+		zend_argument_value_error(1, "must be between 0 and %d", INT_MAX);
+		RETURN_THROWS();
 	}
 
-	RETVAL_NULL();
+	zval *id = ZEND_THIS;
+	dom_object *intern = Z_DOMOBJ_P(id);
+	dom_nnodemap_object *objmap = intern->ptr;
+	php_dom_named_node_map_get_item_into_zval(objmap, index, return_value);
 }
 /* }}} end dom_namednodemap_item */
 
@@ -254,7 +258,7 @@
 	}
 
 	intern = Z_DOMOBJ_P(id);
-	RETURN_LONG(get_namednodemap_length(intern));
+	RETURN_LONG(php_dom_get_namednodemap_length(intern));
 }
 /* }}} end dom_namednodemap_count */

php-8.1.13.tar.xz/ext/dom/node.c -> php-8.1.21.tar.xz/ext/dom/node.c Changed

@@ -769,17 +769,28 @@
 		return FAILURE;
 	}
 
-	if (nodep->type == XML_ELEMENT_NODE || nodep->type == XML_ATTRIBUTE_NODE) {
+	const xmlChar *xmlChars = (const xmlChar *) ZSTR_VAL(str);
+	int type = nodep->type;
+
+	/* We can't directly call xmlNodeSetContent, because it might encode the string through
+	 * xmlStringLenGetNodeList for types XML_DOCUMENT_FRAG_NODE, XML_ELEMENT_NODE, XML_ATTRIBUTE_NODE.
+	 * See tree.c:xmlNodeSetContent in libxml.
+	 * In these cases we need to use a text node to avoid the encoding.
+	 * For the other cases, we *can* rely on xmlNodeSetContent because it is either a no-op, or handles
+	 * the content without encoding. */
+	if (type == XML_DOCUMENT_FRAG_NODE || type == XML_ELEMENT_NODE || type == XML_ATTRIBUTE_NODE) {
 		if (nodep->children) {
 			node_list_unlink(nodep->children);
 			php_libxml_node_free_list((xmlNodePtr) nodep->children);
 			nodep->children = NULL;
 		}
+
+		xmlNode *textNode = xmlNewText(xmlChars);
+		xmlAddChild(nodep, textNode);
+	} else {
+		xmlNodeSetContent(nodep, xmlChars);
 	}
 
-	/* we have to use xmlNodeAddContent() to get the same behavior as with xmlNewText() */
-	xmlNodeSetContent(nodep, (xmlChar *) "");
-	xmlNodeAddContent(nodep, (xmlChar *) ZSTR_VAL(str));
 	zend_string_release_ex(str, 0);
 
 	return SUCCESS;
@@ -932,12 +943,20 @@
 					return;
 				}
 			}
+			new_child = xmlAddPrevSibling(refp, child);
+			if (UNEXPECTED(NULL == new_child)) {
+				goto cannot_add;
+			}
 		} else if (child->type == XML_DOCUMENT_FRAG_NODE) {
+			xmlNodePtr last = child->last;
 			new_child = _php_dom_insert_fragment(parentp, refp->prev, refp, child, intern, childobj);
-		}
-
-		if (new_child == NULL) {
+			dom_reconcile_ns_list(parentp->doc, new_child, last);
+		} else {
 			new_child = xmlAddPrevSibling(refp, child);
+			if (UNEXPECTED(NULL == new_child)) {
+				goto cannot_add;
+			}
+			dom_reconcile_ns(parentp->doc, new_child);
 		}
 	} else {
 		if (child->parent != NULL){
@@ -974,23 +993,28 @@
 					return;
 				}
 			}
+			new_child = xmlAddChild(parentp, child);
+			if (UNEXPECTED(NULL == new_child)) {
+				goto cannot_add;
+			}
 		} else if (child->type == XML_DOCUMENT_FRAG_NODE) {
+			xmlNodePtr last = child->last;
 			new_child = _php_dom_insert_fragment(parentp, parentp->last, NULL, child, intern, childobj);
-		}
-		if (new_child == NULL) {
+			dom_reconcile_ns_list(parentp->doc, new_child, last);
+		} else {
 			new_child = xmlAddChild(parentp, child);
+			if (UNEXPECTED(NULL == new_child)) {
+				goto cannot_add;
+			}
+			dom_reconcile_ns(parentp->doc, new_child);
 		}
 	}
 
-	if (NULL == new_child) {
-		zend_throw_error(NULL, "Cannot add newnode as the previous sibling of refnode");
-		RETURN_THROWS();
-	}
-
-	dom_reconcile_ns(parentp->doc, new_child);
-
 	DOM_RET_OBJ(new_child, &ret, intern);
-
+	return;
+cannot_add:
+	zend_throw_error(NULL, "Cannot add newnode as the previous sibling of refnode");
+	RETURN_THROWS();
 }
 /* }}} end dom_node_insert_before */
 
@@ -1055,9 +1079,10 @@
 
 		xmlUnlinkNode(oldchild);
 
+		xmlNodePtr last = newchild->last;
 		newchild = _php_dom_insert_fragment(nodep, prevsib, nextsib, newchild, intern, newchildobj);
 		if (newchild) {
-			dom_reconcile_ns(nodep->doc, newchild);
+			dom_reconcile_ns_list(nodep->doc, newchild, last);
 		}
 	} else if (oldchild != newchild) {
 		xmlDtdPtr intSubset = xmlGetIntSubset(nodep->doc);
@@ -1204,22 +1229,28 @@
 				php_libxml_node_free_resource((xmlNodePtr) lastattr);
 			}
 		}
+		new_child = xmlAddChild(nodep, child);
+		if (UNEXPECTED(new_child == NULL)) {
+			goto cannot_add;
+		}
 	} else if (child->type == XML_DOCUMENT_FRAG_NODE) {
+		xmlNodePtr last = child->last;
 		new_child = _php_dom_insert_fragment(nodep, nodep->last, NULL, child, intern, childobj);
-	}
-
-	if (new_child == NULL) {
+		dom_reconcile_ns_list(nodep->doc, new_child, last);
+	} else {
 		new_child = xmlAddChild(nodep, child);
-		if (new_child == NULL) {
-			// TODO Convert to Error?
-			php_error_docref(NULL, E_WARNING, "Couldn't append node");
-			RETURN_FALSE;
+		if (UNEXPECTED(new_child == NULL)) {
+			goto cannot_add;
 		}
+		dom_reconcile_ns(nodep->doc, new_child);
 	}
 
-	dom_reconcile_ns(nodep->doc, new_child);
-
 	DOM_RET_OBJ(new_child, &ret, intern);
+	return;
+cannot_add:
+	// TODO Convert to Error?
+	php_error_docref(NULL, E_WARNING, "Couldn't append node");
+	RETURN_FALSE;
 }
 /* }}} end dom_node_append_child */

php-8.1.13.tar.xz/ext/dom/nodelist.c -> php-8.1.21.tar.xz/ext/dom/nodelist.c Changed

@@ -31,7 +31,7 @@
 * Since:
 */
 
-static int get_nodelist_length(dom_object *obj)
+int php_dom_get_nodelist_length(dom_object *obj)
 {
 	dom_nnodemap_object *objmap = (dom_nnodemap_object *) obj->ptr;
 	if (!objmap) {
@@ -82,7 +82,7 @@
 */
 int dom_nodelist_length_read(dom_object *obj, zval *retval)
 {
-	ZVAL_LONG(retval, get_nodelist_length(obj));
+	ZVAL_LONG(retval, php_dom_get_nodelist_length(obj));
 	return SUCCESS;
 }
 
@@ -99,36 +99,15 @@
 	}
 
 	intern = Z_DOMOBJ_P(id);
-	RETURN_LONG(get_nodelist_length(intern));
+	RETURN_LONG(php_dom_get_nodelist_length(intern));
 }
 /* }}} end dom_nodelist_count */
 
-/* }}} */
-
-/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-844377136
-Since:
-*/
-PHP_METHOD(DOMNodeList, item)
+void php_dom_nodelist_get_item_into_zval(dom_nnodemap_object *objmap, zend_long index, zval *return_value)
 {
-	zval *id;
-	zend_long index;
 	int ret;
-	dom_object *intern;
 	xmlNodePtr itemnode = NULL;
-
-	dom_nnodemap_object *objmap;
-	xmlNodePtr nodep, curnode;
-	int count = 0;
-
-	id = ZEND_THIS;
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &index) == FAILURE) {
-		RETURN_THROWS();
-	}
-
 	if (index >= 0) {
-		intern = Z_DOMOBJ_P(id);
-
-		objmap = (dom_nnodemap_object *)intern->ptr;
 		if (objmap != NULL) {
 			if (objmap->ht) {
 				if (objmap->nodetype == XML_ENTITY_NODE) {
@@ -145,10 +124,11 @@
 						return;
 					}
 				} else if (objmap->baseobj) {
-					nodep = dom_object_get_node(objmap->baseobj);
+					xmlNodePtr nodep = dom_object_get_node(objmap->baseobj);
 					if (nodep) {
+						int count = 0;
 						if (objmap->nodetype == XML_ATTRIBUTE_NODE || objmap->nodetype == XML_ELEMENT_NODE) {
-							curnode = nodep->children;
+							xmlNodePtr curnode = nodep->children;
 							while (count < index && curnode != NULL) {
 								count++;
 								curnode = curnode->next;
@@ -175,6 +155,22 @@
 
 	RETVAL_NULL();
 }
+
+/* {{{ URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-844377136
+Since:
+*/
+PHP_METHOD(DOMNodeList, item)
+{
+	zend_long index;
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &index) == FAILURE) {
+		RETURN_THROWS();
+	}
+
+	zval *id = ZEND_THIS;
+	dom_object *intern = Z_DOMOBJ_P(id);
+	dom_nnodemap_object *objmap = intern->ptr;
+	php_dom_nodelist_get_item_into_zval(objmap, index, return_value);
+}
 /* }}} end dom_nodelist_item */
 
 ZEND_METHOD(DOMNodeList, getIterator)

php-8.1.13.tar.xz/ext/dom/parentnode.c -> php-8.1.21.tar.xz/ext/dom/parentnode.c Changed

@@ -124,6 +124,23 @@
 }
 /* }}} */
 
+static bool dom_is_node_in_list(const zval *nodes, int nodesc, const xmlNodePtr node_to_find)
+{
+	for (int i = 0; i < nodesc; i++) {
+		if (Z_TYPE(nodesi) == IS_OBJECT) {
+			const zend_class_entry *ce = Z_OBJCE(nodesi);
+
+			if (instanceof_function(ce, dom_node_class_entry)) {
+				if (dom_object_get_node(Z_DOMOBJ_P(nodes + i)) == node_to_find) {
+					return true;
+				}
+			}
+		}
+	}
+
+	return false;
+}
+
 xmlNode* dom_zvals_to_fragment(php_libxml_ref_obj *document, xmlNode *contextNode, zval *nodes, int nodesc)
 {
 	int i;
@@ -162,9 +179,8 @@
 				newNode = dom_object_get_node(newNodeObj);
 
 				if (newNode->doc != documentNode) {
-					xmlFree(fragment);
 					php_dom_throw_error(WRONG_DOCUMENT_ERR, stricterror);
-					return NULL;
+					goto err;
 				}
 
 				if (newNode->parent != NULL) {
@@ -175,25 +191,28 @@
 				xmlSetTreeDoc(newNode, documentNode);
 
 				if (newNode->type == XML_ATTRIBUTE_NODE) {
-					xmlFree(fragment);
+					goto hierarchy_request_err;
+				}
 
-					php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror);
-					return NULL;
+				/* Citing from the docs (https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/libxml2-tree.html#xmlAddChild): 
+				 * "Add a new node to @parent, at the end of the child (or property) list merging adjacent TEXT nodes (in which case @cur is freed)".
+				 * So we must take a copy if this situation arises to prevent a use-after-free. */
+				bool will_free = newNode->type == XML_TEXT_NODE && fragment->last && fragment->last->type == XML_TEXT_NODE;
+				if (will_free) {
+					newNode = xmlCopyNode(newNode, 1);
 				}
 
 				if (!xmlAddChild(fragment, newNode)) {
-					xmlFree(fragment);
-
-					php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror);
-					return NULL;
+					if (will_free) {
+						xmlFreeNode(newNode);
+					}
+					goto hierarchy_request_err;
 				}
 
 				continue;
 			} else {
-				xmlFree(fragment);
-
 				zend_argument_type_error(i + 1, "must be of type DOMNode|string, %s given", zend_zval_type_name(&nodesi));
-				return NULL;
+				goto err;
 			}
 		} else if (Z_TYPE(nodesi) == IS_STRING) {
 			newNode = xmlNewDocText(documentNode, (xmlChar *) Z_STRVAL(nodesi));
@@ -201,20 +220,22 @@
 			xmlSetTreeDoc(newNode, documentNode);
 
 			if (!xmlAddChild(fragment, newNode)) {
-				xmlFree(fragment);
-
-				return NULL;
+				xmlFreeNode(newNode);
+				goto hierarchy_request_err;
 			}
 		} else {
-			xmlFree(fragment);
-
 			zend_argument_type_error(i + 1, "must be of type DOMNode|string, %s given", zend_zval_type_name(&nodesi));
-
-			return NULL;
+			goto err;
 		}
 	}
 
 	return fragment;
+
+hierarchy_request_err:
+	php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror);
+err:
+	xmlFreeNode(fragment);
+	return NULL;
 }
 
 static void dom_fragment_assign_parent_node(xmlNodePtr parentNode, xmlNodePtr fragment)
@@ -234,10 +255,33 @@
 	fragment->last = NULL;
 }
 
+static zend_result dom_hierarchy_node_list(xmlNodePtr parentNode, zval *nodes, int nodesc)
+{
+	for (int i = 0; i < nodesc; i++) {
+		if (Z_TYPE(nodesi) == IS_OBJECT) {
+			const zend_class_entry *ce = Z_OBJCE(nodesi);
+
+			if (instanceof_function(ce, dom_node_class_entry)) {
+				if (dom_hierarchy(parentNode, dom_object_get_node(Z_DOMOBJ_P(nodes + i))) != SUCCESS) {
+					return FAILURE;
+				}
+			}
+		}
+	}
+
+	return SUCCESS;
+}
+
 void dom_parent_node_append(dom_object *context, zval *nodes, int nodesc)
 {
 	xmlNode *parentNode = dom_object_get_node(context);
 	xmlNodePtr newchild, prevsib;
+
+	if (UNEXPECTED(dom_hierarchy_node_list(parentNode, nodes, nodesc) != SUCCESS)) {
+		php_dom_throw_error(HIERARCHY_REQUEST_ERR, dom_get_strict_error(context->document));
+		return;
+	}
+
 	xmlNode *fragment = dom_zvals_to_fragment(context->document, parentNode, nodes, nodesc);
 
 	if (fragment == NULL) {
@@ -254,13 +298,14 @@
 			parentNode->children = newchild;
 		}
 
-		parentNode->last = fragment->last;
+		xmlNodePtr last = fragment->last;
+		parentNode->last = last;
 
 		newchild->prev = prevsib;
 
 		dom_fragment_assign_parent_node(parentNode, fragment);
 
-		dom_reconcile_ns(parentNode->doc, newchild);
+		dom_reconcile_ns_list(parentNode->doc, newchild, last);
 	}
 
 	xmlFree(fragment);
@@ -275,6 +320,11 @@
 		return;
 	}
 
+	if (UNEXPECTED(dom_hierarchy_node_list(parentNode, nodes, nodesc) != SUCCESS)) {
+		php_dom_throw_error(HIERARCHY_REQUEST_ERR, dom_get_strict_error(context->document));
+		return;
+	}
+
 	xmlNodePtr newchild, nextsib;
 	xmlNode *fragment = dom_zvals_to_fragment(context->document, parentNode, nodes, nodesc);
 
@@ -286,32 +336,77 @@
 	nextsib = parentNode->children;
 
 	if (newchild) {
+		xmlNodePtr last = fragment->last;
 		parentNode->children = newchild;
 		fragment->last->next = nextsib;
-		nextsib->prev = fragment->last;
+		nextsib->prev = last;
 
 		dom_fragment_assign_parent_node(parentNode, fragment);
 
-		dom_reconcile_ns(parentNode->doc, newchild);
+		dom_reconcile_ns_list(parentNode->doc, newchild, last);
 	}
 
 	xmlFree(fragment);
 }
 
+static void dom_pre_insert(xmlNodePtr insertion_point, xmlNodePtr parentNode, xmlNodePtr newchild, xmlNodePtr fragment)
+{
+	if (!insertion_point) {
+		/* Place it as last node */
+		if (parentNode->children) {
+			/* There are children */
+			fragment->last->prev = parentNode->last;
+			newchild->prev = parentNode->last->prev;
+			parentNode->last->next = newchild;
+		} else {
+			/* No children, because they moved out when they became a fragment */
+			parentNode->children = newchild;
+			parentNode->last = newchild;
+		}
+	} else {
+		/* Insert fragment before insertion_point */
+		fragment->last->next = insertion_point;
+		if (insertion_point->prev) {
+			insertion_point->prev->next = newchild;
+			newchild->prev = insertion_point->prev;
+		}
+		insertion_point->prev = newchild;
+		if (parentNode->children == insertion_point) {
+			parentNode->children = newchild;
+		}
+	}
+}
+
 void dom_parent_node_after(dom_object *context, zval *nodes, int nodesc)
 {
+	/* Spec link: https://dom.spec.whatwg.org/#dom-childnode-after */
+
 	xmlNode *prevsib = dom_object_get_node(context);
 	xmlNodePtr newchild, parentNode;
 	xmlNode *fragment;
+	xmlDoc *doc;
 
-	int stricterror = dom_get_strict_error(context->document);
-
-	if (!prevsib->parent) {
-		php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, stricterror);
+	/* Spec step 1 */
+	parentNode = prevsib->parent;
+	/* Spec step 2 */
+	if (!parentNode) {
+		int stricterror = dom_get_strict_error(context->document);
+		php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror);
 		return;
 	}
 
-	parentNode = prevsib->parent;
+	/* Spec step 3: find first following child not in nodes; otherwise null */
+	xmlNodePtr viable_next_sibling = prevsib->next;
+	while (viable_next_sibling) {
+		if (!dom_is_node_in_list(nodes, nodesc, viable_next_sibling)) {
+			break;
+		}
+		viable_next_sibling = viable_next_sibling->next;
+	}
+
+	doc = prevsib->doc;
+
+	/* Spec step 4: convert nodes into fragment */
 	fragment = dom_zvals_to_fragment(context->document, parentNode, nodes, nodesc);
 
 	if (fragment == NULL) {
@@ -321,13 +416,13 @@
 	newchild = fragment->children;
 
 	if (newchild) {
-		fragment->last->next = prevsib->next;
-		prevsib->next = newchild;
+		xmlNodePtr last = fragment->last;
 
-		newchild->prev = prevsib;
+		/* Step 5: place fragment into the parent before viable_next_sibling */
+		dom_pre_insert(viable_next_sibling, parentNode, newchild, fragment);
 
 		dom_fragment_assign_parent_node(parentNode, fragment);
-		dom_reconcile_ns(prevsib->doc, newchild);
+		dom_reconcile_ns_list(doc, newchild, last);
 	}
 
 	xmlFree(fragment);
@@ -335,12 +430,34 @@
 
 void dom_parent_node_before(dom_object *context, zval *nodes, int nodesc)
 {
+	/* Spec link: https://dom.spec.whatwg.org/#dom-childnode-before */
+
 	xmlNode *nextsib = dom_object_get_node(context);
-	xmlNodePtr newchild, prevsib, parentNode;
+	xmlNodePtr newchild, parentNode;
 	xmlNode *fragment;
+	xmlDoc *doc;
 
-	prevsib = nextsib->prev;
+	/* Spec step 1 */
 	parentNode = nextsib->parent;
+	/* Spec step 2 */
+	if (!parentNode) {
+		int stricterror = dom_get_strict_error(context->document);
+		php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror);
+		return;
+	}
+
+	/* Spec step 3: find first following child not in nodes; otherwise null */
+	xmlNodePtr viable_previous_sibling = nextsib->prev;
+	while (viable_previous_sibling) {
+		if (!dom_is_node_in_list(nodes, nodesc, viable_previous_sibling)) {
+			break;
+		}
+		viable_previous_sibling = viable_previous_sibling->prev;
+	}
+
+	doc = nextsib->doc;
+
+	/* Spec step 4: convert nodes into fragment */
 	fragment = dom_zvals_to_fragment(context->document, parentNode, nodes, nodesc);
 
 	if (fragment == NULL) {
@@ -350,53 +467,63 @@
 	newchild = fragment->children;
 
 	if (newchild) {
-		if (parentNode->children == nextsib) {
-			parentNode->children = newchild;
+		xmlNodePtr last = fragment->last;
+
+		/* Step 5: if viable_previous_sibling is null, set it to the parent's first child, otherwise viable_previous_sibling's next sibling */
+		if (!viable_previous_sibling) {
+			viable_previous_sibling = parentNode->children;
 		} else {
-			prevsib->next = newchild;
+			viable_previous_sibling = viable_previous_sibling->next;
 		}
-		fragment->last->next = nextsib;
-		nextsib->prev = fragment->last;
-
-		newchild->prev = prevsib;
+		/* Step 6: place fragment into the parent after viable_previous_sibling */
+		dom_pre_insert(viable_previous_sibling, parentNode, newchild, fragment);
 
 		dom_fragment_assign_parent_node(parentNode, fragment);
-
-		dom_reconcile_ns(nextsib->doc, newchild);
+		dom_reconcile_ns_list(doc, newchild, last);
 	}
 
 	xmlFree(fragment);
 }
 
-void dom_child_node_remove(dom_object *context)
+static zend_result dom_child_removal_preconditions(const xmlNodePtr child, int stricterror)
 {
-	xmlNode *child = dom_object_get_node(context);
-	xmlNodePtr children;
-	int stricterror;
-
-	stricterror = dom_get_strict_error(context->document);
-
 	if (dom_node_is_read_only(child) == SUCCESS ||
 		(child->parent != NULL && dom_node_is_read_only(child->parent) == SUCCESS)) {
 		php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR, stricterror);
-		return;
+		return FAILURE;
 	}
 
 	if (!child->parent) {
 		php_dom_throw_error(NOT_FOUND_ERR, stricterror);
-		return;
+		return FAILURE;
 	}
 
 	if (dom_node_children_valid(child->parent) == FAILURE) {
-		return;
+		return FAILURE;
 	}
 
-	children = child->parent->children;
+	xmlNodePtr children = child->parent->children;
 	if (!children) {
 		php_dom_throw_error(NOT_FOUND_ERR, stricterror);
+		return FAILURE;
+	}
+
+	return SUCCESS;
+}
+
+void dom_child_node_remove(dom_object *context)
+{
+	xmlNode *child = dom_object_get_node(context);
+	xmlNodePtr children;
+	int stricterror;
+
+	stricterror = dom_get_strict_error(context->document);
+
+	if (UNEXPECTED(dom_child_removal_preconditions(child, stricterror) != SUCCESS)) {
 		return;
 	}
 
+	children = child->parent->children;
 	while (children) {
 		if (children == child) {
 			xmlUnlinkNode(child);
@@ -408,4 +535,41 @@
 	php_dom_throw_error(NOT_FOUND_ERR, stricterror);
 }
 
+void dom_child_replace_with(dom_object *context, zval *nodes, int nodesc)
+{
+	xmlNodePtr child = dom_object_get_node(context);
+	xmlNodePtr parentNode = child->parent;
+
+	int stricterror = dom_get_strict_error(context->document);
+	if (UNEXPECTED(dom_child_removal_preconditions(child, stricterror) != SUCCESS)) {
+		return;
+	}
+
+	xmlNodePtr insertion_point = child->next;
+
+	xmlNodePtr fragment = dom_zvals_to_fragment(context->document, parentNode, nodes, nodesc);
+	if (UNEXPECTED(fragment == NULL)) {
+		return;
+	}
+
+	xmlNodePtr newchild = fragment->children;
+	xmlDocPtr doc = parentNode->doc;
+
+	if (newchild) {
+		xmlNodePtr last = fragment->last;
+
+		/* Unlink and free it unless it became a part of the fragment. */
+		if (child->parent != fragment) {
+			xmlUnlinkNode(child);
+		}
+
+		dom_pre_insert(insertion_point, parentNode, newchild, fragment);
+
+		dom_fragment_assign_parent_node(parentNode, fragment);
+		dom_reconcile_ns_list(doc, newchild, last);
+	}
+
+	xmlFree(fragment);
+}
+
 #endif

php-8.1.13.tar.xz/ext/dom/php_dom.c -> php-8.1.21.tar.xz/ext/dom/php_dom.c Changed

@@ -61,6 +61,8 @@
 
 zend_object_handlers dom_object_handlers;
 zend_object_handlers dom_nnodemap_object_handlers;
+zend_object_handlers dom_nodelist_object_handlers;
+zend_object_handlers dom_object_namespace_node_handlers;
 #ifdef LIBXML_XPATH_ENABLED
 zend_object_handlers dom_xpath_object_handlers;
 #endif
@@ -86,6 +88,11 @@
 #endif
 /* }}} */
 
+static zend_object *dom_objects_namespace_node_new(zend_class_entry *class_type);
+static void dom_object_namespace_node_free_storage(zend_object *object);
+static xmlNodePtr php_dom_create_fake_namespace_decl_node_ptr(xmlNodePtr nodep, xmlNsPtr original);
+static zend_object *dom_nodelist_objects_new(zend_class_entry *class_type);
+
 typedef int (*dom_read_t)(dom_object *obj, zval *retval);
 typedef int (*dom_write_t)(dom_object *obj, zval *newval);
 
@@ -473,6 +480,19 @@
 
 static dom_object* dom_objects_set_class(zend_class_entry *class_type);
 
+static void dom_update_refcount_after_clone(dom_object *original, xmlNodePtr original_node, dom_object *clone, xmlNodePtr cloned_node)
+{
+	/* If we cloned a document then we must create new doc proxy */
+	if (cloned_node->doc == original_node->doc) {
+		clone->document = original->document;
+	}
+	php_libxml_increment_doc_ref((php_libxml_node_object *)clone, cloned_node->doc);
+	php_libxml_increment_node_ptr((php_libxml_node_object *)clone, cloned_node, (void *)clone);
+	if (original->document != clone->document) {
+		dom_copy_doc_props(original->document, clone->document);
+	}
+}
+
 static zend_object *dom_objects_store_clone_obj(zend_object *zobject) /* {{{ */
 {
 	dom_object *intern = php_dom_obj_from_obj(zobject);
@@ -485,15 +505,7 @@
 		if (node != NULL) {
 			xmlNodePtr cloned_node = xmlDocCopyNode(node, node->doc, 1);
 			if (cloned_node != NULL) {
-				/* If we cloned a document then we must create new doc proxy */
-				if (cloned_node->doc == node->doc) {
-					clone->document = intern->document;
-				}
-				php_libxml_increment_doc_ref((php_libxml_node_object *)clone, cloned_node->doc);
-				php_libxml_increment_node_ptr((php_libxml_node_object *)clone, cloned_node, (void *)clone);
-				if (intern->document != clone->document) {
-					dom_copy_doc_props(intern->document, clone->document);
-				}
+				dom_update_refcount_after_clone(intern, node, clone, cloned_node);
 			}
 
 		}
@@ -505,6 +517,26 @@
 }
 /* }}} */
 
+static zend_object *dom_object_namespace_node_clone_obj(zend_object *zobject)
+{
+	dom_object_namespace_node *intern = php_dom_namespace_node_obj_from_obj(zobject);
+	zend_object *clone = dom_objects_namespace_node_new(intern->dom.std.ce);
+	dom_object_namespace_node *clone_intern = php_dom_namespace_node_obj_from_obj(clone);
+
+	xmlNodePtr original_node = dom_object_get_node(&intern->dom);
+	ZEND_ASSERT(original_node->type == XML_NAMESPACE_DECL);
+	xmlNodePtr cloned_node = php_dom_create_fake_namespace_decl_node_ptr(original_node->parent, original_node->ns);
+
+	if (intern->parent_intern) {
+		clone_intern->parent_intern = intern->parent_intern;
+		GC_ADDREF(&clone_intern->parent_intern->std);
+	}
+	dom_update_refcount_after_clone(&intern->dom, original_node, &clone_intern->dom, cloned_node);
+
+	zend_objects_clone_members(clone, &intern->dom.std);
+	return clone;
+}
+
 static void dom_copy_prop_handler(zval *zv) /* {{{ */
 {
 	dom_prop_handler *hnd = Z_PTR_P(zv);
@@ -547,6 +579,8 @@
 void dom_nnodemap_objects_free_storage(zend_object *object);
 static zval *dom_nodelist_read_dimension(zend_object *object, zval *offset, int type, zval *rv);
 static int dom_nodelist_has_dimension(zend_object *object, zval *member, int check_empty);
+static zval *dom_nodemap_read_dimension(zend_object *object, zval *offset, int type, zval *rv);
+static int dom_nodemap_has_dimension(zend_object *object, zval *member, int check_empty);
 static zend_object *dom_objects_store_clone_obj(zend_object *zobject);
 #ifdef LIBXML_XPATH_ENABLED
 void dom_xpath_objects_free_storage(zend_object *object);
@@ -567,8 +601,17 @@
 
 	memcpy(&dom_nnodemap_object_handlers, &dom_object_handlers, sizeof(zend_object_handlers));
 	dom_nnodemap_object_handlers.free_obj = dom_nnodemap_objects_free_storage;
-	dom_nnodemap_object_handlers.read_dimension = dom_nodelist_read_dimension;
-	dom_nnodemap_object_handlers.has_dimension = dom_nodelist_has_dimension;
+	dom_nnodemap_object_handlers.read_dimension = dom_nodemap_read_dimension;
+	dom_nnodemap_object_handlers.has_dimension = dom_nodemap_has_dimension;
+
+	memcpy(&dom_nodelist_object_handlers, &dom_nnodemap_object_handlers, sizeof(zend_object_handlers));
+	dom_nodelist_object_handlers.read_dimension = dom_nodelist_read_dimension;
+	dom_nodelist_object_handlers.has_dimension = dom_nodelist_has_dimension;
+
+	memcpy(&dom_object_namespace_node_handlers, &dom_object_handlers, sizeof(zend_object_handlers));
+	dom_object_namespace_node_handlers.offset = XtOffsetOf(dom_object_namespace_node, dom.std);
+	dom_object_namespace_node_handlers.free_obj = dom_object_namespace_node_free_storage;
+	dom_object_namespace_node_handlers.clone_obj = dom_object_namespace_node_clone_obj;
 
 	zend_hash_init(&classes, 0, NULL, NULL, 1);
 
@@ -604,7 +647,7 @@
 	zend_hash_add_ptr(&classes, dom_node_class_entry->name, &dom_node_prop_handlers);
 
 	dom_namespace_node_class_entry = register_class_DOMNameSpaceNode();
-	dom_namespace_node_class_entry->create_object = dom_objects_new;
+	dom_namespace_node_class_entry->create_object = dom_objects_namespace_node_new;
 
 	zend_hash_init(&dom_namespace_node_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1);
 	dom_register_prop_handler(&dom_namespace_node_prop_handlers, "nodeName", sizeof("nodeName")-1, dom_node_node_name_read, NULL);
@@ -659,7 +702,7 @@
 	zend_hash_add_ptr(&classes, dom_document_class_entry->name, &dom_document_prop_handlers);
 
 	dom_nodelist_class_entry = register_class_DOMNodeList(zend_ce_aggregate, zend_ce_countable);
-	dom_nodelist_class_entry->create_object = dom_nnodemap_objects_new;
+	dom_nodelist_class_entry->create_object = dom_nodelist_objects_new;
 	dom_nodelist_class_entry->get_iterator = php_dom_get_iterator;
 
 	zend_hash_init(&dom_nodelist_prop_handlers, 0, NULL, dom_dtor_prop_handler, 1);
@@ -1001,10 +1044,8 @@
 }
 /* }}} */
 
-static dom_object* dom_objects_set_class(zend_class_entry *class_type) /* {{{ */
+static void dom_objects_set_class_ex(zend_class_entry *class_type, dom_object *intern)
 {
-	dom_object *intern = zend_object_alloc(sizeof(dom_object), class_type);
-
 	zend_class_entry *base_class = class_type;
 	while ((base_class->type != ZEND_INTERNAL_CLASS || base_class->info.internal.module->module_number != dom_module_entry.module_number) && base_class->parent != NULL) {
 		base_class = base_class->parent;
@@ -1014,10 +1055,14 @@
 
 	zend_object_std_init(&intern->std, class_type);
 	object_properties_init(&intern->std, class_type);
+}
 
+static dom_object* dom_objects_set_class(zend_class_entry *class_type)
+{
+	dom_object *intern = zend_object_alloc(sizeof(dom_object), class_type);
+	dom_objects_set_class_ex(class_type, intern);
 	return intern;
 }
-/* }}} */
 
 /* {{{ dom_objects_new */
 zend_object *dom_objects_new(zend_class_entry *class_type)
@@ -1028,6 +1073,25 @@
 }
 /* }}} */
 
+static zend_object *dom_objects_namespace_node_new(zend_class_entry *class_type)
+{
+	dom_object_namespace_node *intern = zend_object_alloc(sizeof(dom_object_namespace_node), class_type);
+	dom_objects_set_class_ex(class_type, &intern->dom);
+	intern->dom.std.handlers = &dom_object_namespace_node_handlers;
+	return &intern->dom.std;
+}
+
+static void dom_object_namespace_node_free_storage(zend_object *object)
+{
+	dom_object_namespace_node *intern = php_dom_namespace_node_obj_from_obj(object);
+	if (intern->parent_intern != NULL) {
+		zval tmp;
+		ZVAL_OBJ(&tmp, &intern->parent_intern->std);
+		zval_ptr_dtor(&tmp);
+	}
+	dom_objects_free_storage(object);
+}
+
 #ifdef LIBXML_XPATH_ENABLED
 /* {{{ zend_object dom_xpath_objects_new(zend_class_entry *class_type) */
 zend_object *dom_xpath_objects_new(zend_class_entry *class_type)
@@ -1073,7 +1137,7 @@
 }
 /* }}} */
 
-zend_object *dom_nnodemap_objects_new(zend_class_entry *class_type) /* {{{ */
+static zend_object *dom_nodemap_or_nodelist_objects_new(zend_class_entry *class_type, const zend_object_handlers *handlers)
 {
 	dom_object *intern;
 	dom_nnodemap_object *objmap;
@@ -1088,12 +1152,22 @@
 	objmap->local = NULL;
 	objmap->ns = NULL;
 
-	intern->std.handlers = &dom_nnodemap_object_handlers;
+	intern->std.handlers = handlers;
 
 	return &intern->std;
 }
+
+zend_object *dom_nnodemap_objects_new(zend_class_entry *class_type) /* {{{ */
+{
+	return dom_nodemap_or_nodelist_objects_new(class_type, &dom_nnodemap_object_handlers);
+}
 /* }}} */
 
+zend_object *dom_nodelist_objects_new(zend_class_entry *class_type)
+{
+	return dom_nodemap_or_nodelist_objects_new(class_type, &dom_nodelist_object_handlers);
+}
+
 void php_dom_create_iterator(zval *return_value, int ce_type) /* {{{ */
 {
 	zend_class_entry *ce;
@@ -1270,10 +1344,15 @@
 {
 	xmlNodePtr ret = NULL;
 
+	/* Note: The spec says that ns == '' must be transformed to ns == NULL. In other words, they are equivalent.
+	 * PHP however does not do this and internally uses the empty string everywhere when the user provides ns == NULL.
+	 * This is because for PHP ns == NULL has another meaning: "match every namespace" instead of "match the empty namespace". */
+	bool ns_match_any = ns == NULL || (ns0 == '*' && ns1 == '\0');
+
 	while (nodep != NULL && (*cur <= index || index == -1)) {
 		if (nodep->type == XML_ELEMENT_NODE) {
 			if (xmlStrEqual(nodep->name, (xmlChar *)local) || xmlStrEqual((xmlChar *)"*", (xmlChar *)local)) {
-				if (ns == NULL || (!strcmp(ns, "") && nodep->ns == NULL) || (nodep->ns != NULL && (xmlStrEqual(nodep->ns->href, (xmlChar *)ns) || xmlStrEqual((xmlChar *)"*", (xmlChar *)ns)))) {
+				if (ns_match_any || (!strcmp(ns, "") && nodep->ns == NULL) || (nodep->ns != NULL && xmlStrEqual(nodep->ns->href, (xmlChar *)ns))) {
 					if (*cur == index) {
 						ret = nodep;
 						break;
@@ -1380,38 +1459,86 @@
 }
 /* }}} end dom_set_old_ns */
 
-void dom_reconcile_ns(xmlDocPtr doc, xmlNodePtr nodep) /* {{{ */
+static void dom_reconcile_ns_internal(xmlDocPtr doc, xmlNodePtr nodep, xmlNodePtr search_parent)
 {
 	xmlNsPtr nsptr, nsdftptr, curns, prevns = NULL;
 
-	if (nodep->type == XML_ELEMENT_NODE) {
-		/* Following if block primarily used for inserting nodes created via createElementNS */
-		if (nodep->nsDef != NULL) {
-			curns = nodep->nsDef;
-			while (curns) {
-				nsdftptr = curns->next;
-				if (curns->href != NULL) {
-					if((nsptr = xmlSearchNsByHref(doc, nodep->parent, curns->href)) &&
-						(curns->prefix == NULL || xmlStrEqual(nsptr->prefix, curns->prefix))) {
-						curns->next = NULL;
-						if (prevns == NULL) {
-							nodep->nsDef = nsdftptr;
-						} else {
-							prevns->next = nsdftptr;
-						}
-						dom_set_old_ns(doc, curns);
-						curns = prevns;
+	/* Following if block primarily used for inserting nodes created via createElementNS */
+	if (nodep->nsDef != NULL) {
+		curns = nodep->nsDef;
+		while (curns) {
+			nsdftptr = curns->next;
+			if (curns->href != NULL) {
+				if((nsptr = xmlSearchNsByHref(doc, search_parent, curns->href)) &&
+					(curns->prefix == NULL || xmlStrEqual(nsptr->prefix, curns->prefix))) {
+					curns->next = NULL;
+					if (prevns == NULL) {
+						nodep->nsDef = nsdftptr;
+					} else {
+						prevns->next = nsdftptr;
 					}
+					dom_set_old_ns(doc, curns);
+					curns = prevns;
 				}
-				prevns = curns;
-				curns = nsdftptr;
 			}
+			prevns = curns;
+			curns = nsdftptr;
 		}
-		xmlReconciliateNs(doc, nodep);
+	}
+}
+
+static void dom_libxml_reconcile_ensure_namespaces_are_declared(xmlNodePtr nodep)
+{
+	/* Put on stack to avoid allocation.
+	 * Although libxml2 currently does not use this for the reconciliation, it still
+	 * makes sense to do this just in case libxml2's internal change in the future. */
+	xmlDOMWrapCtxt dummy_ctxt = {0};
+	xmlDOMWrapReconcileNamespaces(&dummy_ctxt, nodep, /* options */ 0);
+}
+
+void dom_reconcile_ns(xmlDocPtr doc, xmlNodePtr nodep) /* {{{ */
+{
+	/* Although the node type will be checked by the libxml2 API,
+	 * we still want to do the internal reconciliation conditionally. */
+	if (nodep->type == XML_ELEMENT_NODE) {
+		dom_reconcile_ns_internal(doc, nodep, nodep->parent);
+		dom_libxml_reconcile_ensure_namespaces_are_declared(nodep);
 	}
 }
 /* }}} */
 
+static void dom_reconcile_ns_list_internal(xmlDocPtr doc, xmlNodePtr nodep, xmlNodePtr last, xmlNodePtr search_parent)
+{
+	ZEND_ASSERT(nodep != NULL);
+	while (true) {
+		if (nodep->type == XML_ELEMENT_NODE) {
+			dom_reconcile_ns_internal(doc, nodep, search_parent);
+			if (nodep->children) {
+				dom_reconcile_ns_list_internal(doc, nodep->children, nodep->last /* process the whole children list */, search_parent);
+			}
+		}
+		if (nodep == last) {
+			break;
+		}
+		nodep = nodep->next;
+	}
+}
+
+void dom_reconcile_ns_list(xmlDocPtr doc, xmlNodePtr nodep, xmlNodePtr last)
+{
+	dom_reconcile_ns_list_internal(doc, nodep, last, nodep->parent);
+	/* The loop is outside of the recursion in the above call because
+	 * dom_libxml_reconcile_ensure_namespaces_are_declared() performs its own recursion. */
+	while (true) {
+		/* The internal libxml2 call will already check the node type, no need for us to do it here. */
+		dom_libxml_reconcile_ensure_namespaces_are_declared(nodep);
+		if (nodep == last) {
+			break;
+		}
+		nodep = nodep->next;
+	}
+}
+
 /*
 http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/core.html#ID-DocCrElNS
 
@@ -1510,34 +1637,111 @@
 }
 /* }}} end dom_get_nsdecl */
 
-static zval *dom_nodelist_read_dimension(zend_object *object, zval *offset, int type, zval *rv) /* {{{ */
+static xmlNodePtr php_dom_create_fake_namespace_decl_node_ptr(xmlNodePtr nodep, xmlNsPtr original)
 {
-	zval offset_copy;
+	xmlNodePtr attrp;
+	xmlNsPtr curns = xmlNewNs(NULL, original->href, NULL);
+	if (original->prefix) {
+		curns->prefix = xmlStrdup(original->prefix);
+		attrp = xmlNewDocNode(nodep->doc, NULL, (xmlChar *) original->prefix, original->href);
+	} else {
+		attrp = xmlNewDocNode(nodep->doc, NULL, (xmlChar *)"xmlns", original->href);
+	}
+	attrp->type = XML_NAMESPACE_DECL;
+	attrp->parent = nodep;
+	attrp->ns = curns;
+	return attrp;
+}
 
-	if (!offset) {
-		zend_throw_error(NULL, "Cannot access node list without offset");
-		return NULL;
+/* Note: Assumes the additional lifetime was already added in the caller. */
+xmlNodePtr php_dom_create_fake_namespace_decl(xmlNodePtr nodep, xmlNsPtr original, zval *return_value, dom_object *parent_intern)
+{
+	xmlNodePtr attrp = php_dom_create_fake_namespace_decl_node_ptr(nodep, original);
+	php_dom_create_object(attrp, return_value, parent_intern);
+	/* This object must exist, because we just created an object for it via php_dom_create_object(). */
+	php_dom_namespace_node_obj_from_obj(Z_OBJ_P(return_value))->parent_intern = parent_intern;
+	return attrp;
+}
+
+static bool dom_nodemap_or_nodelist_process_offset_as_named(zval *offset, zend_long *lval)
+{
+	if (Z_TYPE_P(offset) == IS_STRING) {
+		/* See zval_get_long_func() */
+		double dval;
+		zend_uchar is_numeric_string_type;
+		if (0 == (is_numeric_string_type = is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), lval, &dval, true))) {
+			return true;
+		} else if (is_numeric_string_type == IS_DOUBLE) {
+			*lval = zend_dval_to_lval_cap(dval);
+		}
+	} else {
+		*lval = zval_get_long(offset);
 	}
+	return false;
+}
 
-	ZVAL_LONG(&offset_copy, zval_get_long(offset));
+static zval *dom_nodelist_read_dimension(zend_object *object, zval *offset, int type, zval *rv) /* {{{ */
+{
+	if (UNEXPECTED(!offset)) {
+		zend_throw_error(NULL, "Cannot access DOMNodeList without offset");
+		return NULL;
+	}
 
-	zend_call_method_with_1_params(object, object->ce, NULL, "item", rv, &offset_copy);
+	zend_long lval;
+	if (dom_nodemap_or_nodelist_process_offset_as_named(offset, &lval)) {
+		/* does not support named lookup */
+		ZVAL_NULL(rv);
+		return rv;
+	}
 
+	php_dom_nodelist_get_item_into_zval(php_dom_obj_from_obj(object)->ptr, lval, rv);
 	return rv;
 } /* }}} end dom_nodelist_read_dimension */
 
 static int dom_nodelist_has_dimension(zend_object *object, zval *member, int check_empty)
 {
-	zend_long offset = zval_get_long(member);
-	zval rv;
-
-	if (offset < 0) {
+	zend_long offset;
+	if (dom_nodemap_or_nodelist_process_offset_as_named(member, &offset)) {
+		/* does not support named lookup */
 		return 0;
-	} else {
-		zval *length = zend_read_property(
-			object->ce, object, "length", sizeof("length") - 1, 0, &rv);
-		return length && offset < Z_LVAL_P(length);
 	}
+
+	return offset >= 0 && offset < php_dom_get_nodelist_length(php_dom_obj_from_obj(object));
 } /* }}} end dom_nodelist_has_dimension */
 
+static zval *dom_nodemap_read_dimension(zend_object *object, zval *offset, int type, zval *rv) /* {{{ */
+{
+	if (UNEXPECTED(!offset)) {
+		zend_throw_error(NULL, "Cannot access DOMNamedNodeMap without offset");
+		return NULL;
+	}
+
+	zend_long lval;
+	if (dom_nodemap_or_nodelist_process_offset_as_named(offset, &lval)) {
+		/* exceptional case, switch to named lookup */
+		php_dom_named_node_map_get_named_item_into_zval(php_dom_obj_from_obj(object)->ptr, Z_STRVAL_P(offset), rv);
+		return rv;
+	}
+
+	/* see PHP_METHOD(DOMNamedNodeMap, item) */
+	if (UNEXPECTED(lval < 0 || ZEND_LONG_INT_OVFL(lval))) {
+		zend_value_error("must be between 0 and %d", INT_MAX);
+		return NULL;
+	}
+
+	php_dom_named_node_map_get_item_into_zval(php_dom_obj_from_obj(object)->ptr, lval, rv);
+	return rv;
+} /* }}} end dom_nodemap_read_dimension */
+
+static int dom_nodemap_has_dimension(zend_object *object, zval *member, int check_empty)
+{
+	zend_long offset;
+	if (dom_nodemap_or_nodelist_process_offset_as_named(member, &offset)) {
+		/* exceptional case, switch to named lookup */
+		return php_dom_named_node_map_get_named_item(php_dom_obj_from_obj(object)->ptr, Z_STRVAL_P(member), false) != NULL;
+	}
+
+	return offset >= 0 && offset < php_dom_get_namednodemap_length(php_dom_obj_from_obj(object));
+} /* }}} end dom_nodemap_has_dimension */
+
 #endif /* HAVE_DOM */

php-8.1.13.tar.xz/ext/dom/php_dom.h -> php-8.1.21.tar.xz/ext/dom/php_dom.h Changed

@@ -93,6 +93,18 @@
 	HashPosition pos;
 } php_dom_iterator;
 
+typedef struct {
+	/* This may be a fake object that isn't actually in the children list of the parent.
+	 * This is because some namespace declaration nodes aren't stored on the parent in libxml2, so we have to fake it.
+	 * We could use a zval for this, but since this is always going to be an object let's save space... */
+	dom_object *parent_intern;
+	dom_object dom;
+} dom_object_namespace_node;
+
+static inline dom_object_namespace_node *php_dom_namespace_node_obj_from_obj(zend_object *obj) {
+	return (dom_object_namespace_node*)((char*)(obj) - XtOffsetOf(dom_object_namespace_node, dom.std));
+}
+
 #include "domexception.h"
 
 dom_object *dom_object_get_data(xmlNodePtr obj);
@@ -110,6 +122,7 @@
 xmlNsPtr dom_get_ns(xmlNodePtr node, char *uri, int *errorcode, char *prefix);
 void dom_set_old_ns(xmlDoc *doc, xmlNs *ns);
 void dom_reconcile_ns(xmlDocPtr doc, xmlNodePtr nodep);
+void dom_reconcile_ns_list(xmlDocPtr doc, xmlNodePtr nodep, xmlNodePtr last);
 xmlNsPtr dom_get_nsdecl(xmlNode *node, xmlChar *localName);
 void dom_normalize (xmlNodePtr nodep);
 xmlNode *dom_get_elements_by_tag_name_ns_raw(xmlNodePtr nodep, char *ns, char *local, int *cur, int index);
@@ -125,12 +138,23 @@
 xmlNode *php_dom_libxml_notation_iter(xmlHashTable *ht, int index);
 zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object, int by_ref);
 void dom_set_doc_classmap(php_libxml_ref_obj *document, zend_class_entry *basece, zend_class_entry *ce);
+xmlNodePtr php_dom_create_fake_namespace_decl(xmlNodePtr nodep, xmlNsPtr original, zval *return_value, dom_object *parent_intern);
 
 void dom_parent_node_prepend(dom_object *context, zval *nodes, int nodesc);
 void dom_parent_node_append(dom_object *context, zval *nodes, int nodesc);
 void dom_parent_node_after(dom_object *context, zval *nodes, int nodesc);
 void dom_parent_node_before(dom_object *context, zval *nodes, int nodesc);
 void dom_child_node_remove(dom_object *context);
+void dom_child_replace_with(dom_object *context, zval *nodes, int nodesc);
+
+/* nodemap and nodelist APIs */
+xmlNodePtr php_dom_named_node_map_get_named_item(dom_nnodemap_object *objmap, const char *named, bool may_transform);
+void php_dom_named_node_map_get_named_item_into_zval(dom_nnodemap_object *objmap, const char *named, zval *return_value);
+xmlNodePtr php_dom_named_node_map_get_item(dom_nnodemap_object *objmap, zend_long index);
+void php_dom_named_node_map_get_item_into_zval(dom_nnodemap_object *objmap, zend_long index, zval *return_value);
+void php_dom_nodelist_get_item_into_zval(dom_nnodemap_object *objmap, zend_long index, zval *return_value);
+int php_dom_get_namednodemap_length(dom_object *obj);
+int php_dom_get_nodelist_length(dom_object *obj);
 
 #define DOM_GET_OBJ(__ptr, __id, __prtype, __intern) { \
 	__intern = Z_DOMOBJ_P(__id); \

php-8.1.13.tar.xz/ext/dom/php_dom.stub.php -> php-8.1.21.tar.xz/ext/dom/php_dom.stub.php Changed

php-8.1.13.tar.xz/ext/dom/php_dom_arginfo.h -> php-8.1.21.tar.xz/ext/dom/php_dom_arginfo.h Changed

php-8.1.21.tar.xz/ext/dom/tests/DOMDocument_getElementsByTagNameNS_match_any_namespace.phpt Added

@@ -0,0 +1,82 @@
+--TEST--
+DOMDocument::getElementsByTagNameNS() match any namespace
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+
+/* Sample document taken from https://www.php.net/manual/en/domdocument.getelementsbytagname.php */
+$xml = <<<EOD
+<?xml version="1.0" ?>
+<chapter xmlns:xi="http://www.w3.org/2001/XInclude">
+<title>Books of the other guy..</title>
+<para>
+ <xi:include href="book.xml">
+ <xi:fallback>
+ <error>xinclude: book.xml not found</error>
+ </xi:fallback>
+ </xi:include>
+ <include>
+ This is another namespace
+ </include>
+</para>
+</chapter>
+EOD;
+$dom = new DOMDocument;
+
+// load the XML string defined above
+$dom->loadXML($xml);
+
+function test($namespace, $local) {
+ global $dom;
+ $namespace_str = $namespace !== NULL ? "'$namespace'" : "null";
+ echo "-- getElementsByTagNameNS($namespace_str, '$local') --\n";
+ foreach ($dom->getElementsByTagNameNS($namespace, $local) as $element) {
+ echo 'local name: \'', $element->localName, '\', prefix: \'', $element->prefix, "'\n";
+ }
+}
+
+// Should *also* include objects even without a namespace
+test(null, '*');
+// Should *also* include objects even without a namespace
+test('*', '*');
+// Should *only* include objects without a namespace
+test('', '*');
+// Should *only* include objects with the specified namespace
+test('http://www.w3.org/2001/XInclude', '*');
+// Should not give any output
+test('', 'fallback');
+// Should not give any output, because the null namespace is the same as the empty namespace
+test(null, 'fallback');
+// Should only output the include from the empty namespace
+test(null, 'include');
+
+?>
+--EXPECT--
+-- getElementsByTagNameNS(null, '*') --
+local name: 'chapter', prefix: ''
+local name: 'title', prefix: ''
+local name: 'para', prefix: ''
+local name: 'error', prefix: ''
+local name: 'include', prefix: ''
+-- getElementsByTagNameNS('*', '*') --
+local name: 'chapter', prefix: ''
+local name: 'title', prefix: ''
+local name: 'para', prefix: ''
+local name: 'include', prefix: 'xi'
+local name: 'fallback', prefix: 'xi'
+local name: 'error', prefix: ''
+local name: 'include', prefix: ''
+-- getElementsByTagNameNS('', '*') --
+local name: 'chapter', prefix: ''
+local name: 'title', prefix: ''
+local name: 'para', prefix: ''
+local name: 'error', prefix: ''
+local name: 'include', prefix: ''
+-- getElementsByTagNameNS('http://www.w3.org/2001/XInclude', '*') --
+local name: 'include', prefix: 'xi'
+local name: 'fallback', prefix: 'xi'
+-- getElementsByTagNameNS('', 'fallback') --
+-- getElementsByTagNameNS(null, 'fallback') --
+-- getElementsByTagNameNS(null, 'include') --
+local name: 'include', prefix: ''

php-8.1.21.tar.xz/ext/dom/tests/DOMDocument_loadXML_error2_gte2_11.phpt Added

@@ -0,0 +1,34 @@
+--TEST--
+Test DOMDocument::loadXML() detects not-well formed XML
+--SKIPIF--
+<?php
+if (LIBXML_VERSION < 21100) die('skip libxml2 test variant for version >= 2.11');
+?>
+--DESCRIPTION--
+This test verifies the method detects attributes values not closed between " or '
+Environment variables used in the test:
+- XML_FILE: the xml file to load
+- LOAD_OPTIONS: the second parameter to pass to the method
+- EXPECTED_RESULT: the expected result
+--CREDITS--
+Antonio Diaz Ruiz <dejalatele@gmail.com>
+--INI--
+assert.bail=true
+--EXTENSIONS--
+dom
+--ENV--
+XML_FILE=/not_well_formed2.xml
+LOAD_OPTIONS=0
+EXPECTED_RESULT=0
+--FILE_EXTERNAL--
+domdocumentloadxml_test_method.inc
+--EXPECTF--
+Warning: DOMDocument::loadXML(): AttValue: " or ' expected in Entity, line: 4 in %s on line %d
+
+Warning: DOMDocument::loadXML(): internal error: xmlParseStartTag: problem parsing attributes in Entity, line: 4 in %s on line %d
+
+Warning: DOMDocument::loadXML(): Couldn't find end of Start Tag book line 4 in Entity, line: 4 in %s on line %d
+
+Warning: DOMDocument::loadXML(): Opening and ending tag mismatch: books line 3 and book in Entity, line: 7 in %s on line %d
+
+Warning: DOMDocument::loadXML(): Extra content at the end of the document in Entity, line: 8 in %s on line %d

php-8.1.21.tar.xz/ext/dom/tests/DOMDocument_loadXML_error2_pre2_11.phpt Added

@@ -0,0 +1,34 @@
+--TEST--
+Test DOMDocument::loadXML() detects not-well formed XML
+--SKIPIF--
+<?php
+if (LIBXML_VERSION >= 21100) die('skip libxml2 test variant for version < 2.11');
+?>
+--DESCRIPTION--
+This test verifies the method detects attributes values not closed between " or '
+Environment variables used in the test:
+- XML_FILE: the xml file to load
+- LOAD_OPTIONS: the second parameter to pass to the method
+- EXPECTED_RESULT: the expected result
+--CREDITS--
+Antonio Diaz Ruiz <dejalatele@gmail.com>
+--INI--
+assert.bail=true
+--EXTENSIONS--
+dom
+--ENV--
+XML_FILE=/not_well_formed2.xml
+LOAD_OPTIONS=0
+EXPECTED_RESULT=0
+--FILE_EXTERNAL--
+domdocumentloadxml_test_method.inc
+--EXPECTF--
+Warning: DOMDocument::load%r(XML){0,1}%r(): AttValue: " or ' expected %s
+
+Warning: DOMDocument::load%r(XML){0,1}%r(): attributes construct error %s
+
+Warning: DOMDocument::load%r(XML){0,1}%r(): Couldn't find end of Start Tag book %s
+
+Warning: DOMDocument::load%r(XML){0,1}%r(): Opening and ending tag mismatch: books %s
+
+Warning: DOMDocument::load%r(XML){0,1}%r(): Extra content at the end of the document %s

php-8.1.21.tar.xz/ext/dom/tests/DOMDocument_load_error2_gte2_11.phpt Added

@@ -0,0 +1,34 @@
+--TEST--
+Test DOMDocument::load() detects not-well formed 
+--SKIPIF--
+<?php
+if (LIBXML_VERSION < 21100) die('skip libxml2 test variant for version >= 2.11');
+?>
+--DESCRIPTION--
+This test verifies the method detects attributes values not closed between " or '
+Environment variables used in the test:
+- XML_FILE: the xml file to load
+- LOAD_OPTIONS: the second parameter to pass to the method
+- EXPECTED_RESULT: the expected result
+--CREDITS--
+Antonio Diaz Ruiz <dejalatele@gmail.com>
+--INI--
+assert.bail=true
+--EXTENSIONS--
+dom
+--ENV--
+XML_FILE=/not_well_formed2.xml
+LOAD_OPTIONS=0
+EXPECTED_RESULT=0
+--FILE_EXTERNAL--
+domdocumentload_test_method.inc
+--EXPECTF--
+Warning: DOMDocument::load(): AttValue: " or ' expected in %s on line %d
+
+Warning: DOMDocument::load(): internal error: xmlParseStartTag: problem parsing attributes in %s on line %d
+
+Warning: DOMDocument::load(): Couldn't find end of Start Tag book line 4 in %s on line %d
+
+Warning: DOMDocument::load(): Opening and ending tag mismatch: books line 3 and book in %s on line %d
+
+Warning: DOMDocument::load(): Extra content at the end of the document in %s on line %d

php-8.1.21.tar.xz/ext/dom/tests/DOMDocument_load_error2_pre2_11.phpt Added

@@ -0,0 +1,34 @@
+--TEST--
+Test DOMDocument::load() detects not-well formed XML
+--SKIPIF--
+<?php
+if (LIBXML_VERSION >= 21100) die('skip libxml2 test variant for version < 2.11');
+?>
+--DESCRIPTION--
+This test verifies the method detects attributes values not closed between " or '
+Environment variables used in the test:
+- XML_FILE: the xml file to load
+- LOAD_OPTIONS: the second parameter to pass to the method
+- EXPECTED_RESULT: the expected result
+--CREDITS--
+Antonio Diaz Ruiz <dejalatele@gmail.com>
+--INI--
+assert.bail=true
+--EXTENSIONS--
+dom
+--ENV--
+XML_FILE=/not_well_formed2.xml
+LOAD_OPTIONS=0
+EXPECTED_RESULT=0
+--FILE_EXTERNAL--
+domdocumentload_test_method.inc
+--EXPECTF--
+Warning: DOMDocument::load%r(XML){0,1}%r(): AttValue: " or ' expected %s
+
+Warning: DOMDocument::load%r(XML){0,1}%r(): attributes construct error %s
+
+Warning: DOMDocument::load%r(XML){0,1}%r(): Couldn't find end of Start Tag book %s
+
+Warning: DOMDocument::load%r(XML){0,1}%r(): Opening and ending tag mismatch: books %s
+
+Warning: DOMDocument::load%r(XML){0,1}%r(): Extra content at the end of the document %s

php-8.1.21.tar.xz/ext/dom/tests/DOMElement_append_hierarchy_test.phpt Added

@@ -0,0 +1,89 @@
+--TEST--
+DOMElement::append() with hierarchy changes and errors
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+
+$dom_original = new DOMDocument;
+$dom_original->loadXML('helloworld');
+
+echo "-- Append hello with world --\n";
+$dom = clone $dom_original;
+$b_hello = $dom->firstChild->firstChild;
+$b_world = $b_hello->nextSibling;
+$b_hello->append($b_world);
+var_dump($dom->saveHTML());
+
+echo "-- Append hello with world's child --\n";
+$dom = clone $dom_original;
+$b_hello = $dom->firstChild->firstChild;
+$b_world = $b_hello->nextSibling;
+$b_hello->append($b_world->firstChild);
+var_dump($dom->saveHTML());
+
+echo "-- Append world's child with hello --\n";
+$dom = clone $dom_original;
+$b_hello = $dom->firstChild->firstChild;
+$b_world = $b_hello->nextSibling;
+$b_world->firstChild->append($b_hello);
+var_dump($dom->saveHTML());
+
+echo "-- Append hello with itself --\n";
+$dom = clone $dom_original;
+$b_hello = $dom->firstChild->firstChild;
+try {
+ $b_hello->append($b_hello);
+} catch (\DOMException $e) {
+ echo $e->getMessage(), "\n";
+}
+var_dump($dom->saveHTML());
+
+echo "-- Append world's i tag with the parent --\n";
+$dom = clone $dom_original;
+$b_hello = $dom->firstChild->firstChild;
+$b_world = $b_hello->nextSibling;
+try {
+ $b_world->firstChild->append($b_world);
+} catch (\DOMException $e) {
+ echo $e->getMessage(), "\n";
+}
+var_dump($dom->saveHTML());
+
+echo "-- Append from another document --\n";
+$dom = clone $dom_original;
+$dom2 = new DOMDocument;
+$dom2->loadXML('other');
+try {
+ $dom->firstChild->firstChild->prepend($dom2->firstChild);
+} catch (\DOMException $e) {
+ echo $e->getMessage(), "\n";
+}
+var_dump($dom2->saveHTML());
+var_dump($dom->saveHTML());
+
+?>
+--EXPECT--
+-- Append hello with world --
+string(39) "helloworld
+"
+-- Append hello with world's child --
+string(39) "helloworld
+"
+-- Append world's child with hello --
+string(39) "worldhello
+"
+-- Append hello with itself --
+Hierarchy Request Error
+string(39) "helloworld
+"
+-- Append world's i tag with the parent --
+Hierarchy Request Error
+string(39) "helloworld
+"
+-- Append from another document --
+Wrong Document Error
+string(13) "other
+"
+string(39) "helloworld
+"

php-8.1.21.tar.xz/ext/dom/tests/DOMElement_prepend_hierarchy_test.phpt Added

@@ -0,0 +1,89 @@
+--TEST--
+DOMElement::prepend() with hierarchy changes and errors
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+
+$dom_original = new DOMDocument;
+$dom_original->loadXML('helloworld');
+
+echo "-- Prepend hello with world --\n";
+$dom = clone $dom_original;
+$b_hello = $dom->firstChild->firstChild;
+$b_world = $b_hello->nextSibling;
+$b_hello->prepend($b_world);
+var_dump($dom->saveHTML());
+
+echo "-- Prepend hello with world's child --\n";
+$dom = clone $dom_original;
+$b_hello = $dom->firstChild->firstChild;
+$b_world = $b_hello->nextSibling;
+$b_hello->prepend($b_world->firstChild);
+var_dump($dom->saveHTML());
+
+echo "-- Prepend world's child with hello --\n";
+$dom = clone $dom_original;
+$b_hello = $dom->firstChild->firstChild;
+$b_world = $b_hello->nextSibling;
+$b_world->firstChild->prepend($b_hello);
+var_dump($dom->saveHTML());
+
+echo "-- Prepend hello with itself --\n";
+$dom = clone $dom_original;
+$b_hello = $dom->firstChild->firstChild;
+try {
+ $b_hello->prepend($b_hello);
+} catch (\DOMException $e) {
+ echo $e->getMessage(), "\n";
+}
+var_dump($dom->saveHTML());
+
+echo "-- Prepend world's i tag with the parent --\n";
+$dom = clone $dom_original;
+$b_hello = $dom->firstChild->firstChild;
+$b_world = $b_hello->nextSibling;
+try {
+ $b_world->firstChild->prepend($b_world);
+} catch (\DOMException $e) {
+ echo $e->getMessage(), "\n";
+}
+var_dump($dom->saveHTML());
+
+echo "-- Append from another document --\n";
+$dom = clone $dom_original;
+$dom2 = new DOMDocument;
+$dom2->loadXML('other');
+try {
+ $dom->firstChild->firstChild->prepend($dom2->firstChild);
+} catch (\DOMException $e) {
+ echo $e->getMessage(), "\n";
+}
+var_dump($dom2->saveHTML());
+var_dump($dom->saveHTML());
+
+?>
+--EXPECT--
+-- Prepend hello with world --
+string(39) "worldhello
+"
+-- Prepend hello with world's child --
+string(39) "worldhello
+"
+-- Prepend world's child with hello --
+string(39) "helloworld
+"
+-- Prepend hello with itself --
+Hierarchy Request Error
+string(39) "helloworld
+"
+-- Prepend world's i tag with the parent --
+Hierarchy Request Error
+string(39) "helloworld
+"
+-- Append from another document --
+Wrong Document Error
+string(13) "other
+"
+string(39) "helloworld
+"

php-8.1.21.tar.xz/ext/dom/tests/bug47530.phpt Added

@@ -0,0 +1,152 @@
+--TEST--
+Bug #47530 (Importing objects into document fragments creates bogus "default" namespace)
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+
+function test_document_fragment_with_import() {
+ $doc = new DOMDocument;
+ $doc->loadXML('<html xmlns="https://php.net/something" xmlns:ns="https://php.net/whatever"><element ns:foo="https://php.net/bar"/></html>');
+ $root = $doc->documentElement;
+ $frag = $doc->createDocumentFragment();
+ $frag->appendChild($doc->importNode($root->firstChild));
+ $root->appendChild($frag);
+ echo $doc->saveXML();
+}
+
+function test_document_fragment_without_import() {
+ $doc = new DOMDocument;
+ $doc->loadXML('<html xmlns=""><element xmlns:foo="https://php.net/bar"/></html>');
+ $frag = $doc->createDocumentFragment();
+ $frag->appendChild($doc->createElementNS('https://php.net/bar', 'bar'));
+ $frag->appendChild($doc->createElementNS('', 'bar'));
+ $element = $doc->documentElement->firstChild;
+ $element->appendChild($frag);
+ unset($frag); // Free fragment, should not break getting the namespaceURI below
+ echo $doc->saveXML();
+ unset($doc);
+ var_dump($element->firstChild->tagName);
+ var_dump($element->firstChild->namespaceURI);
+}
+
+function test_document_import() {
+ $xml = <<<XML
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+<div xmlns="http://www.w3.org/1999/xhtml">
+ Test-Text
+</div>
+</feed>
+XML;
+
+ $dom = new DOMDocument();
+ $dom->loadXML($xml);
+
+ $dom2 = new DOMDocument();
+ $importedNode = $dom2->importNode($dom->documentElement, true);
+ $dom2->appendChild($importedNode);
+
+ echo $dom2->saveXML();
+}
+
+function test_partial_document_import() {
+ $xml = <<<XML
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/1999/xhtml" xmlns:test="https://php.net/test" xmlns:example="https://php.net/example">
+<div>
+ Test-Text
+ <example:p>More test text</example:p>
+ <test:p>Even more test text</test:p>
+</div>
+</feed>
+XML;
+
+ $dom = new DOMDocument();
+ $dom->loadXML($xml);
+
+ $dom2 = new DOMDocument();
+ $dom2->loadXML('<?xml version="1.0"?><container xmlns:test="https://php.net/test" xmlns="https://php.net/example"/>');
+ $importedNode = $dom2->importNode($dom->documentElement, true);
+ $dom2->documentElement->appendChild($importedNode);
+
+ // Freeing the original document shouldn't break the other document
+ unset($importedNode);
+ unset($dom);
+
+ echo $dom2->saveXML();
+}
+
+function test_document_import_with_attributes() {
+ $dom = new DOMDocument();
+ $dom->loadXML('<?xml version="1.0"?><div xmlns="https://php.net/default" xmlns:example="https://php.net/example"></div>');
+ $dom2 = new DOMDocument();
+ $dom2->loadXML('<?xml version="1.0"?><div xmlns:example="https://php.net/somethingelse"/>');
+ $dom2->documentElement->appendChild($dom2->importNode($dom->documentElement->firstChild));
+ echo $dom2->saveXML(), "\n";
+
+ $dom2->documentElement->firstChild->appendChild($dom2->importNode($dom->documentElement->firstChild->nextSibling));
+ echo $dom2->saveXML(), "\n";
+}
+
+function test_appendChild_with_shadowing() {
+ $dom = new DOMDocument();
+ $dom->loadXML('<?xml version="1.0"?><container xmlns:default="http://php.net/default"><a xmlns:foo="http://php.net/bar"/><default:test foo:bar=""/><foo:test2/></container>');
+
+ $a = $dom->documentElement->firstElementChild;
+ $b = $a->nextSibling;
+ $b->remove();
+ $a->appendChild($b);
+
+ echo $dom->saveXML(), "\n";
+}
+
+echo "-- Test document fragment with import --\n";
+test_document_fragment_with_import();
+echo "-- Test document fragment without import --\n";
+test_document_fragment_without_import();
+echo "-- Test document import --\n";
+test_document_import();
+echo "-- Test partial document import --\n";
+test_partial_document_import();
+echo "-- Test document import with attributes --\n";
+test_document_import_with_attributes();
+echo "-- Test appendChild with shadowing --\n";
+test_appendChild_with_shadowing();
+
+?>
+--EXPECT--
+-- Test document fragment with import --
+<?xml version="1.0"?>
+<html xmlns="https://php.net/something" xmlns:ns="https://php.net/whatever"><element ns:foo="https://php.net/bar"/></html>
+-- Test document fragment without import --
+<?xml version="1.0"?>
+<html xmlns=""><element xmlns:foo="https://php.net/bar"><foo:bar/><bar xmlns=""/></element></html>
+string(7) "foo:bar"
+string(19) "https://php.net/bar"
+-- Test document import --
+<?xml version="1.0"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+<div xmlns="http://www.w3.org/1999/xhtml">
+ Test-Text
+</div>
+</feed>
+-- Test partial document import --
+<?xml version="1.0"?>
+<container xmlns:test="https://php.net/test" xmlns="https://php.net/example"><feed xmlns="http://www.w3.org/1999/xhtml" xmlns:example="https://php.net/example">
+<div>
+ Test-Text
+ <example:p>More test text</example:p>
+ <test:p>Even more test text</test:p>
+</div>
+</feed></container>
+-- Test document import with attributes --
+<?xml version="1.0"?>
+<div xmlns:example="https://php.net/somethingelse"></div>
+
+<?xml version="1.0"?>
+<div xmlns:example="https://php.net/somethingelse"></div>
+
+-- Test appendChild with shadowing --
+<?xml version="1.0"?>
+<container xmlns:default="http://php.net/default"><a xmlns:foo="http://php.net/bar"><default:test foo:bar=""/><foo:test2/></a></container>

php-8.1.21.tar.xz/ext/dom/tests/bug47847.phpt Added

php-8.1.21.tar.xz/ext/dom/tests/bug55294.phpt Added

php-8.1.21.tar.xz/ext/dom/tests/bug67440.phpt Added

@@ -0,0 +1,151 @@
+--TEST--
+Bug #67440 (append_node of a DOMDocumentFragment does not reconcile namespaces)
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+
+function createDocument() {
+ $document = new DOMDocument();
+ $document->loadXML('<?xml version="1.0"?><rootElement xmlns:myns="http://example/ns" xmlns:myns2="http://example/ns2"></rootElement>');
+ $fragment = $document->createDocumentFragment();
+ $fragment->appendChild($document->createTextNode("\n"));
+ $fragment->appendChild($document->createElementNS('http://example/ns', 'myns:childNode', '1'));
+ $fragment->appendChild($document->createTextNode("\n"));
+ $fragment->appendChild($document->createElementNS('http://example/ns', 'myns:childNode', '2'));
+ $fragment->appendChild($document->createTextNode("\n"));
+ return array($document, $fragment);
+}
+
+function case1($method) {
+ list($document, $fragment) = createDocument();
+ $document->documentElement->{$method}($fragment);
+ echo $document->saveXML();
+}
+
+function case2($method) {
+ list($document, $fragment) = createDocument();
+ $childNodes = iterator_to_array($fragment->childNodes);
+ foreach ($childNodes as $childNode) {
+ $document->documentElement->{$method}($childNode);
+ }
+ echo $document->saveXML();
+}
+
+function case3($method) {
+ list($document, $fragment) = createDocument();
+ $fragment->removeChild($fragment->firstChild);
+ $document->documentElement->{$method}($fragment);
+ echo $document->saveXML();
+}
+
+function case4($method) {
+ list($document, $fragment) = createDocument();
+ $fragment->childNodes1->appendChild($document->createElementNS('http://example/ns2', 'myns2:childNode', '3'));
+ $document->documentElement->{$method}($fragment);
+ echo $document->saveXML();
+}
+
+echo "== appendChild ==\n";
+echo "-- fragment to document element --\n"; case1('appendChild'); echo "\n";
+echo "-- children manually document element --\n"; case2('appendChild'); echo "\n";
+echo "-- fragment to document where first element is not a text node --\n"; case3('appendChild'); echo "\n";
+echo "-- fragment with namespace declarations in children --\n"; case4('appendChild'); echo "\n";
+
+echo "== insertBefore ==\n";
+echo "-- fragment to document element --\n"; case1('insertBefore'); echo "\n";
+echo "-- children manually document element --\n"; case2('insertBefore'); echo "\n";
+echo "-- fragment to document where first element is not a text node --\n"; case3('insertBefore'); echo "\n";
+echo "-- fragment with namespace declarations in children --\n"; case4('insertBefore'); echo "\n";
+
+echo "== insertAfter ==\n";
+echo "-- fragment to document element --\n"; case1('insertBefore'); echo "\n";
+echo "-- children manually document element --\n"; case2('insertBefore'); echo "\n";
+echo "-- fragment to document where first element is not a text node --\n"; case3('insertBefore'); echo "\n";
+echo "-- fragment with namespace declarations in children --\n"; case4('insertBefore'); echo "\n";
+
+?>
+--EXPECT--
+== appendChild ==
+-- fragment to document element --
+<?xml version="1.0"?>
+<rootElement xmlns:myns="http://example/ns" xmlns:myns2="http://example/ns2">
+<myns:childNode>1</myns:childNode>
+<myns:childNode>2</myns:childNode>
+</rootElement>
+
+-- children manually document element --
+<?xml version="1.0"?>
+<rootElement xmlns:myns="http://example/ns" xmlns:myns2="http://example/ns2">
+<myns:childNode>1</myns:childNode>
+<myns:childNode>2</myns:childNode>
+</rootElement>
+
+-- fragment to document where first element is not a text node --
+<?xml version="1.0"?>
+<rootElement xmlns:myns="http://example/ns" xmlns:myns2="http://example/ns2"><myns:childNode>1</myns:childNode>
+<myns:childNode>2</myns:childNode>
+</rootElement>
+
+-- fragment with namespace declarations in children --
+<?xml version="1.0"?>
+<rootElement xmlns:myns="http://example/ns" xmlns:myns2="http://example/ns2">
+<myns:childNode>1<myns2:childNode>3</myns2:childNode></myns:childNode>
+<myns:childNode>2</myns:childNode>
+</rootElement>
+
+== insertBefore ==
+-- fragment to document element --
+<?xml version="1.0"?>
+<rootElement xmlns:myns="http://example/ns" xmlns:myns2="http://example/ns2">
+<myns:childNode>1</myns:childNode>
+<myns:childNode>2</myns:childNode>
+</rootElement>
+
+-- children manually document element --
+<?xml version="1.0"?>
+<rootElement xmlns:myns="http://example/ns" xmlns:myns2="http://example/ns2">
+<myns:childNode>1</myns:childNode>
+<myns:childNode>2</myns:childNode>
+</rootElement>
+
+-- fragment to document where first element is not a text node --
+<?xml version="1.0"?>
+<rootElement xmlns:myns="http://example/ns" xmlns:myns2="http://example/ns2"><myns:childNode>1</myns:childNode>
+<myns:childNode>2</myns:childNode>
+</rootElement>
+
+-- fragment with namespace declarations in children --
+<?xml version="1.0"?>
+<rootElement xmlns:myns="http://example/ns" xmlns:myns2="http://example/ns2">
+<myns:childNode>1<myns2:childNode>3</myns2:childNode></myns:childNode>
+<myns:childNode>2</myns:childNode>
+</rootElement>
+
+== insertAfter ==
+-- fragment to document element --
+<?xml version="1.0"?>
+<rootElement xmlns:myns="http://example/ns" xmlns:myns2="http://example/ns2">
+<myns:childNode>1</myns:childNode>
+<myns:childNode>2</myns:childNode>
+</rootElement>
+
+-- children manually document element --
+<?xml version="1.0"?>
+<rootElement xmlns:myns="http://example/ns" xmlns:myns2="http://example/ns2">
+<myns:childNode>1</myns:childNode>
+<myns:childNode>2</myns:childNode>
+</rootElement>
+
+-- fragment to document where first element is not a text node --
+<?xml version="1.0"?>
+<rootElement xmlns:myns="http://example/ns" xmlns:myns2="http://example/ns2"><myns:childNode>1</myns:childNode>
+<myns:childNode>2</myns:childNode>
+</rootElement>
+
+-- fragment with namespace declarations in children --
+<?xml version="1.0"?>
+<rootElement xmlns:myns="http://example/ns" xmlns:myns2="http://example/ns2">
+<myns:childNode>1<myns2:childNode>3</myns2:childNode></myns:childNode>
+<myns:childNode>2</myns:childNode>
+</rootElement>

php-8.1.13.tar.xz/ext/dom/tests/bug67949.phpt -> php-8.1.21.tar.xz/ext/dom/tests/bug67949.phpt Changed

php-8.1.21.tar.xz/ext/dom/tests/bug70359.phpt Added

@@ -0,0 +1,83 @@
+--TEST--
+Bug #70359 (print_r() on DOMAttr causes Segfault in php_libxml_node_free_list())
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+
+echo "-- Test without parent --\n";
+
+$dom = new DOMDocument();
+$dom->loadXML(<<<XML
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xsi="fooooooooooooooooooooo"/>
+XML);
+$spaceNode = $dom->documentElement->getAttributeNode('xmlns');
+print_r($spaceNode);
+
+echo "-- Test with parent and non-ns attribute --\n";
+
+$dom = new DOMDocument();
+$dom->loadXML(<<<XML
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+<url xmlns:xsi="fooooooooooooooooooooo" myattrib="bar"/>
+</urlset>
+XML);
+$spaceNode = $dom->documentElement->firstElementChild->getAttributeNode('myattrib');
+var_dump($spaceNode->nodeType);
+var_dump($spaceNode->nodeValue);
+
+$dom->documentElement->firstElementChild->remove();
+try {
+ print_r($spaceNode->parentNode);
+} catch (\Error $e) {
+ echo $e->getMessage(), "\n";
+}
+
+echo "-- Test with parent and ns attribute --\n";
+
+$dom = new DOMDocument();
+$dom->loadXML(<<<XML
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+<url xmlns:xsi="fooooooooooooooooooooo" myattrib="bar"/>
+</urlset>
+XML);
+$spaceNode = $dom->documentElement->firstElementChild->getAttributeNode('xmlns:xsi');
+print_r($spaceNode);
+
+$dom->documentElement->firstElementChild->remove();
+var_dump($spaceNode->parentNode->nodeName); // Shouldn't crash
+
+?>
+--EXPECT--
+-- Test without parent --
+DOMNameSpaceNode Object
+(
+ nodeName => xmlns
+ nodeValue => http://www.sitemaps.org/schemas/sitemap/0.9
+ nodeType => 18
+ prefix => 
+ localName => xmlns
+ namespaceURI => http://www.sitemaps.org/schemas/sitemap/0.9
+ ownerDocument => (object value omitted)
+ parentNode => (object value omitted)
+)
+-- Test with parent and non-ns attribute --
+int(2)
+string(3) "bar"
+Couldn't fetch DOMAttr. Node no longer exists
+-- Test with parent and ns attribute --
+DOMNameSpaceNode Object
+(
+ nodeName => xmlns:xsi
+ nodeValue => fooooooooooooooooooooo
+ nodeType => 18
+ prefix => xsi
+ localName => xsi
+ namespaceURI => fooooooooooooooooooooo
+ ownerDocument => (object value omitted)
+ parentNode => (object value omitted)
+)
+string(3) "url"

php-8.1.21.tar.xz/ext/dom/tests/bug77686.phpt Added

@@ -0,0 +1,40 @@
+--TEST--
+Bug #77686 (Removed elements are still returned by getElementById)
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+
+$doc = new DOMDocument;
+$doc->loadHTML('<html id="htmlelement"><body id="x">before<div id="y">hello</div>after</body></html>');
+$body = $doc->getElementById('x');
+$div = $doc->getElementById('y');
+var_dump($doc->getElementById('y')->textContent);
+
+// Detached from document, should not find it anymore
+$body->removeChild($div);
+var_dump($doc->getElementById('y'));
+
+// Added again, should find it
+$body->appendChild($div);
+var_dump($doc->getElementById('y')->textContent);
+
+// Should find root element without a problem
+var_dump($doc->getElementById('htmlelement')->textContent);
+
+// Created element but not yet attached, should not find it before it is added
+$new_element = $doc->createElement('p');
+$new_element->textContent = 'my new text';
+$new_element->setAttribute('id', 'myp');
+var_dump($doc->getElementById('myp'));
+$body->appendChild($new_element);
+var_dump($doc->getElementById('myp')->textContent);
+
+?>
+--EXPECT--
+string(5) "hello"
+NULL
+string(5) "hello"
+string(16) "beforeafterhello"
+NULL
+string(11) "my new text"

php-8.1.21.tar.xz/ext/dom/tests/bug78577.phpt Added

php-8.1.21.tar.xz/ext/dom/tests/bug80332_1.phpt Added

@@ -0,0 +1,84 @@
+--TEST--
+Bug #80332 (Completely broken array access functionality with DOMNamedNodeMap) - DOMNamedNodeMap variation
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+
+$doc = new DOMDocument;
+
+$doc->loadHTML('');
+
+$x = new DOMXPath($doc);
+$span = $x->query('//span')0;
+
+print "Node name: {$span->nodeName}\n";
+
+function test($span, $key) {
+ $key_formatted = match ($key) {
+ false => 'false',
+ true => 'true',
+ null => 'null',
+ default => is_string($key) ? "'$key'" : $key,
+ };
+ echo "Attribute {$key_formatted} name: ", $span->attributes$key->nodeName ?? '/', "\n";
+ echo "Attribute {$key_formatted} value: ", $span->attributes$key->nodeValue ?? '/', "\n";
+ echo "Attribute {$key_formatted} isset: ", isset($span->attributes$key) ? "yes" : "no", "\n";
+ echo "\n";
+}
+
+test($span, 0);
+test($span, false);
+test($span, true);
+test($span, null);
+test($span, 'attr2');
+// This one should fail because there is no 'hi' attribute
+test($span, 'hi');
+test($span, '0');
+test($span, '0.5');
+test($span, '1');
+// This one should fail because it's out of bounds
+test($span, '2147483647');
+
+?>
+--EXPECT--
+Node name: span
+Attribute 0 name: attr1
+Attribute 0 value: value1
+Attribute 0 isset: yes
+
+Attribute false name: attr1
+Attribute false value: value1
+Attribute false isset: yes
+
+Attribute true name: attr2
+Attribute true value: value2
+Attribute true isset: yes
+
+Attribute null name: attr1
+Attribute null value: value1
+Attribute null isset: yes
+
+Attribute 'attr2' name: attr2
+Attribute 'attr2' value: value2
+Attribute 'attr2' isset: yes
+
+Attribute 'hi' name: /
+Attribute 'hi' value: /
+Attribute 'hi' isset: no
+
+Attribute '0' name: attr1
+Attribute '0' value: value1
+Attribute '0' isset: yes
+
+Attribute '0.5' name: attr1
+Attribute '0.5' value: value1
+Attribute '0.5' isset: yes
+
+Attribute '1' name: attr2
+Attribute '1' value: value2
+Attribute '1' isset: yes
+
+Attribute '2147483647' name: /
+Attribute '2147483647' value: /
+Attribute '2147483647' isset: no

php-8.1.21.tar.xz/ext/dom/tests/bug80332_2.phpt Added

@@ -0,0 +1,47 @@
+--TEST--
+Bug #80332 (Completely broken array access functionality with DOMNamedNodeMap) - DOMNodeList variation
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+
+$doc = new DOMDocument;
+$doc->loadXML('<?xml version="1.0"?>');
+
+$list = $doc->getElementsByTagName('strong');
+
+function test($list, $key) {
+ $key_formatted = match ($key) {
+ false => 'false',
+ true => 'true',
+ null => 'null',
+ default => is_string($key) ? "'$key'" : $key,
+ };
+ echo "list$key_formatted id attribute: ", $list$key ? $list$key->getAttribute('id') : '/', "\n";
+}
+
+test($list, 0);
+test($list, false);
+test($list, true);
+test($list, null);
+test($list, '0');
+test($list, '0.5');
+test($list, '1');
+// These two should fail because there's no named lookup possible here
+test($list, 'attr2');
+test($list, 'hi');
+// This one should fail because it's out of bounds
+test($list, '2147483647');
+
+?>
+--EXPECT--
+list0 id attribute: 1
+listfalse id attribute: 1
+listtrue id attribute: 2
+listnull id attribute: 1
+list'0' id attribute: 1
+list'0.5' id attribute: 1
+list'1' id attribute: 2
+list'attr2' id attribute: /
+list'hi' id attribute: /
+list'2147483647' id attribute: /

php-8.1.21.tar.xz/ext/dom/tests/bug80602.phpt Added

@@ -0,0 +1,178 @@
+--TEST--
+Bug #80602 (Segfault when using DOMChildNode::before())
+--FILE--
+<?php
+declare(strict_types=1);
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->firstChild;
+$target->before($target);
+echo "1 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->lastChild;
+$target->before($target);
+echo "2 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->firstChild;
+$target->before($doc->documentElement->lastChild);
+echo "3 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->lastChild;
+$target->before($doc->documentElement->firstChild);
+echo "4 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->firstChild;
+$target->before($target, $doc->documentElement->lastChild);
+echo "5 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->firstChild;
+$target->before($doc->documentElement->lastChild, $target);
+echo "6 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->lastChild;
+$target->before($target, $doc->documentElement->firstChild);
+echo "7 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->lastChild;
+$target->before($doc->documentElement->firstChild, $target);
+echo "8 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->firstChild;
+$target->before('bar','baz');
+echo "9 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->lastChild;
+$target->before('bar','baz');
+echo "10 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->firstChild;
+$target->before($target, 'bar','baz');
+echo "11 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->firstChild;
+$target->before('bar', $target, 'baz');
+echo "12 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->firstChild;
+$target->before('bar', 'baz', $target);
+echo "13 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->lastChild;
+$target->before($target, 'bar','baz');
+echo "14 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->lastChild;
+$target->before('bar', $target, 'baz');
+echo "15 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->lastChild;
+$target->before('bar', 'baz', $target);
+echo "16 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->firstChild;
+$target->before('bar', $target, $doc->documentElement->lastChild);
+echo "17 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->firstChild;
+$target->before($target, 'bar', $doc->documentElement->lastChild);
+echo "18 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->firstChild;
+$target->before($target, $doc->documentElement->lastChild, 'bar');
+echo "19 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+
+
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->lastChild;
+$target->before('bar', $doc->documentElement->firstChild, $target);
+echo "20 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->lastChild;
+$target->before($doc->documentElement->firstChild, 'bar', $target);
+echo "21 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->lastChild;
+$target->before($doc->documentElement->firstChild, $target, 'bar');
+echo "22 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+?>
+--EXPECTF--
+1 <a>foo<last/></a>
+2 <a>foo<last/></a>
+3 <a><last/>foo</a>
+4 <a>foo<last/></a>
+5 <a>foo<last/></a>
+6 <a><last/>foo</a>
+7 <a><last/>foo</a>
+8 <a>foo<last/></a>
+9 <a>barbazfoo<last/></a>
+10 <a>foobarbaz<last/></a>
+11 <a>foobarbaz<last/></a>
+12 <a>barfoobaz<last/></a>
+13 <a>barbazfoo<last/></a>
+14 <a>foo<last/>barbaz</a>
+15 <a>foobar<last/>baz</a>
+16 <a>foobarbaz<last/></a>
+17 <a>barfoo<last/></a>
+18 <a>foobar<last/></a>
+19 <a>foo<last/>bar</a>
+20 <a>barfoo<last/></a>
+21 <a>foobar<last/></a>
+22 <a>foo<last/>bar</a>

php-8.1.21.tar.xz/ext/dom/tests/bug80602_2.phpt Added

@@ -0,0 +1,178 @@
+--TEST--
+Bug #80602 (Segfault when using DOMChildNode::after())
+--FILE--
+<?php
+declare(strict_types=1);
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->firstChild;
+$target->after($target);
+echo "1 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->lastChild;
+$target->after($target);
+echo "2 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->firstChild;
+$target->after($doc->documentElement->lastChild);
+echo "3 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->lastChild;
+$target->after($doc->documentElement->firstChild);
+echo "4 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->firstChild;
+$target->after($target, $doc->documentElement->lastChild);
+echo "5 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->firstChild;
+$target->after($doc->documentElement->lastChild, $target);
+echo "6 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->lastChild;
+$target->after($target, $doc->documentElement->firstChild);
+echo "7 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->lastChild;
+$target->after($doc->documentElement->firstChild, $target);
+echo "8 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->firstChild;
+$target->after('bar','baz');
+echo "9 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->lastChild;
+$target->after('bar','baz');
+echo "10 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->firstChild;
+$target->after($target, 'bar','baz');
+echo "11 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->firstChild;
+$target->after('bar', $target, 'baz');
+echo "12 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->firstChild;
+$target->after('bar', 'baz', $target);
+echo "13 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->lastChild;
+$target->after($target, 'bar','baz');
+echo "14 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->lastChild;
+$target->after('bar', $target, 'baz');
+echo "15 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->lastChild;
+$target->after('bar', 'baz', $target);
+echo "16 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->firstChild;
+$target->after('bar', $target, $doc->documentElement->lastChild);
+echo "17 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->firstChild;
+$target->after($target, 'bar', $doc->documentElement->lastChild);
+echo "18 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->firstChild;
+$target->after($target, $doc->documentElement->lastChild, 'bar');
+echo "19 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+
+
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->lastChild;
+$target->after('bar', $doc->documentElement->firstChild, $target);
+echo "20 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->lastChild;
+$target->after($doc->documentElement->firstChild, 'bar', $target);
+echo "21 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->lastChild;
+$target->after($doc->documentElement->firstChild, $target, 'bar');
+echo "22 ", $doc->saveXML($doc->documentElement).PHP_EOL;
+
+?>
+--EXPECTF--
+1 <a>foo<last/></a>
+2 <a>foo<last/></a>
+3 <a>foo<last/></a>
+4 <a><last/>foo</a>
+5 <a>foo<last/></a>
+6 <a><last/>foo</a>
+7 <a><last/>foo</a>
+8 <a>foo<last/></a>
+9 <a>foobarbaz<last/></a>
+10 <a>foo<last/>barbaz</a>
+11 <a>foobarbaz<last/></a>
+12 <a>barfoobaz<last/></a>
+13 <a>barbazfoo<last/></a>
+14 <a>foo<last/>barbaz</a>
+15 <a>foobar<last/>baz</a>
+16 <a>foobarbaz<last/></a>
+17 <a>barfoo<last/></a>
+18 <a>foobar<last/></a>
+19 <a>foo<last/>bar</a>
+20 <a>barfoo<last/></a>
+21 <a>foobar<last/></a>
+22 <a>foo<last/>bar</a>

php-8.1.21.tar.xz/ext/dom/tests/bug80602_3.phpt Added

@@ -0,0 +1,120 @@
+--TEST--
+Bug #80602 (Segfault when using DOMChildNode::before()) - use-after-free variation
+--FILE--
+<?php
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->lastChild;
+$target->before('bar', $doc->documentElement->firstChild, 'baz');
+echo $doc->saveXML($doc->documentElement), "\n";
+var_dump($target);
+
+$doc = new \DOMDocument();
+$doc->loadXML('<a>foo<last/></a>');
+$target = $doc->documentElement->lastChild;
+// Note: after instead of before
+$target->after('bar', $doc->documentElement->firstChild, 'baz');
+echo $doc->saveXML($doc->documentElement), "\n";
+var_dump($target);
+
+?>
+--EXPECTF--
+<a>barfoobaz<last/></a>
+object(DOMElement)#3 (23) {
+ "schemaTypeInfo"=>
+ NULL
+ "tagName"=>
+ string(4) "last"
+ "firstElementChild"=>
+ NULL
+ "lastElementChild"=>
+ NULL
+ "childElementCount"=>
+ int(0)
+ "previousElementSibling"=>
+ NULL
+ "nextElementSibling"=>
+ NULL
+ "nodeName"=>
+ string(4) "last"
+ "nodeValue"=>
+ string(0) ""
+ "nodeType"=>
+ int(1)
+ "parentNode"=>
+ string(22) "(object value omitted)"
+ "childNodes"=>
+ string(22) "(object value omitted)"
+ "firstChild"=>
+ NULL
+ "lastChild"=>
+ NULL
+ "previousSibling"=>
+ string(22) "(object value omitted)"
+ "nextSibling"=>
+ NULL
+ "attributes"=>
+ string(22) "(object value omitted)"
+ "ownerDocument"=>
+ string(22) "(object value omitted)"
+ "namespaceURI"=>
+ NULL
+ "prefix"=>
+ string(0) ""
+ "localName"=>
+ string(4) "last"
+ "baseURI"=>
+ string(%d) %s
+ "textContent"=>
+ string(0) ""
+}
+<a><last/>barfoobaz</a>
+object(DOMElement)#2 (23) {
+ "schemaTypeInfo"=>
+ NULL
+ "tagName"=>
+ string(4) "last"
+ "firstElementChild"=>
+ NULL
+ "lastElementChild"=>
+ NULL
+ "childElementCount"=>
+ int(0)
+ "previousElementSibling"=>
+ NULL
+ "nextElementSibling"=>
+ NULL
+ "nodeName"=>
+ string(4) "last"
+ "nodeValue"=>
+ string(0) ""
+ "nodeType"=>
+ int(1)
+ "parentNode"=>
+ string(22) "(object value omitted)"
+ "childNodes"=>
+ string(22) "(object value omitted)"
+ "firstChild"=>
+ NULL
+ "lastChild"=>
+ NULL
+ "previousSibling"=>
+ NULL
+ "nextSibling"=>
+ string(22) "(object value omitted)"
+ "attributes"=>
+ string(22) "(object value omitted)"
+ "ownerDocument"=>
+ string(22) "(object value omitted)"
+ "namespaceURI"=>
+ NULL
+ "prefix"=>
+ string(0) ""
+ "localName"=>
+ string(4) "last"
+ "baseURI"=>
+ string(%d) %s
+ "textContent"=>
+ string(0) ""
+}

php-8.1.21.tar.xz/ext/dom/tests/bug80602_4.phpt Added

php-8.1.21.tar.xz/ext/dom/tests/bug81642.phpt Added

@@ -0,0 +1,49 @@
+--TEST--
+Bug #81642 (DOMChildNode::replaceWith() bug when replacing a node with itself)
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+
+// Replace with itself
+$doc = new DOMDocument();
+$doc->appendChild($target = $doc->createElement('test'));
+$target->replaceWith($target);
+var_dump($doc->saveXML());
+
+// Replace with itself + another element
+$doc = new DOMDocument();
+$doc->appendChild($target = $doc->createElement('test'));
+$target->replaceWith($target, $doc->createElement('foo'));
+var_dump($doc->saveXML());
+
+// Replace with text node
+$doc = new DOMDocument();
+$doc->appendChild($target = $doc->createElement('test'));
+$target->replaceWith($target, 'foo');
+var_dump($doc->saveXML());
+
+// Replace with text node variant 2
+$doc = new DOMDocument();
+$doc->appendChild($target = $doc->createElement('test'));
+$target->replaceWith('bar', $target, 'foo');
+var_dump($doc->saveXML());
+
+?>
+--EXPECT--
+string(30) "<?xml version="1.0"?>
+<test/>
+"
+string(37) "<?xml version="1.0"?>
+<test/>
+<foo/>
+"
+string(34) "<?xml version="1.0"?>
+<test/>
+foo
+"
+string(38) "<?xml version="1.0"?>
+bar
+<test/>
+foo
+"

php-8.1.21.tar.xz/ext/dom/tests/bug_lifetime_parentNode_getAttributeNodeNS.phpt Added

php-8.1.21.tar.xz/ext/dom/tests/clone_nodes.phpt Added

@@ -0,0 +1,72 @@
+--TEST--
+Clone nodes
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+
+echo "-- Clone DOMNameSpaceNode --\n";
+
+$doc = new DOMDocument;
+$doc->loadXML('<foo xmlns="http://php.net/test" xmlns:foo="urn:foo" />');
+
+$attr = $doc->documentElement->getAttributeNode('xmlns');
+var_dump($attr);
+
+$attrClone = clone $attr;
+var_dump($attrClone->nodeValue);
+var_dump($attrClone->parentNode->nodeName);
+
+unset($doc);
+unset($attr);
+
+var_dump($attrClone->nodeValue);
+var_dump($attrClone->parentNode->nodeName);
+
+echo "-- Clone DOMNode --\n";
+
+$doc = new DOMDocument;
+$doc->loadXML('<foo><bar/></foo>');
+
+$bar = $doc->documentElement->firstChild;
+$barClone = clone $bar;
+$bar->remove();
+unset($bar);
+
+var_dump($barClone->nodeName);
+
+$doc->firstElementChild->remove();
+unset($doc);
+
+var_dump($barClone->nodeName);
+var_dump($barClone->parentNode);
+
+?>
+--EXPECT--
+-- Clone DOMNameSpaceNode --
+object(DOMNameSpaceNode)#3 (8) {
+ "nodeName"=>
+ string(5) "xmlns"
+ "nodeValue"=>
+ string(19) "http://php.net/test"
+ "nodeType"=>
+ int(18)
+ "prefix"=>
+ string(0) ""
+ "localName"=>
+ string(5) "xmlns"
+ "namespaceURI"=>
+ string(19) "http://php.net/test"
+ "ownerDocument"=>
+ string(22) "(object value omitted)"
+ "parentNode"=>
+ string(22) "(object value omitted)"
+}
+string(19) "http://php.net/test"
+string(3) "foo"
+string(19) "http://php.net/test"
+string(3) "foo"
+-- Clone DOMNode --
+string(3) "bar"
+string(3) "bar"
+NULL

php-8.1.21.tar.xz/ext/dom/tests/gh10234.phpt Added

@@ -0,0 +1,93 @@
+--TEST--
+GH-10234 (Setting DOMAttr::textContent results in an empty attribute value.)
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+$document = new DOMDocument();
+$document->loadXML('<element attribute="value"/>');
+$attribute = $document->documentElement->getAttributeNode('attribute');
+
+echo "-- Attribute tests --\n";
+
+var_dump($document->saveHTML());
+var_dump($attribute->textContent);
+
+$attribute->textContent = 'new value';
+var_dump($attribute->textContent);
+var_dump($document->saveHTML());
+
+$attribute->textContent = 'hello & world';
+var_dump($attribute->textContent);
+var_dump($document->saveHTML());
+
+$attribute->textContent = 'hi';
+var_dump($attribute->textContent);
+var_dump($document->saveHTML());
+
+$attribute->textContent = 'quote "test"';
+var_dump($attribute->textContent);
+var_dump($document->saveHTML());
+
+$attribute->textContent = "quote 'test'";
+var_dump($attribute->textContent);
+var_dump($document->saveHTML());
+
+$attribute->textContent = "quote '\"test\"'";
+var_dump($attribute->textContent);
+var_dump($document->saveHTML());
+
+echo "-- Document element tests --\n";
+
+$document->documentElement->textContent = 'hello & world';
+var_dump($document->documentElement->textContent);
+var_dump($document->saveHTML());
+
+$document->documentElement->textContent = 'hi';
+var_dump($document->documentElement->textContent);
+var_dump($document->saveHTML());
+
+$document->documentElement->textContent = 'quote "test"';
+var_dump($document->documentElement->textContent);
+var_dump($document->saveHTML());
+
+$document->documentElement->textContent = "quote 'test'";
+var_dump($document->documentElement->textContent);
+var_dump($document->saveHTML());
+?>
+--EXPECT--
+-- Attribute tests --
+string(38) "<element attribute="value"></element>
+"
+string(5) "value"
+string(9) "new value"
+string(42) "<element attribute="new value"></element>
+"
+string(13) "hello & world"
+string(50) "<element attribute="hello &amp; world"></element>
+"
+string(9) "hi"
+string(54) "<element attribute="&lt;b&gt;hi&lt;/b&gt;"></element>
+"
+string(12) "quote "test""
+string(45) "<element attribute='quote "test"'></element>
+"
+string(12) "quote 'test'"
+string(45) "<element attribute="quote 'test'"></element>
+"
+string(14) "quote '"test"'"
+string(57) "<element attribute="quote '&quot;test&quot;'"></element>
+"
+-- Document element tests --
+string(13) "hello & world"
+string(74) "<element attribute="quote '&quot;test&quot;'">hello &amp; world</element>
+"
+string(9) "hi"
+string(78) "<element attribute="quote '&quot;test&quot;'">&lt;b&gt;hi&lt;/b&gt;</element>
+"
+string(12) "quote "test""
+string(69) "<element attribute="quote '&quot;test&quot;'">quote "test"</element>
+"
+string(12) "quote 'test'"
+string(69) "<element attribute="quote '&quot;test&quot;'">quote 'test'</element>
+"

php-8.1.21.tar.xz/ext/dom/tests/gh11288.phpt Added

@@ -0,0 +1,67 @@
+--TEST--
+GH-11288 (Error: Couldn't fetch DOMElement introduced in 8.2.6, 8.1.19)
+--FILE--
+<?php
+$html = <<<HTML
+<!DOCTYPE HTML>
+<html>
+Loremipsum
+</html>
+HTML;
+
+$dom = new DOMDocument();
+$dom->loadHTML($html);
+
+$spans = iterator_to_array($dom->getElementsByTagName('span')->getIterator());
+foreach ($spans as $span) {
+ if ('unwrap_me' === $span->getAttribute('class')) {
+ $fragment = $dom->createDocumentFragment();
+ $fragment->append(...$span->childNodes);
+ $span->parentNode?->replaceChild($fragment, $span);
+ }
+}
+
+var_dump(str_replace("\n", "", $dom->saveHTML()));
+
+$html = <<<HTML
+<!DOCTYPE HTML>
+<html>
+Loremipsum
+</html>
+HTML;
+
+$dom = new DOMDocument();
+$dom->loadHTML($html);
+
+$spans = iterator_to_array($dom->getElementsByTagName('span')->getIterator());
+foreach ($spans as $span) {
+ if ('unwrap_me' === $span->getAttribute('class')) {
+ $span->replaceWith(...$span->childNodes);
+ }
+}
+
+var_dump(str_replace("\n", "", $dom->saveHTML()));
+
+$html = <<<HTML
+<!DOCTYPE HTML>
+<html>
+Loremipsum
+</html>
+HTML;
+
+$dom = new DOMDocument();
+$dom->loadHTML($html);
+
+$spans = iterator_to_array($dom->getElementsByTagName('span')->getIterator());
+foreach ($spans as $span) {
+ if ('unwrap_me' === $span->getAttribute('class')) {
+ $span->replaceWith('abc');
+ }
+}
+
+var_dump(str_replace("\n", "", $dom->saveHTML()));
+?>
+--EXPECT--
+string(108) "<!DOCTYPE HTML><html><body>Loremipsum</body></html>"
+string(108) "<!DOCTYPE HTML><html><body>Loremipsum</body></html>"
+string(44) "<!DOCTYPE HTML><html><body>abc</body></html>"

php-8.1.21.tar.xz/ext/dom/tests/gh11289.phpt Added

php-8.1.21.tar.xz/ext/dom/tests/gh11290.phpt Added

php-8.1.21.tar.xz/ext/dom/tests/gh11347.phpt Added

php-8.1.21.tar.xz/ext/dom/tests/gh9142.phpt Added

php-8.1.13.tar.xz/ext/dom/tests/xpath_domnamespacenode.phpt -> php-8.1.21.tar.xz/ext/dom/tests/xpath_domnamespacenode.phpt Changed

php-8.1.21.tar.xz/ext/dom/tests/xpath_domnamespacenode_advanced.phpt Added

@@ -0,0 +1,75 @@
+--TEST--
+DOMXPath::query() can return DOMNodeList with DOMNameSpaceNode items - advanced variation
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+
+$dom = new DOMDocument();
+$dom->loadXML(<<<'XML'
+<root xmlns:foo="http://example.com/foo" xmlns:bar="http://example.com/bar">
+ <child xmlns:baz="http://example.com/baz">Hello PHP!</child>
+</root>
+XML);
+
+$xpath = new DOMXPath($dom);
+$query = '//namespace::*';
+
+echo "-- All namespace attributes --\n";
+
+foreach ($xpath->query($query) as $attribute) {
+ echo $attribute->nodeName . ' = ' . $attribute->nodeValue . PHP_EOL;
+ var_dump($attribute->parentNode->tagName);
+}
+
+echo "-- All namespace attributes with removal attempt --\n";
+
+foreach ($xpath->query($query) as $attribute) {
+ echo "Before: ", $attribute->parentNode->tagName, "\n";
+ // Second & third attempt should fail because it's no longer in the document
+ try {
+ $attribute->parentNode->remove();
+ } catch (\DOMException $e) {
+ echo $e->getMessage(), "\n";
+ }
+ // However, it should not cause a use-after-free
+ echo "After: ", $attribute->parentNode->tagName, "\n";
+}
+
+?>
+--EXPECT--
+-- All namespace attributes --
+xmlns:xml = http://www.w3.org/XML/1998/namespace
+string(4) "root"
+xmlns:bar = http://example.com/bar
+string(4) "root"
+xmlns:foo = http://example.com/foo
+string(4) "root"
+xmlns:xml = http://www.w3.org/XML/1998/namespace
+string(5) "child"
+xmlns:bar = http://example.com/bar
+string(5) "child"
+xmlns:foo = http://example.com/foo
+string(5) "child"
+xmlns:baz = http://example.com/baz
+string(5) "child"
+-- All namespace attributes with removal attempt --
+Before: root
+After: root
+Before: root
+Not Found Error
+After: root
+Before: root
+Not Found Error
+After: root
+Before: child
+After: child
+Before: child
+Not Found Error
+After: child
+Before: child
+Not Found Error
+After: child
+Before: child
+Not Found Error
+After: child

php-8.1.13.tar.xz/ext/dom/xpath.c -> php-8.1.21.tar.xz/ext/dom/xpath.c Changed

@@ -101,24 +101,18 @@
 							zval child;
 							/* not sure, if we need this... it's copied from xpath.c */
 							if (node->type == XML_NAMESPACE_DECL) {
-								xmlNsPtr curns;
-								xmlNodePtr nsparent;
-
-								nsparent = node->_private;
-								curns = xmlNewNs(NULL, node->name, NULL);
-								if (node->children) {
-									curns->prefix = xmlStrdup((xmlChar *) node->children);
-								}
-								if (node->children) {
-									node = xmlNewDocNode(node->doc, NULL, (xmlChar *) node->children, node->name);
-								} else {
-									node = xmlNewDocNode(node->doc, NULL, (xmlChar *) "xmlns", node->name);
-								}
-								node->type = XML_NAMESPACE_DECL;
-								node->parent = nsparent;
-								node->ns = curns;
+								xmlNodePtr nsparent = node->_private;
+								xmlNsPtr original = (xmlNsPtr) node;
+
+								/* Make sure parent dom object exists, so we can take an extra reference. */
+								zval parent_zval; /* don't destroy me, my lifetime is transfered to the fake namespace decl */
+								php_dom_create_object(nsparent, &parent_zval, &intern->dom);
+								dom_object *parent_intern = Z_DOMOBJ_P(&parent_zval);
+
+								node = php_dom_create_fake_namespace_decl(nsparent, original, &child, parent_intern);
+							} else {
+								php_dom_create_object(node, &child, &intern->dom);
 							}
-							php_dom_create_object(node, &child, &intern->dom);
 							add_next_index_zval(&fci.paramsi, &child);
 						}
 					} else {
@@ -182,7 +176,7 @@
 	}
 cleanup:
 	zend_string_release_ex(callable, 0);
-	zval_ptr_dtor_str(&fci.function_name);
+	zval_ptr_dtor_nogc(&fci.function_name);
 	if (fci.param_count > 0) {
 		for (i = 0; i < nargs - 1; i++) {
 			zval_ptr_dtor(&fci.paramsi);
@@ -421,24 +415,18 @@
 					zval child;
 
 					if (node->type == XML_NAMESPACE_DECL) {
-						xmlNsPtr curns;
-						xmlNodePtr nsparent;
+						xmlNodePtr nsparent = node->_private;
+						xmlNsPtr original = (xmlNsPtr) node;
 
-						nsparent = node->_private;
-						curns = xmlNewNs(NULL, node->name, NULL);
-						if (node->children) {
-							curns->prefix = xmlStrdup((xmlChar *) node->children);
-						}
-						if (node->children) {
-							node = xmlNewDocNode(docp, NULL, (xmlChar *) node->children, node->name);
-						} else {
-							node = xmlNewDocNode(docp, NULL, (xmlChar *) "xmlns", node->name);
-						}
-						node->type = XML_NAMESPACE_DECL;
-						node->parent = nsparent;
-						node->ns = curns;
+						/* Make sure parent dom object exists, so we can take an extra reference. */
+						zval parent_zval; /* don't destroy me, my lifetime is transfered to the fake namespace decl */
+						php_dom_create_object(nsparent, &parent_zval, &intern->dom);
+						dom_object *parent_intern = Z_DOMOBJ_P(&parent_zval);
+
+						node = php_dom_create_fake_namespace_decl(nsparent, original, &child, parent_intern);
+					} else {
+						php_dom_create_object(node, &child, &intern->dom);
 					}
-					php_dom_create_object(node, &child, &intern->dom);
 					add_next_index_zval(&retval, &child);
 				}
 			} else {

php-8.1.13.tar.xz/ext/exif/exif.c -> php-8.1.21.tar.xz/ext/exif/exif.c Changed

@@ -215,6 +215,25 @@
 ZEND_GET_MODULE(exif)
 #endif
 
+/* php_stream_read() may return early without reading all data, depending on the chunk size
+ * and whether it's a URL stream or not. This helper keeps reading until the requested amount
+ * is read or until there is no more data available to read. */
+static ssize_t exif_read_from_stream_file_looped(php_stream *stream, char *buf, size_t count)
+{
+	ssize_t total_read = 0;
+	while (total_read < count) {
+		ssize_t ret = php_stream_read(stream, buf + total_read, count - total_read);
+		if (ret == -1) {
+			return -1;
+		}
+		if (ret == 0) {
+			break;
+		}
+		total_read += ret;
+	}
+	return total_read;
+}
+
 /* {{{ php_strnlen
 * get length of string if buffer if less than buffer size or buffer size */
 static size_t php_strnlen(char* str, size_t maxlen) {
@@ -1277,6 +1296,9 @@
 	mn_offset_mode_t offset_mode;
 } maker_note_type;
 
+/* Some maker notes (e.g. DJI info tag) require custom parsing */
+#define REQUIRES_CUSTOM_PARSING NULL
+
 /* Remember to update PHP_MINFO if updated */
 static const maker_note_type maker_note_array = {
 { tag_table_VND_CANON, "Canon", NULL,								0, 0, MN_ORDER_INTEL, MN_OFFSET_NORMAL},
@@ -1287,6 +1309,7 @@
 { tag_table_VND_OLYMPUS, "OLYMPUS OPTICAL CO.,LTD", "OLYMP\x00\x01\x00",				8, 8, MN_ORDER_NORMAL, MN_OFFSET_NORMAL},
 { tag_table_VND_SAMSUNG, "SAMSUNG", NULL,								0, 0, MN_ORDER_NORMAL, MN_OFFSET_NORMAL},
 { tag_table_VND_PANASONIC, "Panasonic", "Panasonic\x00\x00\x00",			12, 12, MN_ORDER_NORMAL, MN_OFFSET_NORMAL},
+ { REQUIRES_CUSTOM_PARSING, "DJI", "ae_dbg_info:",					13, 13, MN_ORDER_MOTOROLA, MN_OFFSET_NORMAL},
 { tag_table_VND_DJI, "DJI", NULL,								0, 0, MN_ORDER_NORMAL, MN_OFFSET_NORMAL},
 { tag_table_VND_SONY, "SONY", "SONY DSC \x00\x00\x00",			12, 12, MN_ORDER_NORMAL, MN_OFFSET_NORMAL},
 { tag_table_VND_SONY, "SONY", NULL,								0, 0, MN_ORDER_NORMAL, MN_OFFSET_NORMAL},
@@ -3168,10 +3191,16 @@
 		return true;
 	}
 
+	if (UNEXPECTED(maker_note->tag_table == REQUIRES_CUSTOM_PARSING)) {
+		/* Custom parsing required, which is not implemented at this point
+		 * Return true so that other metadata can still be parsed. */
+		return true;
+	}
+
 	dir_start = value_ptr + maker_note->offset;
 
 #ifdef EXIF_DEBUG
-	exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "Process %s @x%04X + 0x%04X=%d: %s", exif_get_sectionname(section_index), (intptr_t)dir_start-(intptr_t)info->offset_base+maker_note->offset+displacement, value_len, value_len, exif_char_dump(value_ptr, value_len, (intptr_t)dir_start-(intptr_t)info->offset_base+maker_note->offset+displacement));
+	exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "Process %s @0x%04X + 0x%04X=%d: %s", exif_get_sectionname(section_index), (intptr_t)dir_start-(intptr_t)info->offset_base+maker_note->offset+displacement, value_len, value_len, exif_char_dump(value_ptr, value_len, (intptr_t)dir_start-(intptr_t)info->offset_base+maker_note->offset+displacement));
 #endif
 
 	ImageInfo->sections_found |= FOUND_MAKERNOTE;
@@ -3311,7 +3340,7 @@
 				exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, "Wrong file pointer: 0x%08X != 0x%08X", fgot, displacement+offset_val);
 				return false;
 			}
-			fgot = php_stream_read(ImageInfo->infile, value_ptr, byte_count);
+			fgot = exif_read_from_stream_file_looped(ImageInfo->infile, value_ptr, byte_count);
 			php_stream_seek(ImageInfo->infile, fpos, SEEK_SET);
 			if (fgot != byte_count) {
 				EFREE_IF(outside);
@@ -3330,7 +3359,7 @@
 #ifdef EXIF_DEBUG
 	dump_data = exif_dump_data(&dump_free, format, components, ImageInfo->motorola_intel, value_ptr);
 	exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE,
-		"Process tag(x%04X=%s,@x%04X + x%04X(=%d)): %s%s %s",
+		"Process tag(x%04X=%s,@0x%04X + x%04X(=%d)): %s%s %s",
 		tag, exif_get_tagname_debug(tag, tag_table), offset_val+displacement, byte_count, byte_count, (components>1)&&format!=TAG_FMT_UNDEFINED&&format!=TAG_FMT_STRING?"ARRAY OF ":"", exif_get_tagformat(format), dump_data);
 	if (dump_free) {
 		efree(dump_data);
@@ -3844,7 +3873,7 @@
 		Data0 = (uchar)lh;
 		Data1 = (uchar)ll;
 
-		got = php_stream_read(ImageInfo->infile, (char*)(Data+2), itemlen-2); /* Read the whole section. */
+		got = exif_read_from_stream_file_looped(ImageInfo->infile, (char*)(Data+2), itemlen-2); /* Read the whole section. */
 		if (got != itemlen-2) {
 			exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, "Error reading from file: got=x%04X(=%d) != itemlen-2=x%04X(=%d)", got, got, itemlen-2, itemlen-2);
 			return false;
@@ -3862,7 +3891,7 @@
 					size = ImageInfo->FileSize - fpos;
 					sn = exif_file_sections_add(ImageInfo, M_PSEUDO, size, NULL);
 					Data = ImageInfo->file.listsn.data;
-					got = php_stream_read(ImageInfo->infile, (char*)Data, size);
+					got = exif_read_from_stream_file_looped(ImageInfo->infile, (char*)Data, size);
 					if (got != size) {
 						EXIF_ERRLOG_FILEEOF(ImageInfo)
 						return false;
@@ -4039,7 +4068,9 @@
 		exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "Read from TIFF: filesize(x%04X), IFD dir(x%04X + x%04X)", ImageInfo->FileSize, dir_offset, 2);
 #endif
 		php_stream_seek(ImageInfo->infile, dir_offset, SEEK_SET); /* we do not know the order of sections */
-		php_stream_read(ImageInfo->infile, (char*)ImageInfo->file.listsn.data, 2);
+		if (UNEXPECTED(exif_read_from_stream_file_looped(ImageInfo->infile, (char*)ImageInfo->file.listsn.data, 2) != 2)) {
+			return false;
+		}
 		num_entries = php_ifd_get16u(ImageInfo->file.listsn.data, ImageInfo->motorola_intel);
 		dir_size = 2/*num dir entries*/ +12/*length of entry*/*(size_t)num_entries +4/* offset to next ifd (points to thumbnail or NULL)*/;
 		if (ImageInfo->FileSize >= dir_size && ImageInfo->FileSize - dir_size >= dir_offset) {
@@ -4049,7 +4080,9 @@
 			if (exif_file_sections_realloc(ImageInfo, sn, dir_size)) {
 				return false;
 			}
-			php_stream_read(ImageInfo->infile, (char*)(ImageInfo->file.listsn.data+2), dir_size-2);
+			if (UNEXPECTED(exif_read_from_stream_file_looped(ImageInfo->infile, (char*)(ImageInfo->file.listsn.data+2), dir_size-2) != dir_size - 2)) {
+				return false;
+			}
 			next_offset = php_ifd_get32u(ImageInfo->file.listsn.data + dir_size - 4, ImageInfo->motorola_intel);
 #ifdef EXIF_DEBUG
 			exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "Read from TIFF done, next offset x%04X", next_offset);
@@ -4137,7 +4170,7 @@
 #ifdef EXIF_DEBUG
 					exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "Read from TIFF: filesize(x%04X), IFD(x%04X + x%04X)", ImageInfo->FileSize, dir_offset, ifd_size);
 #endif
-					php_stream_read(ImageInfo->infile, (char*)(ImageInfo->file.listsn.data+dir_size), ifd_size-dir_size);
+					exif_read_from_stream_file_looped(ImageInfo->infile, (char*)(ImageInfo->file.listsn.data+dir_size), ifd_size-dir_size);
 #ifdef EXIF_DEBUG
 					exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "Read from TIFF, done");
 #endif
@@ -4173,7 +4206,7 @@
 						}
 						entry_offset = php_ifd_get32u(dir_entry+8, ImageInfo->motorola_intel);
 #ifdef EXIF_DEBUG
-						exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "Next IFD: %s @x%04X", exif_get_sectionname(sub_section_index), entry_offset);
+						exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_NOTICE, "Next IFD: %s @0x%04X", exif_get_sectionname(sub_section_index), entry_offset);
 #endif
 						exif_process_IFD_in_TIFF(ImageInfo, entry_offset, sub_section_index);
 						if (section_index!=SECTION_THUMBNAIL && entry_tag==TAG_SUB_IFD) {
@@ -4188,7 +4221,7 @@
 								if (!ImageInfo->Thumbnail.data) {
 									ImageInfo->Thumbnail.data = safe_emalloc(ImageInfo->Thumbnail.size, 1, 0);
 									php_stream_seek(ImageInfo->infile, ImageInfo->Thumbnail.offset, SEEK_SET);
-									fgot = php_stream_read(ImageInfo->infile, ImageInfo->Thumbnail.data, ImageInfo->Thumbnail.size);
+									fgot = exif_read_from_stream_file_looped(ImageInfo->infile, ImageInfo->Thumbnail.data, ImageInfo->Thumbnail.size);
 									if (fgot != ImageInfo->Thumbnail.size) {
 										EXIF_ERRLOG_THUMBEOF(ImageInfo)
 										efree(ImageInfo->Thumbnail.data);
@@ -4228,7 +4261,7 @@
 					if (!ImageInfo->Thumbnail.data && ImageInfo->Thumbnail.offset && ImageInfo->Thumbnail.size && ImageInfo->read_thumbnail) {
 						ImageInfo->Thumbnail.data = safe_emalloc(ImageInfo->Thumbnail.size, 1, 0);
 						php_stream_seek(ImageInfo->infile, ImageInfo->Thumbnail.offset, SEEK_SET);
-						fgot = php_stream_read(ImageInfo->infile, ImageInfo->Thumbnail.data, ImageInfo->Thumbnail.size);
+						fgot = exif_read_from_stream_file_looped(ImageInfo->infile, ImageInfo->Thumbnail.data, ImageInfo->Thumbnail.size);
 						if (fgot != ImageInfo->Thumbnail.size) {
 							EXIF_ERRLOG_THUMBEOF(ImageInfo)
 							efree(ImageInfo->Thumbnail.data);
@@ -4283,7 +4316,7 @@
 
 	if (ImageInfo->FileSize >= 2) {
 		php_stream_seek(ImageInfo->infile, 0, SEEK_SET);
-		if (php_stream_read(ImageInfo->infile, (char*)file_header, 2) != 2) {
+		if (exif_read_from_stream_file_looped(ImageInfo->infile, (char*)file_header, 2) != 2) {
 			return false;
 		}
 		if ((file_header0==0xff) && (file_header1==M_SOI)) {
@@ -4294,7 +4327,7 @@
 				exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, "Invalid JPEG file");
 			}
 		} else if (ImageInfo->FileSize >= 8) {
-			if (php_stream_read(ImageInfo->infile, (char*)(file_header+2), 6) != 6) {
+			if (exif_read_from_stream_file_looped(ImageInfo->infile, (char*)(file_header+2), 6) != 6) {
 				return false;
 			}
 			if (!memcmp(file_header, "II\x2A\x00", 4)) {

php-8.1.21.tar.xz/ext/exif/tests/gh10834.phpt Added

@@ -0,0 +1,79 @@
+--TEST--
+GH-10834 (exif_read_data() cannot read smaller stream wrapper chunk sizes)
+--EXTENSIONS--
+exif
+--FILE--
+<?php
+class VariableStream {
+	private $data;
+	private $position;
+	public $context;
+
+	function stream_close() {
+		return true;
+	}
+
+	function stream_eof() {
+		return $this->position >= strlen($this->data);
+	}
+
+	function stream_open($path, $mode, $options, &$opened_path) {
+		$this->position = 0;
+		$this->data = file_get_contents(__DIR__.'/bug50845.jpg');
+		return true;
+	}
+
+	function stream_seek($offset, $whence) {
+		switch ($whence) {
+			case SEEK_SET:
+				if ($offset < strlen($this->data) && $offset >= 0) {
+					$this->position = $offset;
+					return true;
+				} else {
+					return false;
+				}
+				break;
+			case SEEK_CUR:
+				if ($offset >= 0) {
+					$this->position += $offset;
+					return true;
+				} else {
+					return false;
+				}
+				break;
+			case SEEK_END:
+				if (strlen($this->data) + $offset >= 0) {
+					$this->position = strlen($this->data) + $offset;
+					return true;
+				} else {
+					return false;
+				}
+				break;
+			default:
+				return false;
+		}
+	}
+
+	function stream_read($count) {
+		$ret = substr($this->data, $this->position, $count);
+		$this->position += strlen($ret);
+		return $ret;
+	}
+
+	function stream_tell() {
+		return $this->position;
+	}
+}
+
+stream_wrapper_register('var', 'VariableStream');
+
+$fp = fopen('var://myvar', 'rb');
+
+stream_set_chunk_size($fp, 10);
+$headers = exif_read_data($fp);
+var_dump(is_array($headers));
+
+fclose($fp);
+?>
+--EXPECT--
+bool(true)

php-8.1.13.tar.xz/ext/ffi/ffi.c -> php-8.1.21.tar.xz/ext/ffi/ffi.c Changed

php-8.1.21.tar.xz/ext/ffi/tests/arrayPointer.phpt Added

php-8.1.21.tar.xz/ext/ffi/tests/gh10403.phpt Added

php-8.1.21.tar.xz/ext/ffi/tests/gh10568.phpt Added

php-8.1.21.tar.xz/ext/ffi/tests/trampoline_reset.phpt Added

php-8.1.13.tar.xz/ext/ftp/ftp.c -> php-8.1.21.tar.xz/ext/ftp/ftp.c Changed

php-8.1.13.tar.xz/ext/ftp/ftp.stub.php -> php-8.1.21.tar.xz/ext/ftp/ftp.stub.php Changed

php-8.1.13.tar.xz/ext/ftp/ftp_arginfo.h -> php-8.1.21.tar.xz/ext/ftp/ftp_arginfo.h Changed

php-8.1.13.tar.xz/ext/ftp/php_ftp.c -> php-8.1.21.tar.xz/ext/ftp/php_ftp.c Changed

php-8.1.13.tar.xz/ext/ftp/tests/004.phpt -> php-8.1.21.tar.xz/ext/ftp/tests/004.phpt Changed

php-8.1.21.tar.xz/ext/ftp/tests/gh10521.phpt Added

@@ -0,0 +1,39 @@
+--TEST--
+GH-10521 (ftp_get/ftp_nb_get resumepos offset is maximum 10GB)
+--EXTENSIONS--
+ftp
+pcntl
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 8) die("skip: 64-bit only");
+?>
+--FILE--
+<?php
+require 'server.inc';
+
+$ftp = ftp_connect('127.0.0.1', $port);
+if (!$ftp) die("Couldn't connect to the server");
+
+var_dump(ftp_login($ftp, 'anonymous', 'IEUser@'));
+
+$local_file = __DIR__ . DIRECTORY_SEPARATOR . "gh10521.txt";
+
+foreach (12345678910, 9223372036854775807 as $size) {
+ $handle = fopen($local_file, 'w');
+ // Doesn't actually succeed in transferring a file. The file transfer gets aborted by our fake server.
+ // We just want to see if the offset was correctly received.
+ ftp_fget($ftp, $handle, 'gh10521', FTP_ASCII, $size);
+ fclose($handle);
+}
+
+?>
+--CLEAN--
+<?php
+@unlink(__DIR__ . DIRECTORY_SEPARATOR . "gh10521.txt");
+?>
+--EXPECTF--
+bool(true)
+
+%s: ftp_fget(): Can't open data connection (12345678910). in %s on line %d
+
+%s: ftp_fget(): Can't open data connection (9223372036854775807). in %s on line %d

php-8.1.13.tar.xz/ext/ftp/tests/server.inc -> php-8.1.21.tar.xz/ext/ftp/tests/server.inc Changed

php-8.1.13.tar.xz/ext/gd/tests/bug77269.phpt -> php-8.1.21.tar.xz/ext/gd/tests/bug77269.phpt Changed

php-8.1.13.tar.xz/ext/gd/tests/bug77272.phpt -> php-8.1.21.tar.xz/ext/gd/tests/bug77272.phpt Changed

php-8.1.13.tar.xz/ext/hash/hash.c -> php-8.1.21.tar.xz/ext/hash/hash.c Changed

php-8.1.13.tar.xz/ext/hash/hash_xxhash.c -> php-8.1.21.tar.xz/ext/hash/hash_xxhash.c Changed

php-8.1.13.tar.xz/ext/hash/tests/hash_file_basic1.phpt -> php-8.1.21.tar.xz/ext/hash/tests/hash_file_basic1.phpt Changed

@@ -42,6 +42,12 @@
 echo "snefru: " . hash_file('snefru', $file). "\n";
 echo "tiger192,3: " . hash_file('tiger192,3', $file). "\n";
 echo "whirlpool: " . hash_file('whirlpool', $file). "\n";
+echo "murmur3a: " . hash_file('murmur3a', $file). "\n";
+echo "murmur3a: " . hash_file('murmur3a', $file, false, 'seed' => 1234). "\n";
+echo "murmur3c: " . hash_file('murmur3c', $file). "\n";
+echo "murmur3c: " . hash_file('murmur3c', $file, false, 'seed' => 1234). "\n";
+echo "murmur3f: " . hash_file('murmur3f', $file). "\n";
+echo "murmur3f: " . hash_file('murmur3f', $file, false, 'seed' => 1234). "\n";
 
 echo "adler32(raw): " . bin2hex(hash_file('adler32', $file, TRUE)) . "\n";
 echo "md5(raw): " . bin2hex(hash_file('md5', $file, TRUE)). "\n";
@@ -70,6 +76,12 @@
 snefru: d414b2345d3e7fa1a31c044cf334bfc1fec24d89e464411998d579d24663895f
 tiger192,3: 7acf4ebea075fac6fc8ea0e2b4af3cfa71b9460e4c53403a
 whirlpool: 4248b149e000477269a4a5f1a84d97cfc3d0199b7aaf505913e6f010a6f83276029d11a9ad545374bc710eb59c7d958985023ab886ffa9ec9a23852844c764ec
+murmur3a: bc6554c8
+murmur3a: 432e4379
+murmur3c: 8779de509ffc06fb27bcf5fc861504d6
+murmur3c: b43afac65c38a617323020432c170005
+murmur3f: 2b84cd546b2f18a9ab6f893194224afd
+murmur3f: 6cc7716646664d6a83d68cb6563ac38e
 adler32(raw): ff87222e
 md5(raw): 704bf818448f5bbb94061332d2c889aa
 sha256(raw): a0f5702fa5d3670b80033d668e8732b70550392abb53841355447f8bb0f72245

php-8.1.13.tar.xz/ext/hash/tests/xxhash_secret.phpt -> php-8.1.21.tar.xz/ext/hash/tests/xxhash_secret.phpt Changed

@@ -3,6 +3,13 @@
 --FILE--
 <?php
 
+class StringableThrowingClass {
+ public function __toString(): string {
+ throw new Exception('exception in __toString');
+ return '';
+ }
+}
+
 foreach ("xxh3", "xxh128" as $a) {
 
 	//$secret = random_bytes(256);
@@ -15,6 +22,12 @@
 	}
 
 	try {
+		$ctx = hash_init($a, options: "secret" => new StringableThrowingClass());
+	} catch (Throwable $e) {
+		var_dump($e->getMessage());
+	}
+
+	try {
 		$ctx = hash_init($a, options: "secret" => str_repeat('a', 17));
 	} catch (Throwable $e) {
 		var_dump($e->getMessage());
@@ -35,8 +48,10 @@
 ?>
 --EXPECT--
 string(67) "xxh3: Only one of seed or secret is to be passed for initialization"
+string(23) "exception in __toString"
 string(57) "xxh3: Secret length must be >= 136 bytes, 17 bytes passed"
 8028aa834c03557a == 8028aa834c03557a == true
 string(69) "xxh128: Only one of seed or secret is to be passed for initialization"
+string(23) "exception in __toString"
 string(59) "xxh128: Secret length must be >= 136 bytes, 17 bytes passed"
 54279097795e7218093a05d4d781cbb9 == 54279097795e7218093a05d4d781cbb9 == true

php-8.1.13.tar.xz/ext/imap/config.m4 -> php-8.1.21.tar.xz/ext/imap/config.m4 Changed

@@ -17,6 +17,18 @@
 )
 
 dnl PHP_IMAP_TEST_BUILD(function, action-if-ok, action-if-not-ok, extra-libs, extra-source)
+dnl
+dnl The UW-IMAP c-client library was not originally designed to be a
+dnl shared library. The mm_foo functions are callbacks, and are required
+dnl to be implemented by the program that is linking to c-client. This
+dnl macro does the work of defining them all to no-ops for you. Note
+dnl that PHP_TEST_BUILD is a link test; the undefined symbols will only
+dnl cause problems if you actually try to link with c-client. For
+dnl example, if your test is trivial enough to be optimized out, and if
+dnl you link with --as-needed, the test/library may be omitted entirely
+dnl from the final executable. In that case linking will of course
+dnl succeed, but your luck won't necessarily apply at lower optimization
+dnl levels or systems where --as-needed is not used.
 AC_DEFUN(PHP_IMAP_TEST_BUILD, 
 PHP_TEST_BUILD($1, $2, $3, $4, $5
 
@@ -229,15 +241,23 @@
 AC_DEFINE(HAVE_IMAP_AUTH_GSS, 1, )
 , , $TST_LIBS)
 
- dnl Check if utf8_to_mutf7 exists. We need to do some gymnastics because
- dnl utf8_to_mutf7 takes an argument and will segfault without it. We
- dnl therefore test another function utf8_to_mutf7_php() which calls
- dnl the utf8_to_mutf7() function with the empty string as an argument.
- PHP_IMAP_TEST_BUILD(utf8_to_mutf7_php, 
- AC_DEFINE(HAVE_IMAP_MUTF7, 1, )
- , , $TST_LIBS, 
- char utf8_to_mutf7_php(){ return utf8_to_mutf7(""); }
- )
+ dnl Check if utf8_to_mutf7 exists.
+ old_CPPFLAGS="${CPPFLAGS}"
+ CPPFLAGS="${CPPFLAGS} -I${IMAP_INC_DIR}"
+ AC_LANG_PUSH(C)
+ AC_CACHE_CHECK(for utf8_to_mutf7, ac_cv_utf8_to_mutf7,
+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM(#include <c-client.h>,
+ unsigned char c = '\0';
+ utf8_to_mutf7(&c);
+ ),
+ AC_DEFINE(HAVE_IMAP_MUTF7, 1, )
+ ac_cv_utf8_to_mutf7=yes
+ ,
+ ac_cv_utf8_to_mutf7=no
+ )
+ )
+ AC_LANG_POP
+
 
 AC_MSG_CHECKING(whether rfc822_output_address_list function present)
 PHP_TEST_BUILD(foobar,

php-8.1.13.tar.xz/ext/intl/php_intl.c -> php-8.1.21.tar.xz/ext/intl/php_intl.c Changed

php-8.1.13.tar.xz/ext/intl/spoofchecker/spoofchecker_main.c -> php-8.1.21.tar.xz/ext/intl/spoofchecker/spoofchecker_main.c Changed

php-8.1.13.tar.xz/ext/intl/tests/dateformat_calendars_variant3.phpt -> php-8.1.21.tar.xz/ext/intl/tests/dateformat_calendars_variant3.phpt Changed

php-8.1.21.tar.xz/ext/intl/tests/dateformat_calendars_variant_icu72-1.phpt Added

@@ -0,0 +1,48 @@
+--TEST--
+IntlDateFormatter, calendars and time zone
+--INI--
+date.timezone=Atlantic/Azores
+--EXTENSIONS--
+intl
+--SKIPIF--
+<?php if (version_compare(INTL_ICU_VERSION, '72.1') < 0) die('skip for ICU >= 72.1'); ?>
+--FILE--
+<?php
+ini_set("intl.error_level", E_WARNING);
+
+$fmt1 = new IntlDateFormatter('en_US',
+ IntlDateFormatter::FULL,
+ IntlDateFormatter::FULL,
+ 'GMT+05:12',
+ IntlDateFormatter::TRADITIONAL);
+$fmt2 = new IntlDateFormatter('en_US',
+ IntlDateFormatter::FULL,
+ IntlDateFormatter::FULL,
+ 'GMT+05:12',
+ IntlDateFormatter::GREGORIAN);
+$fmt3 = new IntlDateFormatter('en_US@calendar=hebrew',
+ IntlDateFormatter::FULL,
+ IntlDateFormatter::FULL,
+ 'GMT+05:12',
+ IntlDateFormatter::TRADITIONAL);
+var_dump($fmt1->format(strtotime('2012-01-01 00:00:00 +0000')));
+var_dump($fmt2->format(strtotime('2012-01-01 00:00:00 +0000')));
+var_dump($fmt3->format(strtotime('2012-01-01 00:00:00 +0000')));
+
+new IntlDateFormatter('en_US@calendar=hebrew',
+ IntlDateFormatter::FULL,
+ IntlDateFormatter::FULL,
+ 'GMT+05:12',
+ -1);
+?>
+==DONE==
+--EXPECTF--
+string(49) "Sunday, January 1, 2012 at 5:12:00 AM GMT+05:12"
+string(49) "Sunday, January 1, 2012 at 5:12:00 AM GMT+05:12"
+string(46) "Sunday, 6 Tevet 5772 at 5:12:00 AM GMT+05:12"
+
+Fatal error: Uncaught IntlException: IntlDateFormatter::__construct(): datefmt_create: Invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %s:%d
+Stack trace:
+#0 %s(%d): IntlDateFormatter->__construct('en_US@calendar=...', 0, 0, 'GMT+05:12', -1)
+#1 {main}
+ thrown in %s on line %d

php-8.1.13.tar.xz/ext/intl/tests/dateformat_create_default.phpt -> php-8.1.21.tar.xz/ext/intl/tests/dateformat_create_default.phpt Changed

php-8.1.21.tar.xz/ext/intl/tests/dateformat_create_default_icu72-1.phpt Added

php-8.1.13.tar.xz/ext/intl/tests/dateformat_formatObject_calendar_variant5.phpt -> php-8.1.21.tar.xz/ext/intl/tests/dateformat_formatObject_calendar_variant5.phpt Changed

php-8.1.21.tar.xz/ext/intl/tests/dateformat_formatObject_calendar_variant_icu72-1.phpt Added

@@ -0,0 +1,37 @@
+--TEST--
+IntlDateFormatter::formatObject(): IntlCalendar tests
+--EXTENSIONS--
+intl
+--SKIPIF--
+<?php if (version_compare(INTL_ICU_VERSION, '72.1') < 0) die('skip for ICU >= 72.1'); ?>
+--FILE--
+<?php
+ini_set("intl.error_level", E_WARNING);
+ini_set("intl.default_locale", "pt_PT");
+ini_set("date.timezone", "Europe/Lisbon");
+
+$cal = IntlCalendar::fromDateTime('2012-01-01 00:00:00'); //Europe/Lisbon
+echo IntlDateFormatter::formatObject($cal), "\n";
+echo IntlDateFormatter::formatObject($cal, IntlDateFormatter::FULL), "\n";
+echo IntlDateFormatter::formatObject($cal, null, "en-US"), "\n";
+echo IntlDateFormatter::formatObject($cal, array(IntlDateFormatter::SHORT, IntlDateFormatter::FULL), "en-US"), "\n";
+echo IntlDateFormatter::formatObject($cal, 'E y-MM-d HH,mm,ss.SSS v', "en-US"), "\n";
+
+$cal = IntlCalendar::fromDateTime('2012-01-01 05:00:00+03:00');
+echo datefmt_format_object($cal, IntlDateFormatter::FULL), "\n";
+
+$cal = IntlCalendar::createInstance(null,'en-US@calendar=islamic-civil');
+$cal->setTime(strtotime('2012-01-01 00:00:00')*1000.);
+echo IntlDateFormatter::formatObject($cal), "\n";
+echo IntlDateFormatter::formatObject($cal, IntlDateFormatter::FULL, "en-US"), "\n";
+
+?>
+--EXPECTF--
+01/01/2012, 00:00:00
+domingo, 1 de janeiro de 2012 às 00:00:00 Hora padrão %Sda Europa Ocidental
+Jan 1, 2012, 12:00:00 AM
+1/1/12, 12:00:00 AM Western European Standard Time
+Sun 2012-01-1 00,00,00.000 Portugal Time
+domingo, 1 de janeiro de 2012 às 05:00:00 GMT+03:00
+06/02/1433, 00:00:00
+Sunday, Safar 6, 1433 at 12:00:00 AM Western European Standard Time

php-8.1.13.tar.xz/ext/intl/tests/dateformat_formatObject_datetime_variant5.phpt -> php-8.1.21.tar.xz/ext/intl/tests/dateformat_formatObject_datetime_variant5.phpt Changed

php-8.1.21.tar.xz/ext/intl/tests/dateformat_formatObject_datetime_variant_icu72-1.phpt Added

@@ -0,0 +1,30 @@
+--TEST--
+IntlDateFormatter::formatObject(): DateTime tests
+--EXTENSIONS--
+intl
+--SKIPIF--
+<?php if (version_compare(INTL_ICU_VERSION, '72.1') < 0) die('skip for ICU < 72.1'); ?>
+--FILE--
+<?php
+ini_set("intl.error_level", E_WARNING);
+ini_set("intl.default_locale", "pt_PT");
+ini_set("date.timezone", "Europe/Lisbon");
+
+$dt = new DateTime('2012-01-01 00:00:00'); //Europe/Lisbon
+echo IntlDateFormatter::formatObject($dt), "\n";
+echo IntlDateFormatter::formatObject($dt, IntlDateFormatter::FULL), "\n";
+echo IntlDateFormatter::formatObject($dt, null, "en-US"), "\n";
+echo IntlDateFormatter::formatObject($dt, array(IntlDateFormatter::SHORT, IntlDateFormatter::FULL), "en-US"), "\n";
+echo IntlDateFormatter::formatObject($dt, 'E y-MM-d HH,mm,ss.SSS v', "en-US"), "\n";
+
+$dt = new DateTime('2012-01-01 05:00:00+03:00');
+echo IntlDateFormatter::formatObject($dt, IntlDateFormatter::FULL), "\n";
+
+?>
+--EXPECTF--
+01/01/2012, 00:00:00
+domingo, 1 de janeiro de 2012 às 00:00:00 Hora padrão %Sda Europa Ocidental
+Jan 1, 2012, 12:00:00 AM
+1/1/12, 12:00:00 AM Western European Standard Time
+Sun 2012-01-1 00,00,00.000 Portugal Time
+domingo, 1 de janeiro de 2012 às 05:00:00 GMT+03:00

php-8.1.13.tar.xz/ext/intl/tests/dateformat_format_parse_version2.phpt -> php-8.1.21.tar.xz/ext/intl/tests/dateformat_format_parse_version2.phpt Changed

php-8.1.21.tar.xz/ext/intl/tests/dateformat_format_parse_version_icu72-1.phpt Added

@@ -0,0 +1,296 @@
+--TEST--
+datefmt_format_code() and datefmt_parse_code()
+--EXTENSIONS--
+intl
+--SKIPIF--
+<?php if (version_compare(INTL_ICU_VERSION, '72.1') < 0) die('skip for ICU >= 72.1'); ?>
+--FILE--
+<?php
+
+/*
+ * Test for the datefmt_format function
+ */
+
+
+function ut_main()
+{
+ $timezone = 'GMT+05:00';
+
+ $locale_arr = array (
+ 'en_US'
+ );
+
+ $datetype_arr = array (
+ IntlDateFormatter::FULL,
+ IntlDateFormatter::LONG,
+ IntlDateFormatter::MEDIUM
+ );
+
+ $res_str = '';
+
+
+ $time_arr = array (
+ 0,
+ -1200000,
+ 1200000,
+ 2200000000,
+ -2200000000,
+ 90099999,
+ 3600,
+ -3600
+ );
+
+ $localtime_arr1 = array (
+ 'tm_sec' => 24 ,
+ 'tm_min' => 3,
+ 'tm_hour' => 19,
+ 'tm_mday' => 3,
+ 'tm_mon' => 3,
+ 'tm_year' => 105,
+ );
+ $localtime_arr2 = array (
+ 'tm_sec' => 21,
+ 'tm_min' => 5,
+ 'tm_hour' => 7,
+ 'tm_mday' => 13,
+ 'tm_mon' => 7,
+ 'tm_year' => 205,
+ );
+ $localtime_arr3 = array (
+ 'tm_sec' => 11,
+ 'tm_min' => 13,
+ 'tm_hour' => 0,
+ 'tm_mday' => 17,
+ 'tm_mon' => 11,
+ 'tm_year' => -5
+ );
+
+ $localtime_arr = array (
+ $localtime_arr1,
+ $localtime_arr2,
+ $localtime_arr3
+ );
+
+ //Test format and parse with a timestamp : long
+ foreach( $time_arr as $timestamp_entry){
+ $res_str .= "\n------------\n";
+ $res_str .= "\nInput timestamp is : $timestamp_entry";
+ $res_str .= "\n------------\n";
+ foreach( $locale_arr as $locale_entry ){
+ foreach( $datetype_arr as $datetype_entry ) {
+ $res_str .= "\nIntlDateFormatter locale= $locale_entry ,datetype = $datetype_entry ,timetype =$datetype_entry ";
+ $fmt = ut_datefmt_create( $locale_entry , $datetype_entry ,$datetype_entry,$timezone);
+ $formatted = ut_datefmt_format( $fmt , $timestamp_entry);
+ $res_str .= "\nFormatted timestamp is : $formatted";
+ $parsed = ut_datefmt_parse( $fmt , $formatted);
+ if( intl_get_error_code() == U_ZERO_ERROR){
+ $res_str .= "\nParsed timestamp is : $parsed";
+ }else{
+ $res_str .= "\nError while parsing as: '".intl_get_error_message()."'";
+ }
+ }
+ }
+ }
+
+ //Test format and parse with a localtime :array
+ foreach( $localtime_arr as $localtime_entry){
+ $res_str .= "\n------------\n";
+ $res_str .= "\nInput localtime is : ";
+ foreach( $localtime_entry as $key => $value){
+ $res_str .= "$key : '$value' , ";
+ }
+
+ $res_str .= "\n------------\n";
+ foreach( $locale_arr as $locale_entry ){
+ foreach( $datetype_arr as $datetype_entry ) {
+ $res_str .= "\nIntlDateFormatter locale= $locale_entry ,datetype = $datetype_entry ,timetype =$datetype_entry ";
+ $fmt = ut_datefmt_create( $locale_entry , $datetype_entry ,$datetype_entry,$timezone);
+ $formatted1 = ut_datefmt_format( $fmt , $localtime_entry);
+ if( intl_get_error_code() == U_ZERO_ERROR){
+ $res_str .= "\nFormatted localtime_array is : $formatted1";
+ }else{
+ $res_str .= "\nError while formatting as: '".intl_get_error_message()."'";
+ }
+ //Parsing
+ $parsed_arr = ut_datefmt_localtime( $fmt, $formatted1 );
+
+ if( $parsed_arr){
+ $res_str .= "\nParsed array is: ";
+ foreach( $parsed_arr as $key => $value){
+ $res_str .= "$key : '$value' , ";
+ }
+ }
+/*
+ else{
+ //$res_str .= "No values found from LocaleTime parsing.";
+ $res_str .= "\tError : '".intl_get_error_message()."'";
+ }
+*/
+ }
+ }
+ }
+
+ return $res_str;
+
+}
+
+include_once( 'ut_common.inc' );
+
+// Run the test
+ut_run();
+?>
+--EXPECT--
+------------
+
+Input timestamp is : 0
+------------
+
+IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0 
+Formatted timestamp is : Thursday, January 1, 1970 at 5:00:00 AM GMT+05:00
+Parsed timestamp is : 0
+IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1 
+Formatted timestamp is : January 1, 1970 at 5:00:00 AM GMT+5
+Parsed timestamp is : 0
+IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2 
+Formatted timestamp is : Jan 1, 1970, 5:00:00 AM
+Parsed timestamp is : 0
+------------
+
+Input timestamp is : -1200000
+------------
+
+IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0 
+Formatted timestamp is : Thursday, December 18, 1969 at 7:40:00 AM GMT+05:00
+Parsed timestamp is : -1200000
+IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1 
+Formatted timestamp is : December 18, 1969 at 7:40:00 AM GMT+5
+Parsed timestamp is : -1200000
+IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2 
+Formatted timestamp is : Dec 18, 1969, 7:40:00 AM
+Parsed timestamp is : -1200000
+------------
+
+Input timestamp is : 1200000
+------------
+
+IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0 
+Formatted timestamp is : Thursday, January 15, 1970 at 2:20:00 AM GMT+05:00
+Parsed timestamp is : 1200000
+IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1 
+Formatted timestamp is : January 15, 1970 at 2:20:00 AM GMT+5
+Parsed timestamp is : 1200000
+IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2 
+Formatted timestamp is : Jan 15, 1970, 2:20:00 AM
+Parsed timestamp is : 1200000
+------------
+
+Input timestamp is : 2200000000
+------------
+
+IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0 
+Formatted timestamp is : Monday, September 19, 2039 at 4:06:40 AM GMT+05:00
+Parsed timestamp is : 2200000000
+IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1 
+Formatted timestamp is : September 19, 2039 at 4:06:40 AM GMT+5
+Parsed timestamp is : 2200000000
+IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2 
+Formatted timestamp is : Sep 19, 2039, 4:06:40 AM
+Parsed timestamp is : 2200000000
+------------
+
+Input timestamp is : -2200000000
+------------
+
+IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0 
+Formatted timestamp is : Sunday, April 15, 1900 at 5:53:20 AM GMT+05:00
+Parsed timestamp is : -2200000000
+IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1 
+Formatted timestamp is : April 15, 1900 at 5:53:20 AM GMT+5
+Parsed timestamp is : -2200000000
+IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2 
+Formatted timestamp is : Apr 15, 1900, 5:53:20 AM
+Parsed timestamp is : -2200000000
+------------
+
+Input timestamp is : 90099999
+------------
+
+IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0 
+Formatted timestamp is : Thursday, November 9, 1972 at 12:46:39 AM GMT+05:00
+Parsed timestamp is : 90099999
+IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1 
+Formatted timestamp is : November 9, 1972 at 12:46:39 AM GMT+5
+Parsed timestamp is : 90099999
+IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2 
+Formatted timestamp is : Nov 9, 1972, 12:46:39 AM
+Parsed timestamp is : 90099999
+------------
+
+Input timestamp is : 3600
+------------
+
+IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0 
+Formatted timestamp is : Thursday, January 1, 1970 at 6:00:00 AM GMT+05:00
+Parsed timestamp is : 3600
+IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1 
+Formatted timestamp is : January 1, 1970 at 6:00:00 AM GMT+5
+Parsed timestamp is : 3600
+IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2 
+Formatted timestamp is : Jan 1, 1970, 6:00:00 AM
+Parsed timestamp is : 3600
+------------
+
+Input timestamp is : -3600
+------------
+
+IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0 
+Formatted timestamp is : Thursday, January 1, 1970 at 4:00:00 AM GMT+05:00
+Parsed timestamp is : -3600
+IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1 
+Formatted timestamp is : January 1, 1970 at 4:00:00 AM GMT+5
+Parsed timestamp is : -3600
+IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2 
+Formatted timestamp is : Jan 1, 1970, 4:00:00 AM
+Parsed timestamp is : -3600
+------------
+
+Input localtime is : tm_sec : '24' , tm_min : '3' , tm_hour : '19' , tm_mday : '3' , tm_mon : '3' , tm_year : '105' , 
+------------
+
+IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0 
+Formatted localtime_array is : Sunday, April 3, 2005 at 7:03:24 PM GMT+05:00
+Parsed array is: tm_sec : '24' , tm_min : '3' , tm_hour : '19' , tm_year : '105' , tm_mday : '3' , tm_wday : '0' , tm_yday : '93' , tm_mon : '3' , tm_isdst : '0' , 
+IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1 
+Formatted localtime_array is : April 3, 2005 at 7:03:24 PM GMT+5
+Parsed array is: tm_sec : '24' , tm_min : '3' , tm_hour : '19' , tm_year : '105' , tm_mday : '3' , tm_wday : '0' , tm_yday : '93' , tm_mon : '3' , tm_isdst : '0' , 
+IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2 
+Formatted localtime_array is : Apr 3, 2005, 7:03:24 PM
+Parsed array is: tm_sec : '24' , tm_min : '3' , tm_hour : '19' , tm_year : '105' , tm_mday : '3' , tm_wday : '0' , tm_yday : '93' , tm_mon : '3' , tm_isdst : '0' , 
+------------
+
+Input localtime is : tm_sec : '21' , tm_min : '5' , tm_hour : '7' , tm_mday : '13' , tm_mon : '7' , tm_year : '205' , 
+------------
+
+IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0 
+Formatted localtime_array is : Thursday, August 13, 2105 at 7:05:21 AM GMT+05:00
+Parsed array is: tm_sec : '21' , tm_min : '5' , tm_hour : '7' , tm_year : '205' , tm_mday : '13' , tm_wday : '4' , tm_yday : '225' , tm_mon : '7' , tm_isdst : '0' , 
+IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1 
+Formatted localtime_array is : August 13, 2105 at 7:05:21 AM GMT+5
+Parsed array is: tm_sec : '21' , tm_min : '5' , tm_hour : '7' , tm_year : '205' , tm_mday : '13' , tm_wday : '4' , tm_yday : '225' , tm_mon : '7' , tm_isdst : '0' , 
+IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2 
+Formatted localtime_array is : Aug 13, 2105, 7:05:21 AM
+Parsed array is: tm_sec : '21' , tm_min : '5' , tm_hour : '7' , tm_year : '205' , tm_mday : '13' , tm_wday : '4' , tm_yday : '225' , tm_mon : '7' , tm_isdst : '0' , 
+------------
+
+Input localtime is : tm_sec : '11' , tm_min : '13' , tm_hour : '0' , tm_mday : '17' , tm_mon : '11' , tm_year : '-5' , 
+------------
+
+IntlDateFormatter locale= en_US ,datetype = 0 ,timetype =0 
+Formatted localtime_array is : Tuesday, December 17, 1895 at 12:13:11 AM GMT+05:00
+Parsed array is: tm_sec : '11' , tm_min : '13' , tm_hour : '0' , tm_year : '-5' , tm_mday : '17' , tm_wday : '2' , tm_yday : '351' , tm_mon : '11' , tm_isdst : '0' , 
+IntlDateFormatter locale= en_US ,datetype = 1 ,timetype =1 
+Formatted localtime_array is : December 17, 1895 at 12:13:11 AM GMT+5
+Parsed array is: tm_sec : '11' , tm_min : '13' , tm_hour : '0' , tm_year : '-5' , tm_mday : '17' , tm_wday : '2' , tm_yday : '351' , tm_mon : '11' , tm_isdst : '0' , 
+IntlDateFormatter locale= en_US ,datetype = 2 ,timetype =2 
+Formatted localtime_array is : Dec 17, 1895, 12:13:11 AM
+Parsed array is: tm_sec : '11' , tm_min : '13' , tm_hour : '0' , tm_year : '-5' , tm_mday : '17' , tm_wday : '2' , tm_yday : '351' , tm_mon : '11' , tm_isdst : '0' ,

php-8.1.13.tar.xz/ext/intl/tests/dateformat_set_timezone_id3.phpt -> php-8.1.21.tar.xz/ext/intl/tests/dateformat_set_timezone_id3.phpt Changed

php-8.1.21.tar.xz/ext/intl/tests/dateformat_set_timezone_id_icu72-1.phpt Added

@@ -0,0 +1,85 @@
+--TEST--
+datefmt_set_timezone_id_code() icu >= 4.8
+--INI--
+date.timezone=Atlantic/Azores
+--EXTENSIONS--
+intl
+--SKIPIF--
+<?php if (version_compare(INTL_ICU_VERSION, '72.1') < 0) die('skip for ICU >= 72.1'); ?>
+--FILE--
+<?php
+
+ini_set("intl.error_level", E_WARNING);
+
+/*
+ * Test for the datefmt_set_timezone_id function
+ */
+
+
+function ut_main()
+{
+ $timezone_id_arr = array (
+ 'America/New_York',
+ 'America/Los_Angeles',
+ 'America/Chicago',
+ 'CN'
+ );
+ $timestamp_entry = 0;
+
+ $res_str = '';
+
+ $fmt = ut_datefmt_create( "en_US", IntlDateFormatter::FULL, IntlDateFormatter::FULL, 'US/Pacific' , IntlDateFormatter::GREGORIAN );
+ $timezone_id = ut_datefmt_get_timezone_id( $fmt );
+ $res_str .= "\nAfter creation of the dateformatter : timezone_id= $timezone_id\n";
+
+ foreach( $timezone_id_arr as $timezone_id_entry )
+ {
+
+ $res_str .= "-----------";
+ $res_str .= "\nTrying to set timezone_id= $timezone_id_entry";
+ ut_datefmt_set_timezone_id( $fmt , $timezone_id_entry );
+ $timezone_id = ut_datefmt_get_timezone_id( $fmt );
+ $res_str .= "\nAfter call to set_timezone_id : timezone_id= $timezone_id";
+ $formatted = ut_datefmt_format( $fmt, 0);
+ $res_str .= "\nFormatting timestamp=0 resulted in $formatted";
+ $formatted = ut_datefmt_format( $fmt, 3600);
+ $res_str .= "\nFormatting timestamp=3600 resulted in $formatted";
+ $res_str .= "\n";
+
+ }
+
+ return $res_str;
+
+}
+
+include_once( 'ut_common.inc' );
+
+// Run the test
+ut_run();
+?>
+--EXPECTF--
+Warning: IntlDateFormatter::setTimeZone(): datefmt_set_timezone: No such time zone: 'CN' in %sut_common.inc on line %d
+
+Warning: datefmt_set_timezone(): datefmt_set_timezone: No such time zone: 'CN' in %sut_common.inc on line %d
+
+After creation of the dateformatter : timezone_id= US/Pacific
+-----------
+Trying to set timezone_id= America/New_York
+After call to set_timezone_id : timezone_id= America/New_York
+Formatting timestamp=0 resulted in Wednesday, December 31, 1969 at 7:00:00 PM Eastern Standard Time
+Formatting timestamp=3600 resulted in Wednesday, December 31, 1969 at 8:00:00 PM Eastern Standard Time
+-----------
+Trying to set timezone_id= America/Los_Angeles
+After call to set_timezone_id : timezone_id= America/Los_Angeles
+Formatting timestamp=0 resulted in Wednesday, December 31, 1969 at 4:00:00 PM Pacific Standard Time
+Formatting timestamp=3600 resulted in Wednesday, December 31, 1969 at 5:00:00 PM Pacific Standard Time
+-----------
+Trying to set timezone_id= America/Chicago
+After call to set_timezone_id : timezone_id= America/Chicago
+Formatting timestamp=0 resulted in Wednesday, December 31, 1969 at 6:00:00 PM Central Standard Time
+Formatting timestamp=3600 resulted in Wednesday, December 31, 1969 at 7:00:00 PM Central Standard Time
+-----------
+Trying to set timezone_id= CN
+After call to set_timezone_id : timezone_id= America/Chicago
+Formatting timestamp=0 resulted in Wednesday, December 31, 1969 at 6:00:00 PM Central Standard Time
+Formatting timestamp=3600 resulted in Wednesday, December 31, 1969 at 7:00:00 PM Central Standard Time

php-8.1.13.tar.xz/ext/intl/tests/datepatterngenerator_get_best_pattern.phpt -> php-8.1.21.tar.xz/ext/intl/tests/datepatterngenerator_get_best_pattern.phpt Changed

php-8.1.21.tar.xz/ext/intl/tests/datepatterngenerator_get_best_pattern_icu72-1.phpt Added

php-8.1.21.tar.xz/ext/intl/tests/gh10647.phpt Added

php-8.1.13.tar.xz/ext/intl/tests/msgfmt_format_datetime.phpt -> php-8.1.21.tar.xz/ext/intl/tests/msgfmt_format_datetime.phpt Changed

php-8.1.21.tar.xz/ext/intl/tests/msgfmt_format_datetime_icu72-1.phpt Added

php-8.1.13.tar.xz/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt -> php-8.1.21.tar.xz/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt Changed

php-8.1.21.tar.xz/ext/intl/tests/msgfmt_format_simple_types_numeric_strings_icu72-1.phpt Added

@@ -0,0 +1,54 @@
+--TEST--
+MessageFormatter::format(): simple types handling with numeric strings
+--INI--
+date.timezone=Atlantic/Azores
+--EXTENSIONS--
+intl
+--SKIPIF--
+<?php if (version_compare(INTL_ICU_VERSION, '72.1') < 0) die('skip for ICU >= 72.1'); ?>
+--FILE--
+<?php
+ini_set("intl.error_level", E_WARNING);
+//ini_set("intl.default_locale", "nl");
+
+$mf = new MessageFormatter('en_US',"
+ none			{a}
+ number			{b,number}
+ number integer	{c,number,integer}
+ number currency	{d,number,currency}
+ number percent	{e,number,percent}
+ date			{f,date}
+ time			{g,time}
+ spellout		{h,spellout}
+ ordinal			{i,ordinal}
+ duration		{j,duration}
+");
+
+$ex = "1336317965.5 str";
+var_dump($mf->format(array(
+'a' => $ex,
+'b' => $ex,
+'c' => $ex,
+'d' => $ex,
+'e' => $ex,
+'f' => " 1336317965.5",
+'g' => " 1336317965.5",
+'h' => $ex,
+'i' => $ex,
+'j' => $ex,
+)));
+
+?>
+--EXPECTF--
+string(%d) "
+ none			1336317965.5 str
+ number			1,336,317,965.5
+ number integer	1,336,317,965
+ number currency	$1,336,317,965.50
+ number percent	133,631,796,550%
+ date			May %d, 2012
+ time			3:26:05 PM
+ spellout		one billion three hundred thirty-six million three hundred seventeen thousand nine hundred sixty-five point five
+ ordinal			1,336,317,966th
+ duration		371,199:26:06
+"

php-8.1.13.tar.xz/ext/intl/tests/resourcebundle_null_mandatory_args_variant2.phpt -> php-8.1.21.tar.xz/ext/intl/tests/resourcebundle_null_mandatory_args_variant2.phpt Changed

php-8.1.21.tar.xz/ext/intl/tests/resourcebundle_null_mandatory_args_variant_icu72-1.phpt Added

php-8.1.13.tar.xz/ext/json/Makefile.frag -> php-8.1.21.tar.xz/ext/json/Makefile.frag Changed

php-8.1.13.tar.xz/ext/json/Makefile.frag.w32 -> php-8.1.21.tar.xz/ext/json/Makefile.frag.w32 Changed

php-8.1.13.tar.xz/ext/json/json.c -> php-8.1.21.tar.xz/ext/json/json.c Changed

php-8.1.13.tar.xz/ext/json/json_encoder.c -> php-8.1.21.tar.xz/ext/json/json_encoder.c Changed

php-8.1.13.tar.xz/ext/json/json_scanner.c -> php-8.1.21.tar.xz/ext/json/json_scanner.c Changed

php-8.1.13.tar.xz/ext/json/php_json.h -> php-8.1.21.tar.xz/ext/json/php_json.h Changed

php-8.1.13.tar.xz/ext/json/php_json_encoder.h -> php-8.1.21.tar.xz/ext/json/php_json_encoder.h Changed

php-8.1.13.tar.xz/ext/json/php_json_scanner_defs.h -> php-8.1.21.tar.xz/ext/json/php_json_scanner_defs.h Changed

php-8.1.13.tar.xz/ext/ldap/ldap.c -> php-8.1.21.tar.xz/ext/ldap/ldap.c Changed

php-8.1.13.tar.xz/ext/ldap/tests/ldap_constructor.phpt -> php-8.1.21.tar.xz/ext/ldap/tests/ldap_constructor.phpt Changed

php-8.1.13.tar.xz/ext/libxml/libxml.c -> php-8.1.21.tar.xz/ext/libxml/libxml.c Changed

php-8.1.13.tar.xz/ext/libxml/tests/bug61367-read_2.phpt -> php-8.1.21.tar.xz/ext/libxml/tests/bug61367-read_2.phpt Changed

php-8.1.13.tar.xz/ext/libxml/tests/libxml_disable_entity_loader_2.phpt -> php-8.1.21.tar.xz/ext/libxml/tests/libxml_disable_entity_loader_2.phpt Changed

php-8.1.13.tar.xz/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt -> php-8.1.21.tar.xz/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_7bit.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_7bit.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_base64.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_base64.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_big5.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_big5.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_cp51932.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_cp932.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_cp932.c Changed

@@ -65,7 +65,7 @@
 
 static int mbfl_filt_conv_cp932_wchar_flush(mbfl_convert_filter *filter);
 
-static const unsigned char mblen_table_sjis = { /* 0x80-0x9f,0xE0-0xFF */
+static const unsigned char mblen_table_sjis = { /* 0x81-0x9f,0xE0-0xFF */
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -74,7 +74,7 @@
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
   2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -95,7 +95,8 @@
 	mblen_table_sjis,
 	MBFL_ENCTYPE_GL_UNSAFE,
 	&vtbl_cp932_wchar,
-	&vtbl_wchar_cp932
+	&vtbl_wchar_cp932,
+	NULL
 };
 
 const struct mbfl_convert_vtbl vtbl_cp932_wchar = {
@@ -126,7 +127,8 @@
 	mblen_table_sjis,
 	MBFL_ENCTYPE_GL_UNSAFE,
 	&vtbl_sjiswin_wchar,
-	&vtbl_wchar_sjiswin
+	&vtbl_wchar_sjiswin,
+	NULL
 };
 
 const struct mbfl_convert_vtbl vtbl_sjiswin_wchar = {

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_cp936.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_cp936.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_euc_jp.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_2004.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_euc_kr.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_euc_tw.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_gb18030.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_hz.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_hz.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_jis.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_jis.c Changed

@@ -34,6 +34,8 @@
 #include "unicode_table_jis.h"
 
 static int mbfl_filt_conv_jis_wchar_flush(mbfl_convert_filter *filter);
+static bool mb_check_iso2022jp(unsigned char *in, size_t in_len);
+static bool mb_check_jis(unsigned char *in, size_t in_len);
 
 const mbfl_encoding mbfl_encoding_jis = {
 	mbfl_no_encoding_jis,
@@ -43,7 +45,8 @@
 	NULL,
 	MBFL_ENCTYPE_GL_UNSAFE,
 	&vtbl_jis_wchar,
-	&vtbl_wchar_jis
+	&vtbl_wchar_jis,
+	mb_check_jis
 };
 
 const mbfl_encoding mbfl_encoding_2022jp = {
@@ -54,7 +57,8 @@
 	NULL,
 	MBFL_ENCTYPE_GL_UNSAFE,
 	&vtbl_2022jp_wchar,
-	&vtbl_wchar_2022jp
+	&vtbl_wchar_2022jp,
+	mb_check_iso2022jp
 };
 
 const struct mbfl_convert_vtbl vtbl_jis_wchar = {
@@ -463,3 +467,166 @@
 
 	return 0;
 }
+
+#define ASCII 0
+#define JISX_0201_LATIN 1
+#define JISX_0201_KANA 2
+#define JISX_0208 3
+#define JISX_0212 4
+#define JISX_0201_KANA_SO 5
+
+static bool mb_check_jis(unsigned char *in, size_t in_len)
+{
+	unsigned char *p = in, *e = p + in_len;
+	unsigned int state = ASCII;
+
+	while (p < e) {
+		unsigned char c = *p++;
+		if (c == 0x1B) {
+			/* ESC seen; this is an escape sequence */
+			if (state == JISX_0201_KANA_SO) {
+				return false;
+			}
+			if ((e - p) < 2) {
+				return false;
+			}
+			unsigned char c2 = *p++;
+			if (c2 == '$') {
+				unsigned char c3 = *p++;
+				if (c3 == '@' || c3 == 'B') {
+					state = JISX_0208;
+				} else if (c3 == '(') {
+					if (p == e) {
+						return false;
+					}
+					unsigned char c4 = *p++;
+					if (c4 == '@' || c4 == 'B') {
+						state = JISX_0208;
+					} else if (c4 == 'D') {
+						state = JISX_0212;
+					} else {
+						return false;
+					}
+				} else {
+					return false;
+				}
+			} else if (c2 == '(') {
+				unsigned char c3 = *p++;
+				/* ESC ( H is treated as a sequence transitioning to ASCII for historical reasons.
+				 * see https://github.com/php/php-src/pull/10828#issuecomment-1478342432. */
+				if (c3 == 'B' || c3 == 'H') {
+					state = ASCII;
+				} else if (c3 == 'J') {
+					state = JISX_0201_LATIN;
+				} else if (c3 == 'I') {
+					state = JISX_0201_KANA;
+				} else {
+					return false;
+				}
+			} else {
+				return false;
+			}
+		} else if (c == 0xE) {
+			/* "Kana In" marker */
+			if (state != ASCII) {
+				return false;
+			}
+			state = JISX_0201_KANA_SO;
+		} else if (c == 0xF) {
+			/* "Kana Out" marker */
+			if (state != JISX_0201_KANA_SO) {
+				return false;
+			}
+			state = ASCII;
+		} else if ((state == JISX_0208 || state == JISX_0212) && (c > 0x20 && c < 0x7F)) {
+			if (p == e) {
+				return false;
+			}
+			unsigned char c2 = *p++;
+			if (c2 > 0x20 && c2 < 0x7F) {
+				unsigned int s = (c - 0x21)*94 + c2 - 0x21;
+				if (state == JISX_0208) {
+					if (s < jisx0208_ucs_table_size && jisx0208_ucs_tables) {
+						continue;
+					}
+				} else {
+					if (s < jisx0212_ucs_table_size && jisx0212_ucs_tables) {
+						continue;
+					}
+				}
+				return false;
+			} else {
+				return false;
+			}
+		} else if (c < 0x80) {
+			continue;
+		} else if (c >= 0xA1 && c <= 0xDF) {
+			/* GR-invoked Kana */
+			continue;
+		} else {
+			return false;
+		}
+	}
+
+	return state == ASCII;
+}
+
+
+static bool mb_check_iso2022jp(unsigned char *in, size_t in_len)
+{
+	unsigned char *p = in, *e = p + in_len;
+	unsigned int state = ASCII;
+
+	while (p < e) {
+		unsigned char c = *p++;
+		if (c == 0x1B) {
+			/* ESC seen; this is an escape sequence */
+			if ((e - p) < 2) {
+				return false;
+			}
+			unsigned char c2 = *p++;
+			if (c2 == '$') {
+				unsigned char c3 = *p++;
+				if (c3 == '@' || c3 == 'B') {
+					state = JISX_0208;
+				} else {
+					return false;
+				}
+			} else if (c2 == '(') {
+				unsigned char c3 = *p++;
+				if (c3 == 'B') {
+					state = ASCII;
+				} else if (c3 == 'J') {
+					state = JISX_0201_LATIN;
+				} else {
+					return false;
+				}
+			} else {
+				return false;
+			}
+		} else if (c == 0xE || c == 0xF) {
+			/* "Kana In" or "Kana Out" marker; ISO-2022-JP is not accepted. */
+			return false;
+		} else if (state == JISX_0208 && (c > 0x20 && c < 0x7F)) {
+			if (p == e) {
+				return false;
+			}
+			unsigned char c2 = *p++;
+			if (c2 > 0x20 && c2 < 0x7F) {
+				unsigned int s = (c - 0x21)*94 + c2 - 0x21;
+				if (s < jisx0208_ucs_table_size && jisx0208_ucs_tables) {
+					continue;
+				}
+				return false;
+			} else {
+				return false;
+			}
+		} else if (c < 0x80) {
+			continue;
+		} else {
+			return false;
+		}
+	}
+
+	return state == ASCII;
+}

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_qprint.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_qprint.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_singlebyte.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_singlebyte.c Changed

@@ -78,7 +78,8 @@
 		NULL, \
 		MBFL_ENCTYPE_SBCS, \
 		&vtbl_##id##_wchar, \
-		&vtbl_wchar_##id \
+		&vtbl_wchar_##id, \
+		NULL \
 	}
 
 /* For single-byte encodings which use a conversion table */
@@ -379,10 +380,10 @@
 
 static const char *cp1252_aliases = {"cp1252", NULL};
 static const unsigned short cp1252_ucs_table = {
- 0X20AC,0X0000,0X201A,0X0192,0X201E,0X2026,0X2020,0X2021,
- 0X02C6,0X2030,0X0160,0X2039,0X0152,0X0000,0X017D,0X0000,
- 0X0000,0X2018,0X2019,0X201C,0X201D,0X2022,0X2013,0X2014,
- 0X02DC,0X2122,0X0161,0X203A,0X0153,0X0000,0X017E,0X0178
+ 0X20AC,0X0081,0X201A,0X0192,0X201E,0X2026,0X2020,0X2021,
+ 0X02C6,0X2030,0X0160,0X2039,0X0152,0X008D,0X017D,0X008F,
+ 0X0090,0X2018,0X2019,0X201C,0X201D,0X2022,0X2013,0X2014,
+ 0X02DC,0X2122,0X0161,0X203A,0X0153,0X009D,0X017E,0X0178
 };
 DEF_SB(cp1252, "Windows-1252", "Windows-1252", cp1252_aliases);
 
@@ -396,7 +397,7 @@
 			}
 		}
 		CK(mbfl_filt_conv_illegal_output(c, filter));
-	} else if ((c <= 0x7F || c >= 0xA0) && c != MBFL_BAD_INPUT) {
+	} else if ((c <= 0x7F || c >= 0xA0 || c == 0x81 || c == 0x8D || c == 0x8F || c == 0x90 || c == 0x9D) && c != MBFL_BAD_INPUT) {
 		CK((*filter->output_function)(c, filter->data));
 	} else {
 		CK(mbfl_filt_conv_illegal_output(c, filter));

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_sjis.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_sjis.c Changed

@@ -38,7 +38,7 @@
 
 static int mbfl_filt_conv_sjis_wchar_flush(mbfl_convert_filter *filter);
 
-const unsigned char mblen_table_sjis = { /* 0x80-0x9f,0xE0-0xFF */
+const unsigned char mblen_table_sjis = { /* 0x81-0x9F,0xE0-0xEF */
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -47,14 +47,14 @@
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
   2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
   2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
 };
 
 static const char *mbfl_encoding_sjis_aliases = {"x-sjis", "SHIFT-JIS", NULL};
@@ -67,7 +67,8 @@
 	mblen_table_sjis,
 	MBFL_ENCTYPE_GL_UNSAFE,
 	&vtbl_sjis_wchar,
-	&vtbl_wchar_sjis
+	&vtbl_wchar_sjis,
+	NULL
 };
 
 const struct mbfl_convert_vtbl vtbl_sjis_wchar = {

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.c Changed

@@ -35,7 +35,24 @@
 
 #include "sjis_mac2uni.h"
 
-extern const unsigned char mblen_table_sjis;
+const unsigned char mblen_table_sjismac = { /* 0x81-0x9F,0xE0-0xED */
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+};
 
 static int mbfl_filt_conv_wchar_sjis_mac_flush(mbfl_convert_filter *filter);
 static int mbfl_filt_conv_sjis_mac_wchar_flush(mbfl_convert_filter *filter);
@@ -47,10 +64,11 @@
 	"SJIS-mac",
 	"Shift_JIS",
 	mbfl_encoding_sjis_mac_aliases,
-	mblen_table_sjis,
+	mblen_table_sjismac,
 	MBFL_ENCTYPE_GL_UNSAFE,
 	&vtbl_sjis_mac_wchar,
-	&vtbl_wchar_sjis_mac
+	&vtbl_wchar_sjis_mac,
+	NULL
 };
 
 const struct mbfl_convert_vtbl vtbl_sjis_mac_wchar = {

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c Changed

@@ -35,8 +35,26 @@
 
 #include "emoji2uni.h"
 
+const unsigned char mblen_table_sjis_mobile = { /* 0x81-0x9F,0xE0-0xFC */
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1
+};
+
 extern int mbfl_bisec_srch2(int w, const unsigned short tbl, int n);
-extern const unsigned char mblen_table_sjis;
 
 static int mbfl_filt_conv_sjis_wchar_flush(mbfl_convert_filter *filter);
 
@@ -49,10 +67,11 @@
 	"SJIS-Mobile#DOCOMO",
 	"Shift_JIS",
 	mbfl_encoding_sjis_docomo_aliases,
- 	mblen_table_sjis,
+	mblen_table_sjis_mobile,
 	MBFL_ENCTYPE_GL_UNSAFE,
 	&vtbl_sjis_docomo_wchar,
-	&vtbl_wchar_sjis_docomo
+	&vtbl_wchar_sjis_docomo,
+	NULL
 };
 
 const mbfl_encoding mbfl_encoding_sjis_kddi = {
@@ -60,10 +79,11 @@
 	"SJIS-Mobile#KDDI",
 	"Shift_JIS",
 	mbfl_encoding_sjis_kddi_aliases,
- 	mblen_table_sjis,
+	mblen_table_sjis_mobile,
 	MBFL_ENCTYPE_GL_UNSAFE,
 	&vtbl_sjis_kddi_wchar,
-	&vtbl_wchar_sjis_kddi
+	&vtbl_wchar_sjis_kddi,
+	NULL
 };
 
 const mbfl_encoding mbfl_encoding_sjis_sb = {
@@ -71,10 +91,11 @@
 	"SJIS-Mobile#SOFTBANK",
 	"Shift_JIS",
 	mbfl_encoding_sjis_sb_aliases,
- 	mblen_table_sjis,
+	mblen_table_sjis_mobile,
 	MBFL_ENCTYPE_GL_UNSAFE,
 	&vtbl_sjis_sb_wchar,
-	&vtbl_wchar_sjis_sb
+	&vtbl_wchar_sjis_sb,
+	NULL
 };
 
 const struct mbfl_convert_vtbl vtbl_sjis_docomo_wchar = {
@@ -444,7 +465,7 @@
 
 		/* If none of the KDDI national flag emoji matched, then we have no way
 		 * to convert the previous codepoint... */
-		mbfl_filt_conv_illegal_output(c1, filter);
+		CK(mbfl_filt_conv_illegal_output(c1, filter));
 	}
 
 	if (c == '#' || (c >= '0' && c <= '9')) {
@@ -500,7 +521,7 @@
 			}
 			return 1;
 		} else {
-			(*filter->output_function)(c1, filter->data);
+			CK((*filter->output_function)(c1, filter->data));
 		}
 	} else if (filter->status == 2) {
 		int c1 = filter->cache;
@@ -516,7 +537,7 @@
 
 		/* If none of the SoftBank national flag emoji matched, then we have no way
 		 * to convert the previous codepoint... */
-		mbfl_filt_conv_illegal_output(c1, filter);
+		CK(mbfl_filt_conv_illegal_output(c1, filter));
 	}
 
 	if (c == '#' || (c >= '0' && c <= '9')) {
@@ -801,9 +822,9 @@
 		}
 	}
 
-	if ((filter->to == &mbfl_encoding_sjis_docomo && mbfilter_unicode2sjis_emoji_docomo(c, &s1, filter)) ||
-		 (filter->to == &mbfl_encoding_sjis_kddi && mbfilter_unicode2sjis_emoji_kddi(c, &s1, filter)) ||
-		 (filter->to == &mbfl_encoding_sjis_sb && mbfilter_unicode2sjis_emoji_sb(c, &s1, filter))) {
+	if ((filter->to == &mbfl_encoding_sjis_docomo && mbfilter_unicode2sjis_emoji_docomo(c, &s1, filter) > 0) ||
+		 (filter->to == &mbfl_encoding_sjis_kddi && mbfilter_unicode2sjis_emoji_kddi(c, &s1, filter) > 0) ||
+		 (filter->to == &mbfl_encoding_sjis_sb && mbfilter_unicode2sjis_emoji_sb(c, &s1, filter) > 0)) {
 		CODE2JIS(c1,c2,s1,s2);
 	}
 
@@ -837,7 +858,7 @@
 	} else if (filter->status == 2) {
 		/* First of a pair of Regional Indicator codepoints came at the end of a string */
 		filter->cache = filter->status = 0;
-		mbfl_filt_conv_illegal_output(c1, filter);
+		CK(mbfl_filt_conv_illegal_output(c1, filter));
 	}
 
 	if (filter->flush_function) {

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_ucs2.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_ucs4.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_uhc.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_uhc.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_utf16.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_utf16.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_utf32.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_utf32.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_utf7.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_utf7.c Changed

@@ -29,8 +29,10 @@
 
 #include "mbfilter.h"
 #include "mbfilter_utf7.h"
+#include "utf7_helper.h"
 
 static int mbfl_filt_conv_utf7_wchar_flush(mbfl_convert_filter *filter);
+static bool mb_check_utf7(unsigned char *in, size_t in_len);
 
 static const unsigned char mbfl_base64_table = {
 /* 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', */
@@ -55,7 +57,8 @@
 	NULL,
 	MBFL_ENCTYPE_GL_UNSAFE,
 	&vtbl_utf7_wchar,
-	&vtbl_wchar_utf7
+	&vtbl_wchar_utf7,
+	mb_check_utf7
 };
 
 const struct mbfl_convert_vtbl vtbl_utf7_wchar = {
@@ -419,3 +422,169 @@
 
 	return 0;
 }
+
+static bool is_optional_direct(unsigned char c)
+{
+	/* Characters that are allowed to be encoded by Base64 or directly encoded */
+	return c == '!' || c == '"' || c == '#' || c == '$' || c == '%' || c == '&' || c == '*' || c == ';' || c == '<' ||
+		 c == '=' || c == '>' || c == '@' || c == '' || c == '' || c == '^' || c == '_' || c == '`' || c == '{' ||
+		 c == '|' || c == '}';
+}
+
+static bool can_end_base64(uint32_t c)
+{
+	return c == ' ' || c == '\t' || c == '\r' || c == '\n' || c == '\'' || c == '(' || c == ')' || c == ',' || c == '.' || c == ':' || c == '?';
+}
+
+static unsigned char decode_base64(unsigned char c)
+{
+	if (c >= 'A' && c <= 'Z') {
+		return c - 65;
+	} else if (c >= 'a' && c <= 'z') {
+		return c - 71;
+	} else if (c >= '0' && c <= '9') {
+		return c + 4;
+	} else if (c == '+') {
+		return 62;
+	} else if (c == '/') {
+		return 63;
+	} else if (c == '-') {
+		return DASH;
+	} else if (can_end_base64(c) || is_optional_direct(c) || c == '\0') {
+		return DIRECT;
+	} else if (c <= 0x7F) {
+		return ASCII;
+	}
+	return ILLEGAL;
+}
+
+static bool is_utf16_cp_valid(uint16_t cp, bool is_surrogate)
+{
+	if (is_surrogate) {
+		return cp >= 0xDC00 && cp <= 0xDFFF;
+	} else {
+		/* 2nd part of surrogate pair came unexpectedly */
+		return !(cp >= 0xDC00 && cp <= 0xDFFF);
+	}
+}
+
+static bool should_direct_encode(uint32_t c)
+{
+	return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || c == '\0' || c == '/' || c == '-' || can_end_base64(c);
+}
+
+static bool can_encode_directly(unsigned char c)
+{
+	return should_direct_encode(c) || is_optional_direct(c) || c == '\0';
+}
+
+static bool mb_check_utf7(unsigned char *in, size_t in_len)
+{
+	unsigned char *p = in, *e = p + in_len;
+	bool base64 = false;
+	bool is_surrogate = false;
+
+	while (p < e) {
+		if (base64) {
+			unsigned char n1 = decode_base64(*p++);
+			if (is_base64_end(n1)) {
+				if (!is_base64_end_valid(n1, false, is_surrogate)) {
+					return false;
+				}
+				base64 = false;
+				continue;
+			} else if (p == e) {
+				return false;
+			}
+			unsigned char n2 = decode_base64(*p++);
+			if (is_base64_end(n2) || p == e) {
+				return false;
+			}
+			unsigned char n3 = decode_base64(*p++);
+			if (is_base64_end(n3)) {
+				return false;
+			}
+			uint16_t cp1 = (n1 << 10) | (n2 << 4) | ((n3 & 0x3C) >> 2);
+			if (!is_utf16_cp_valid(cp1, is_surrogate)) {
+				return false;
+			}
+			is_surrogate = has_surrogate(cp1, is_surrogate);
+			if (p == e) {
+				/* It is an error if trailing padding bits are not zeroes or if we were
+				 * expecting the 2nd part of a surrogate pair when Base64 section ends */
+				return !((n3 & 0x3) || is_surrogate);
+			}
+
+			unsigned char n4 = decode_base64(*p++);
+			if (is_base64_end(n4)) {
+				if (!is_base64_end_valid(n4, n3 & 0x3, is_surrogate)) {
+					return false;
+				}
+				base64 = false;
+				continue;
+			} else if (p == e) {
+				return false;
+			}
+			unsigned char n5 = decode_base64(*p++);
+			if (is_base64_end(n5) || p == e) {
+				return false;
+			}
+			unsigned char n6 = decode_base64(*p++);
+			if (is_base64_end(n6)) {
+				return false;
+			}
+			uint16_t cp2 = (n3 << 14) | (n4 << 8) | (n5 << 2) | ((n6 & 0x30) >> 4);
+			if (!is_utf16_cp_valid(cp2, is_surrogate)) {
+				return false;
+			}
+			is_surrogate = has_surrogate(cp2, is_surrogate);
+			if (p == e) {
+				return !((n6 & 0xF) || is_surrogate);
+			}
+
+			unsigned char n7 = decode_base64(*p++);
+			if (is_base64_end(n7)) {
+				if (!is_base64_end_valid(n7, n6 & 0xF, is_surrogate)) {
+					return false;
+				}
+				base64 = false;
+				continue;
+			} else if (p == e) {
+				return false;
+			}
+			unsigned char n8 = decode_base64(*p++);
+			if (is_base64_end(n8)) {
+				return false;
+			}
+			uint16_t cp3 = (n6 << 12) | (n7 << 6) | n8;
+			if (!is_utf16_cp_valid(cp3, is_surrogate)) {
+				return false;
+			}
+			is_surrogate = has_surrogate(cp3, is_surrogate);
+		} else {
+			/* ASCII text section */
+			unsigned char c = *p++;
+
+			if (c == '+') {
+				if (p == e) {
+					base64 = true;
+					return !is_surrogate;
+				}
+				unsigned char n = decode_base64(*p);
+				if (n == DASH) {
+					p++;
+				} else if (n > DASH) {
+					/* If a "+" character followed immediately by any character other than base64 or "-" */
+					return false;
+				} else {
+					base64 = true;
+				}
+			} else if (can_encode_directly(c)) {
+				continue;
+			} else {
+				return false;
+			}
+		}
+	}
+	return !is_surrogate;
+}

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_utf7imap.c Changed

@@ -77,9 +77,11 @@
 
 #include "mbfilter.h"
 #include "mbfilter_utf7imap.h"
+#include "utf7_helper.h"
 
 static int mbfl_filt_conv_wchar_utf7imap_flush(mbfl_convert_filter *filter);
 static int mbfl_filt_conv_utf7imap_wchar_flush(mbfl_convert_filter *filter);
+static bool mb_check_utf7imap(unsigned char *in, size_t in_len);
 
 static const char *mbfl_encoding_utf7imap_aliases = {"mUTF-7", NULL};
 
@@ -91,7 +93,8 @@
 	NULL,
 	0,
 	&vtbl_utf7imap_wchar,
-	&vtbl_wchar_utf7imap
+	&vtbl_wchar_utf7imap,
+	mb_check_utf7imap
 };
 
 const struct mbfl_convert_vtbl vtbl_utf7imap_wchar = {
@@ -437,3 +440,142 @@
 	}
 	return 0;
 }
+
+static unsigned char decode_base64(unsigned char c)
+{
+	if (c >= 'A' && c <= 'Z') {
+		return c - 65;
+	} else if (c >= 'a' && c <= 'z') {
+		return c - 71;
+	} else if (c >= '0' && c <= '9') {
+		return c + 4;
+	} else if (c == '+') {
+		return 62;
+	} else if (c == ',') {
+		return 63;
+	} else if (c == '-') {
+		return DASH;
+	}
+	return ILLEGAL;
+}
+
+static bool is_utf16_cp_valid(uint16_t cp, bool is_surrogate)
+{
+	if (is_surrogate) {
+		return cp >= 0xDC00 && cp <= 0xDFFF;
+	} else if (cp >= 0xDC00 && cp <= 0xDFFF) {
+		/* 2nd part of surrogate pair came unexpectedly */
+		return false;
+	} else if (cp >= 0x20 && cp <= 0x7E && cp != '&') {
+		return false;
+	}
+	return true;
+}
+
+static bool mb_check_utf7imap(unsigned char *in, size_t in_len)
+{
+	unsigned char *p = in, *e = p + in_len;
+	bool base64 = false;
+	bool is_surrogate = false;
+
+	while (p < e) {
+		if (base64) {
+			/* Base64 section */
+			unsigned char n1 = decode_base64(*p++);
+			if (is_base64_end(n1)) {
+				if (!is_base64_end_valid(n1, false, is_surrogate)) {
+					return false;
+				}
+				base64 = false;
+				continue;
+			} else if (p == e) {
+				return false;
+			}
+			unsigned char n2 = decode_base64(*p++);
+			if (is_base64_end(n2) || p == e) {
+				return false;
+			}
+			unsigned char n3 = decode_base64(*p++);
+			if (is_base64_end(n3)) {
+				return false;
+			}
+			uint16_t cp1 = (n1 << 10) | (n2 << 4) | ((n3 & 0x3C) >> 2);
+			if (!is_utf16_cp_valid(cp1, is_surrogate)) {
+				return false;
+			}
+			is_surrogate = has_surrogate(cp1, is_surrogate);
+			if (p == e) {
+				return false;
+			}
+
+			unsigned char n4 = decode_base64(*p++);
+			if (is_base64_end(n4)) {
+				if (!is_base64_end_valid(n4, n3 & 0x3, is_surrogate)) {
+					return false;
+				}
+				base64 = false;
+				continue;
+			} else if (p == e) {
+				return false;
+			}
+			unsigned char n5 = decode_base64(*p++);
+			if (is_base64_end(n5) || p == e) {
+				return false;
+			}
+			unsigned char n6 = decode_base64(*p++);
+			if (is_base64_end(n6)) {
+				return false;
+			}
+			uint16_t cp2 = (n3 << 14) | (n4 << 8) | (n5 << 2) | ((n6 & 0x30) >> 4);
+			if (!is_utf16_cp_valid(cp2, is_surrogate)) {
+				return false;
+			}
+			is_surrogate = has_surrogate(cp2, is_surrogate);
+			if (p == e) {
+				return false;
+			}
+
+			unsigned char n7 = decode_base64(*p++);
+			if (is_base64_end(n7)) {
+				if (!is_base64_end_valid(n7, n6 & 0xF, is_surrogate)) {
+					return false;
+				}
+				base64 = false;
+				continue;
+			} else if (p == e) {
+				return false;
+			}
+			unsigned char n8 = decode_base64(*p++);
+			if (is_base64_end(n8)) {
+				return false;
+			}
+			uint16_t cp3 = (n6 << 12) | (n7 << 6) | n8;
+			if (!is_utf16_cp_valid(cp3, is_surrogate)) {
+				return false;
+			}
+			is_surrogate = has_surrogate(cp3, is_surrogate);
+		} else {
+			/* ASCII text section */
+			unsigned char c = *p++;
+
+			if (c == '&') {
+				if (p == e) {
+					return false;
+				}
+				unsigned char n = decode_base64(*p);
+				if (n == DASH) {
+					p++;
+				} else if (n == ILLEGAL) {
+					return false;
+				} else {
+					base64 = true;
+				}
+			} else if (c >= 0x20 && c <= 0x7E) {
+				continue;
+			} else {
+				return false;
+			}
+		}
+	}
+	return !base64;
+}

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_utf8.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_utf8.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/mbfilter_uuencode.c Changed

php-8.1.21.tar.xz/ext/mbstring/libmbfl/filters/utf7_helper.h Added

php-8.1.13.tar.xz/ext/mbstring/libmbfl/mbfl/mbfilter.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/mbfl/mbfilter.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/mbfl/mbfilter_pass.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.c Changed

php-8.1.13.tar.xz/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h -> php-8.1.21.tar.xz/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h Changed

php-8.1.13.tar.xz/ext/mbstring/mbstring.c -> php-8.1.21.tar.xz/ext/mbstring/mbstring.c Changed

@@ -745,7 +745,7 @@
 		php_error_docref("ref.mbstring", E_DEPRECATED, "Use of mbstring.http_input is deprecated");
 	}
 
-	if (!new_value || !ZSTR_VAL(new_value)) {
+	if (!new_value || !ZSTR_LEN(new_value)) {
 		const char *encoding = php_get_input_encoding();
 		MBSTRG(http_input_set) = 0;
 		_php_mb_ini_mbstring_http_input_set(encoding, strlen(encoding));
@@ -2446,6 +2446,9 @@
 			ckey = php_mb_convert_encoding(
 				ZSTR_VAL(key), ZSTR_LEN(key),
 				to_encoding, from_encodings, num_from_encodings, &ckey_len);
+			if (!ckey) {
+				continue;
+			}
 			key = zend_string_init(ckey, ckey_len, 0);
 			efree(ckey);
 		}
@@ -2457,6 +2460,12 @@
 				cval = php_mb_convert_encoding(
 					Z_STRVAL_P(entry), Z_STRLEN_P(entry),
 					to_encoding, from_encodings, num_from_encodings, &cval_len);
+				if (!cval) {
+					if (key) {
+						zend_string_release(key);
+					}
+					continue;
+				}
 				ZVAL_STRINGL(&entry_tmp, cval, cval_len);
 				efree(cval);
 				break;
@@ -2839,6 +2848,9 @@
 		charset = php_mb_get_encoding(charset_name, 2);
 		if (!charset) {
 			RETURN_THROWS();
+		} else if (charset->mime_name == NULL || charset->mime_name0 == '\0') {
+			zend_argument_value_error(2, "\"%s\" cannot be used for MIME header encoding", ZSTR_VAL(charset_name));
+			RETURN_THROWS();
 		}
 	} else {
 		const mbfl_language *lang = mbfl_no2language(MBSTRG(language));
@@ -3905,6 +3917,11 @@
 {
 	mbfl_convert_filter *filter = mbfl_convert_filter_new(encoding, &mbfl_encoding_wchar, mbfl_filt_check_errors, NULL, &filter);
 
+	if (encoding->check != NULL) {
+		mbfl_convert_filter_delete(filter);
+		return encoding->check((unsigned char*)input, length);
+	}
+
 	while (length--) {
 		unsigned char c = *input++;
 		(filter->filter_function)(c, filter);

php-8.1.13.tar.xz/ext/mbstring/tests/cp1252_encoding.phpt -> php-8.1.21.tar.xz/ext/mbstring/tests/cp1252_encoding.phpt Changed

php-8.1.13.tar.xz/ext/mbstring/tests/data/BIG5.txt -> php-8.1.21.tar.xz/ext/mbstring/tests/data/BIG5.txt Changed

@@ -1,35 +1,26 @@
+# BIG5.TXT
+# Date: 2015-12-02 23:52:00 GMT KW
+# © 2015 Unicode®, Inc.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 #	Name: BIG5 to Unicode table (complete)
 #	Unicode version: 1.1
-#	Table version: 0.0d3
+#	Table version: 2.0
 #	Table format: Format A
-#	Date: 11 February 1994
-#	Authors: Glenn Adams <glenn@metis.com>
-# John H. Jenkins <John_Jenkins@taligent.com>
-#
-#	Copyright (c) 1991-1994 Unicode, Inc. All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose. No
-#	warranties of any kind are expressed or implied. The recipient
-#	agrees to determine applicability of information provided. If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode. Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
+#	Date: 2011 October 14 (header updated: 2015 December 02)
 #
 #	General notes:
 #
-#	This table contains the data Metis and Taligent currently have on how
-# BIG5 characters map into Unicode.
+#
+# This table contains one set of mappings from BIG5 into Unicode.
+# Note that these data are *possible* mappings only and may not be the
+# same as those used by actual products, nor may they be the best suited
+# for all uses. For more information on the mappings between various code
+# pages incorporating the repertoire of BIG5 and Unicode, consult the
+# VENDORS mapping data.
 #
 #	WARNING! It is currently impossible to provide round-trip compatibility
-#		between BIG5 and Unicode.
+#		between BIG5 and Unicode. 
 #
 #	A number of characters are not currently mapped because
 #		of conflicts with other mappings. They are as follows:
@@ -46,173 +37,57 @@
 #
 #	We currently map all of these characters to U+FFFD REPLACEMENT CHARACTER.
 #		It is also possible to map these characters to their duplicates, or to
-#		the user zone.
-#
+#		the user zone. 
+#	
 #	Notes:
 #
 #	1. In addition to the above, there is some uncertainty about the
 # mappings in the range C6A1 - C8FE, and F9DD - F9FE. The ETEN
-#		version of BIG5 organizes the former range differently, and adds
-#		additional characters in the latter range. The correct mappings
-#		these ranges need to be determined.
+#	version of BIG5 organizes the former range differently, and adds
+#	additional characters in the latter range. The correct mappings
+#	these ranges need to be determined.
 #
 #	2. There is an uncertainty in the mapping of the Big Five character
-#		0xA3BC. This character occurs within the Big Five block of tone marks
-#		for bopomofo and is intended to be the tone mark for the first tone in
-#		Mandarin Chinese. We have selected the mapping U+02C9 MODIFIER LETTER
-#		MACRON (Mandarin Chinese first tone) to reflect this semantic.
-#		However, because bopomofo uses the absense of a tone mark to indicate
-#		the first Mandarin tone, most implementations of Big Five represent
-#		this character with a blank space, and so a mapping such as U+2003 EM SPACE
-#		might be preferred.
-#
-#
+#	0xA3BC. This character occurs within the Big Five block of tone marks
+#	for bopomofo and is intended to be the tone mark for the first tone in
+#	Mandarin Chinese. We have selected the mapping U+02C9 MODIFIER LETTER
+#	MACRON (Mandarin Chinese first tone) to reflect this semantic. 
+#	However, because bopomofo uses the absense of a tone mark to indicate
+#	the first Mandarin tone, most implementations of Big Five represent
+#	this character with a blank space, and so a mapping such as U+2003 EM
+#	SPACE might be preferred. 
 #
 #	Format: Three tab-separated columns
 #		 Column #1 is the BIG5 code (in hex as 0xXXXX)
 #		 Column #2 is the Unicode (in hex as 0xXXXX)
 #		 Column #3 is the Unicode name (follows a comment sign, '#')
-#					The official names for Unicode characters U+4E00
-#					to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
-#					where XXXX is the code point. Including all these
-#					names in this file increases its size substantially
-#					and needlessly. The token "<CJK>" is used for the
-#					name of these characters. If necessary, it can be
-#					expanded algorithmically by a parser or editor.
+#			The official names for Unicode characters U+4E00
+#			to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
+#			where XXXX is the code point. Including all these
+#			names in this file increases its size substantially
+#			and needlessly. The token "<CJK>" is used for the
+#			name of these characters. If necessary, it can be
+#			expanded algorithmically by a parser or editor.
 #
 #	The entries are in BIG5 order
 #
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
+# Revision History:
+#
+# v2.0, 2015 December 02
+# updates to copyright notice and terms of use
+# no changes to character mappings
+#
+# v1.0, 2011 October 14
+# Updated terms of use to current wording.
+# Updated contact information.
+# No changes to the mapping data.
+#
+# v0.0d3, 11 February 1994
+# First release.
 #
+# Use the Unicode reporting form <http://www.unicode.org/reporting.html>
+# for any questions or comments or to report errors in the data.
 #
-0x0	0x0
-0x1	0x1
-0x2	0x2
-0x3	0x3
-0x4	0x4
-0x5	0x5
-0x6	0x6
-0x7	0x7
-0x8	0x8
-0x9	0x9
-0xA	0xA
-0xB	0xB
-0xC	0xC
-0xD	0xD
-0xE	0xE
-0xF	0xF
-0x10	0x10
-0x11	0x11
-0x12	0x12
-0x13	0x13
-0x14	0x14
-0x15	0x15
-0x16	0x16
-0x17	0x17
-0x18	0x18
-0x19	0x19
-0x1A	0x1A
-0x1B	0x1B
-0x1C	0x1C
-0x1D	0x1D
-0x1E	0x1E
-0x1F	0x1F
-0x20	0x20
-0x21	0x21
-0x22	0x22
-0x23	0x23
-0x24	0x24
-0x25	0x25
-0x26	0x26
-0x27	0x27
-0x28	0x28
-0x29	0x29
-0x2A	0x2A
-0x2B	0x2B
-0x2C	0x2C
-0x2D	0x2D
-0x2E	0x2E
-0x2F	0x2F
-0x30	0x30
-0x31	0x31
-0x32	0x32
-0x33	0x33
-0x34	0x34
-0x35	0x35
-0x36	0x36
-0x37	0x37
-0x38	0x38
-0x39	0x39
-0x3A	0x3A
-0x3B	0x3B
-0x3C	0x3C
-0x3D	0x3D
-0x3E	0x3E
-0x3F	0x3F
-0x40	0x40
-0x41	0x41
-0x42	0x42
-0x43	0x43
-0x44	0x44
-0x45	0x45
-0x46	0x46
-0x47	0x47
-0x48	0x48
-0x49	0x49
-0x4A	0x4A
-0x4B	0x4B
-0x4C	0x4C
-0x4D	0x4D
-0x4E	0x4E
-0x4F	0x4F
-0x50	0x50
-0x51	0x51
-0x52	0x52
-0x53	0x53
-0x54	0x54
-0x55	0x55
-0x56	0x56
-0x57	0x57
-0x58	0x58
-0x59	0x59
-0x5A	0x5A
-0x5B	0x5B
-0x5C	0x5C
-0x5D	0x5D
-0x5E	0x5E
-0x5F	0x5F
-0x60	0x60
-0x61	0x61
-0x62	0x62
-0x63	0x63
-0x64	0x64
-0x65	0x65
-0x66	0x66
-0x67	0x67
-0x68	0x68
-0x69	0x69
-0x6A	0x6A
-0x6B	0x6B
-0x6C	0x6C
-0x6D	0x6D
-0x6E	0x6E
-0x6F	0x6F
-0x70	0x70
-0x71	0x71
-0x72	0x72
-0x73	0x73
-0x74	0x74
-0x75	0x75
-0x76	0x76
-0x77	0x77
-0x78	0x78
-0x79	0x79
-0x7A	0x7A
-0x7B	0x7B
-0x7C	0x7C
-0x7D	0x7D
-0x7E	0x7E
-0x7F	0x7F
 0xA140	0x3000	# IDEOGRAPHIC SPACE
 0xA141	0xFF0C	# FULLWIDTH COMMA
 0xA142	0x3001	# IDEOGRAPHIC COMMA
@@ -239,6 +114,7 @@
 0xA157	0xFE31	# PRESENTATION FORM FOR VERTICAL EM DASH
 0xA158	0x2014	# EM DASH
 0xA159	0xFE33	# PRESENTATION FORM FOR VERTICAL LOW LINE
+0xA15A	0xFFFD	# *** NO MAPPING ***
 0xA15B	0xFE34	# PRESENTATION FORM FOR VERTICAL WAVY LOW LINE
 0xA15C	0xFE4F	# WAVY LOW LINE
 0xA15D	0xFF08	# FULLWIDTH LEFT PARENTHESIS
@@ -309,7 +185,9 @@
 0xA1C0	0x32A3	# CIRCLED IDEOGRAPH CORRECT
 0xA1C1	0x2105	# CARE OF
 0xA1C2	0x203E	# OVERLINE
+0xA1C3	0xFFFD	# *** NO MAPPING ***
 0xA1C4	0xFF3F	# FULLWIDTH LOW LINE
+0xA1C5	0xFFFD	# *** NO MAPPING ***
 0xA1C6	0xFE49	# DASHED OVERLINE
 0xA1C7	0xFE4A	# CENTRELINE OVERLINE
 0xA1C8	0xFE4D	# DASHED LOW LINE
@@ -366,10 +244,12 @@
 0xA1FB	0x2198	# SOUTH EAST ARROW
 0xA1FC	0x2225	# PARALLEL TO
 0xA1FD	0x2223	# DIVIDES
+0xA1FE	0xFFFD	# *** NO MAPPING ***
+0xA240	0xFFFD	# *** NO MAPPING ***
 0xA241	0xFF0F	# FULLWIDTH SOLIDUS
 0xA242	0xFF3C	# FULLWIDTH REVERSE SOLIDUS
 0xA243	0xFF04	# FULLWIDTH DOLLAR SIGN
-0xA244	0xFFE5	# YEN SIGN -- Edited by A. Dowad to match output from iconv; was previously 0x00A5
+0xA244	0x00A5	# YEN SIGN
 0xA245	0x3012	# POSTAL MARK
 0xA246	0x00A2	# CENT SIGN
 0xA247	0x00A3	# POUND SIGN
@@ -471,7 +351,9 @@
 0xA2C9	0x3027	# HANGZHOU NUMERAL SEVEN
 0xA2CA	0x3028	# HANGZHOU NUMERAL EIGHT
 0xA2CB	0x3029	# HANGZHOU NUMERAL NINE
+0xA2CC	0xFFFD	# *** NO MAPPING ***
 0xA2CD	0x5344	# <CJK>
+0xA2CE	0xFFFD	# *** NO MAPPING ***
 0xA2CF	0xFF21	# FULLWIDTH LATIN CAPITAL LETTER A
 0xA2D0	0xFF22	# FULLWIDTH LATIN CAPITAL LETTER B
 0xA2D1	0xFF23	# FULLWIDTH LATIN CAPITAL LETTER C
@@ -13916,45 +13798,3 @@
 0xF9D3	0x9F7E	# <CJK>
 0xF9D4	0x9F49	# <CJK>
 0xF9D5	0x9F98	# <CJK>
-# The following ETEN extensions are copied from CP950.txt:
-0xF9D6	0x7881	#CJK UNIFIED IDEOGRAPH
-0xF9D7	0x92B9	#CJK UNIFIED IDEOGRAPH
-0xF9D8	0x88CF	#CJK UNIFIED IDEOGRAPH
-0xF9D9	0x58BB	#CJK UNIFIED IDEOGRAPH
-0xF9DA	0x6052	#CJK UNIFIED IDEOGRAPH
-0xF9DB	0x7CA7	#CJK UNIFIED IDEOGRAPH
-0xF9DC	0x5AFA	#CJK UNIFIED IDEOGRAPH
-0xF9DD	0x2554	#BOX DRAWINGS DOUBLE DOWN AND RIGHT
-0xF9DE	0x2566	#BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
-0xF9DF	0x2557	#BOX DRAWINGS DOUBLE DOWN AND LEFT
-0xF9E0	0x2560	#BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
-0xF9E1	0x256C	#BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL
-0xF9E2	0x2563	#BOX DRAWINGS DOUBLE VERTICAL AND LEFT
-0xF9E3	0x255A	#BOX DRAWINGS DOUBLE UP AND RIGHT
-0xF9E4	0x2569	#BOX DRAWINGS DOUBLE UP AND HORIZONTAL
-0xF9E5	0x255D	#BOX DRAWINGS DOUBLE UP AND LEFT
-0xF9E6	0x2552	#BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE
-0xF9E7	0x2564	#BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE
-0xF9E8	0x2555	#BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE
-0xF9E9	0x255E	#BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE
-0xF9EA	0x256A	#BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE
-0xF9EB	0x2561	#BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE
-0xF9EC	0x2558	#BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE
-0xF9ED	0x2567	#BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE
-0xF9EE	0x255B	#BOX DRAWINGS UP SINGLE AND LEFT DOUBLE
-0xF9EF	0x2553	#BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE
-0xF9F0	0x2565	#BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE
-0xF9F1	0x2556	#BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE
-0xF9F2	0x255F	#BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE
-0xF9F3	0x256B	#BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE
-0xF9F4	0x2562	#BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE
-0xF9F5	0x2559	#BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE
-0xF9F6	0x2568	#BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE
-0xF9F7	0x255C	#BOX DRAWINGS UP DOUBLE AND LEFT SINGLE
-0xF9F8	0x2551	#BOX DRAWINGS DOUBLE VERTICAL
-0xF9F9	0x2550	#BOX DRAWINGS DOUBLE HORIZONTAL
-0xF9FA	0x256D	#BOX DRAWINGS LIGHT ARC DOWN AND RIGHT
-0xF9FB	0x256E	#BOX DRAWINGS LIGHT ARC DOWN AND LEFT
-0xF9FC	0x2570	#BOX DRAWINGS LIGHT ARC UP AND RIGHT
-0xF9FD	0x256F	#BOX DRAWINGS LIGHT ARC UP AND LEFT
-0xF9FE	0x2593	#DARK SHADE

php-8.1.13.tar.xz/ext/mbstring/tests/data/CP1252.txt -> php-8.1.21.tar.xz/ext/mbstring/tests/data/CP1252.txt Changed

@@ -145,7 +145,7 @@
 0x7E	0x007E	#TILDE
 0x7F	0x007F	#DELETE
 0x80	0x20AC	#EURO SIGN
-0x81	      	#UNDEFINED
+0x81	0x0081	#*** MODIFIED TO FOLLOW WINDOWS "BEST FIT" MAPPINGS
 0x82	0x201A	#SINGLE LOW-9 QUOTATION MARK
 0x83	0x0192	#LATIN SMALL LETTER F WITH HOOK
 0x84	0x201E	#DOUBLE LOW-9 QUOTATION MARK
@@ -157,10 +157,10 @@
 0x8A	0x0160	#LATIN CAPITAL LETTER S WITH CARON
 0x8B	0x2039	#SINGLE LEFT-POINTING ANGLE QUOTATION MARK
 0x8C	0x0152	#LATIN CAPITAL LIGATURE OE
-0x8D	      	#UNDEFINED
+0x8D	0x008D	#*** MODIFIED TO FOLLOW WINDOWS "BEST FIT" MAPPINGS
 0x8E	0x017D	#LATIN CAPITAL LETTER Z WITH CARON
-0x8F	      	#UNDEFINED
-0x90	      	#UNDEFINED
+0x8F	0x008F	#*** MODIFIED TO FOLLOW WINDOWS "BEST FIT" MAPPINGS
+0x90	0x0090	#*** MODIFIED TO FOLLOW WINDOWS "BEST FIT" MAPPINGS
 0x91	0x2018	#LEFT SINGLE QUOTATION MARK
 0x92	0x2019	#RIGHT SINGLE QUOTATION MARK
 0x93	0x201C	#LEFT DOUBLE QUOTATION MARK
@@ -173,7 +173,7 @@
 0x9A	0x0161	#LATIN SMALL LETTER S WITH CARON
 0x9B	0x203A	#SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
 0x9C	0x0153	#LATIN SMALL LIGATURE OE
-0x9D	      	#UNDEFINED
+0x9D	0x009D	#*** MODIFIED TO FOLLOW WINDOWS "BEST FIT" MAPPINGS
 0x9E	0x017E	#LATIN SMALL LETTER Z WITH CARON
 0x9F	0x0178	#LATIN CAPITAL LETTER Y WITH DIAERESIS
 0xA0	0x00A0	#NO-BREAK SPACE

php-8.1.13.tar.xz/ext/mbstring/tests/data/JISX0201.txt -> php-8.1.21.tar.xz/ext/mbstring/tests/data/JISX0201.txt Changed

@@ -1,33 +1,24 @@
+# JIS0201.TXT
+# Date: 2015-12-02 23:49:00 GMT KW
+# © 2015 Unicode®, Inc.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 #	Name: JIS X 0201 (1976) to Unicode 1.1 Table
 #	Unicode version: 1.1
-#	Table version: 0.9
+#	Table version: 2.0
 #	Table format: Format A
-#	Date: 8 March 1994
-#	Authors: Glenn Adams <glenn@metis.com>
-# John H. Jenkins <John_Jenkins@taligent.com>
+#	Date: 2011 October 14 (header updated: 2015 December 02)
 #
-#	Copyright (c) 1991-1994 Unicode, Inc. All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose. No
-#	warranties of any kind are expressed or implied. The recipient
-#	agrees to determine applicability of information provided. If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
+#	General notes:
 #
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode. Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
 #
-#	General notes:
+# This table contains one set of mappings from JIS X 0201 into Unicode.
+# Note that these data are *possible* mappings only and may not be the
+# same as those used by actual products, nor may they be the best suited
+# for all uses. For more information on the mappings between various code
+# pages incorporating the repertoire of JIS X 0201 and Unicode, consult the
+# VENDORS mapping data.
 #
-#	This table contains the data the Unicode Consortium has on how
-#	single-byte JIS X 0201 characters map into Unicode 1.1
-#	(ISO/IEC 10646:1-1993 UCS-2).
 #
 #	Format: Three tab-separated columns
 #		Column #1 is the shift JIS code (in hex as 0xXX)
@@ -36,11 +27,22 @@
 #
 #	The entries are in JIS order
 #
-# These mappings are provisional, pending definition of
-# official mappings by Japanese standards bodies.
+# Revision History:
+#
+# v2.0, 2015 December 02
+# updates to copyright notice and terms of use
+# no changes to character mappings
+#
+# v1.0, 2011 October 14
+# Updated terms of use to current wording.
+# Updated contact information.
+# No changes to the mapping data.
 #
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
+# v0.9, 8 March 1994
+# First release.
 #
+# Use the Unicode reporting form <http://www.unicode.org/reporting.html>
+# for any questions or comments or to report errors in the data.
 #
 0x20	0x0020	# SPACE
 0x21	0x0021	# EXCLAMATION MARK

php-8.1.13.tar.xz/ext/mbstring/tests/data/JISX0212.txt -> php-8.1.21.tar.xz/ext/mbstring/tests/data/JISX0212.txt Changed

@@ -1,44 +1,36 @@
+# JIS0212.TXT
+# Date: 2015-12-02 23:51:00 GMT KW
+# © 2015 Unicode®, Inc.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 #	Name: JIS X 0212 (1990) to Unicode
 #	Unicode version: 1.1
-#	Table version: 0.9
+#	Table version: 2.0
 #	Table format: Format A
-#	Date: 8 March 1994
-#	Authors: Glenn Adams <glenn@metis.com>
-# John H. Jenkins <John_Jenkins@taligent.com>
-#
-#	Copyright (c) 1991-1994 Unicode, Inc. All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose. No
-#	warranties of any kind are expressed or implied. The recipient
-#	agrees to determine applicability of information provided. If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode. Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
+#	Date: 2011 October 14 (header updated: 2015 December 02)
 #
 #	General notes:
 #
-#	This table contains the data the Unicode Consortium has on how
-# JIS X 0212 (1983) characters map into Unicode.
+#
+# This table contains one set of mappings from JIS X 0212 into Unicode.
+# Note that these data are *possible* mappings only and may not be the
+# same as those used by actual products, nor may they be the best suited
+# for all uses. For more information on the mappings between various code
+# pages incorporating the repertoire of JIS X 0212 and Unicode, consult the
+# VENDORS mapping data.
+#
 #
 #	Format: Three tab-separated columns
 #		 Column #1 is the JIS X 0212 code (in hex as 0xXXXX)
 #		 Column #2 is the Unicode (in hex as 0xXXXX)
 #		 Column #3 the Unicode name (follows a comment sign, '#')
-#					The official names for Unicode characters U+4E00
-#					to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
-#					where XXXX is the code point. Including all these
-#					names in this file increases its size substantially
-#					and needlessly. The token "<CJK>" is used for the
-#					name of these characters. If necessary, it can be
-#					expanded algorithmically by a parser or editor.
+#			The official names for Unicode characters U+4E00
+#			to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
+#			where XXXX is the code point. Including all these
+#			names in this file increases its size substantially
+#			and needlessly. The token "<CJK>" is used for the
+#			name of these characters. If necessary, it can be
+#			expanded algorithmically by a parser or editor.
 #
 #	The entries are in JIS X 0212 order
 #
@@ -51,17 +43,11 @@
 #			the kuten form. For example, 0x2121 -> 0x0101 -> 0101;
 #			0x6D63 -> 0x4D43 -> 7767
 #
-# The kanji mappings are a normative part of ISO/IEC 10646. The
-# non-kanji mappings are provisional, pending definition of
-# official mappings by Japanese standards bodies
-#
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
-#
 #	Notes:
 #
 #	1. JIS X 0212 apparently unified the following two symbols
 #	 into a single character at 0x2922:
-#
+#	
 #	 LATIN CAPITAL LETTER D WITH STROKE
 #	 LATIN CAPITAL LETTER ETH
 #
@@ -72,6 +58,23 @@
 #	 Consequently, in the Unicode mapping, 0x2922 is treated as
 #	 LATIN CAPITAL LETTER D WITH STROKE.
 #
+# Revision History:
+#
+# v2.0, 2015 December 02
+# updates to copyright notice and terms of use
+# no changes to character mappings
+#
+# v1.0, 2011 October 14
+# Updated terms of use to current wording.
+# Updated contact information.
+# No changes to the mapping data.
+#
+# v0.9, 8 March 1994
+# First release.
+#
+# Use the Unicode reporting form <http://www.unicode.org/reporting.html>
+# for any questions or comments or to report errors in the data.
+#	 
 0x222F	0x02D8	# BREVE
 0x2230	0x02C7	# CARON (Mandarin Chinese third tone)
 0x2231	0x00B8	# CEDILLA

php-8.1.13.tar.xz/ext/mbstring/tests/data/KSX1001.txt -> php-8.1.21.tar.xz/ext/mbstring/tests/data/KSX1001.txt Changed

@@ -1,11 +1,12 @@
 #
 # Name: Unified Hangul (KS X 1001) to Unicode table
 # Unicode version: 2.0
-# Table version: 1.0
+# Table version: 1.1
 # Table format: Format A
-# Date: 08/16/99
+# Date: 2011 October 14
 # Authors: Jungshik Shin at jshin@pantheon.yale.edu
-# General notes: none
+#
+#	Copyright (c) 1999-2011 Unicode, Inc. All Rights reserved.
 #
 # This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
 # No claims are made as to fitness for any particular purpose. No
@@ -15,11 +16,13 @@
 # remedy for any claim will be exchange of defective media within 90
 # days of receipt.
 #
-# Recipient is granted the right to make copies in any form for
-# internal distribution and to freely use the information supplied
-# in the creation of products supporting Unicode. Unicode, Inc.
-# specifically excludes the right to re-distribute this file directly
-# to third parties or other organizations whether for profit or not.
+# Unicode, Inc. hereby grants the right to freely use the information
+# supplied in this file in the creation of products supporting the
+# Unicode Standard, and to make copies of this file in any form for
+# internal or external distribution as long as this notice remains
+# attached.
+#
+#	General notes:
 #
 # What is enclosed below is the mapping between KS X 1001(KS C 5601-1987
 # and Unicode 2.0. It's automatically generated from KSC5601.TXT
@@ -63,6 +66,19 @@
 # first subtract 0x2020. Then
 # the high and low bytes correspond to the row(Hang) and the column(Yol),
 # respectively
+#
+# Revision History:
+#
+# v1.1, 2011 October 14
+# Updated terms of use to current wording.
+# Updated contact information.
+# No changes to the mapping data.
+#
+# v1.0, 08/16/99
+# First release.
+#
+# Use the Unicode reporting form <http://www.unicode.org/reporting.html>
+# for any questions or comments or to report errors in the data.
 # 
 0x2121 0x3000 # IDEOGRAPHIC SPACE
 0x2122 0x3001 # IDEOGRAPHIC COMMA

php-8.1.21.tar.xz/ext/mbstring/tests/gh10192_utf7.phpt Added

@@ -0,0 +1,462 @@
+--TEST--
+GH-10192 (mb_detect_encoding() results for UTF-7 differ between PHP 8.0 and 8.1)
+--EXTENSIONS--
+mbstring
+--FILE--
+<?php
+
+$testcases = 
+ 'non-base64 character after +' => 'A + B',
+ 'non-base64 character after -' => 'A - B',
+ 'base64 character before +' => 'A 1+ B',
+ 'base64 character before -' => 'A 1- B',
+ 'base64 character after +' => 'A +1 B',
+ 'base64 character after -' => 'A -1 B',
+ 'base64 character before and after +' => 'A 1+1 B',
+ 'base64 character before and after -' => 'A 1-1 B',
+ 'string ends with +' => 'A +',
+ 'string ends with -' => 'A -',
+ '+ and -' => 'A +- B',
+ '- and +' => 'A -+ B',
+ 'valid direct encoding character =' => 'A = B',
+ 'invalid direct encoding character ~' => 'A ~ B',
+ 'invalid direct encoding character \\' => 'A \\ B',
+ 'invalid direct encoding character ESC' => "A \x1b B",
+ 'valid direct encoding character = after +' => 'A += B',
+ 'invalid direct encoding character ~ after +' => 'A +~ B',
+ 'invalid direct encoding character \\ after +' => 'A +\\ B',
+ 'invalid direct encoding character ESC after +' => "A +\x1b B",
+ 'valid base64 character between + and -' => 'A +ZeVnLIqe- B', // 日本語 in UTF-16BE
+ 'invalid base64 character between + and -' => 'A +ZeVnLIq- B', // 日本語 in UTF-16BE without the last character
+ 'valid base64 character between + and non-base64 character' => 'A +ZeVnLIqe B',
+ 'invalid base64 character between + and non-base64 character' => 'A +ZeVnLIq B',
+ 'valid base64 character between + and base64 character' => 'A +ZeVnLIqe1 B',
+ 'invalid base64 character between + and base64 character' => 'A +ZeVnLIq1 B',
+ 'valid base64 character between + and end of string' => 'A +ZeVnLIqe',
+ 'invalid base64 character between + and end of string' => 'A +ZeVnLIq',
+ 'valid base64 character consisting only of + between + and -' => 'A +++++++++- B',
+ 'invalid base64 character consisting only of + between + and -' => 'A +++++++++- B',
+ 'valid base64 character consisting only of + between + and non-base64 character' => 'A +++++++++ B',
+ 'invalid base64 character consisting only of + between + and non-base64 character' => 'A +++++++++ B',
+ 'valid base64 character consisting only of + between + and base64 character' => 'A +++++++++1 B',
+ 'invalid base64 character consisting only of + between + and base64 character' => 'A +++++++++1 B',
+ 'valid base64 character consisting only of + between + and end of string' => 'A +++++++++',
+ 'invalid base64 character consisting only of + between + and end of string' => 'A +++++++++',
+ 'valid base64 character using surrogate pair between + and -' => 'A +2GfePQ- B', // 𩸽 in UTF-16BE
+ 'invalid base64 character using surrogate pair between + and -' => 'A +2Gc- B', // first 16 bits of 𩸽 in UTF-16BE
+ 'valid base64 character using surrogate pair between + and non-base64 character' => 'A +2GfePQ B',
+ 'invalid base64 character using surrogate pair between + and non-base64 character' => 'A +2Gc B',
+ 'valid base64 character using surrogate pair between + and base64 character' => 'A +2GfePQ1 B',
+ 'invalid base64 character using surrogate pair between + and base64 character' => 'A +2Gc1 B',
+ 'valid base64 character using surrogate pair between + and end of string' => 'A +2GfePQ',
+ 'invalid base64 character using surrogate pair between + and end of string' => 'A +2Gc'
+;
+
+foreach ($testcases as $title => $case) {
+ echo $title . PHP_EOL;
+ var_dump(mb_detect_encoding($case, 'UTF-8, UTF-7', true));
+ var_dump(mb_detect_encoding($case, 'UTF-8, UTF-7', false));
+ var_dump(mb_detect_encoding($case, 'UTF-7', true));
+ var_dump(mb_detect_encoding($case, 'UTF-7', false));
+ var_dump(mb_check_encoding($case, 'UTF-7'));
+ var_dump(addcslashes(mb_convert_encoding($case, 'UTF-8', 'UTF-7'), "\0..\37\177"));
+ var_dump(mb_get_info('illegal_chars'));
+ echo PHP_EOL;
+}
+?>
+--EXPECT--
+non-base64 character after +
+string(5) "UTF-8"
+string(5) "UTF-7"
+bool(false)
+string(5) "UTF-7"
+bool(false)
+string(4) "A B"
+int(0)
+
+non-base64 character after -
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(5) "UTF-7"
+string(5) "UTF-7"
+bool(true)
+string(5) "A - B"
+int(0)
+
+base64 character before +
+string(5) "UTF-8"
+string(5) "UTF-7"
+bool(false)
+string(5) "UTF-7"
+bool(false)
+string(5) "A 1 B"
+int(0)
+
+base64 character before -
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(5) "UTF-7"
+string(5) "UTF-7"
+bool(true)
+string(6) "A 1- B"
+int(0)
+
+base64 character after +
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(5) "UTF-7"
+bool(false)
+string(5) "A ? B"
+int(1)
+
+base64 character after -
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(5) "UTF-7"
+string(5) "UTF-7"
+bool(true)
+string(6) "A -1 B"
+int(1)
+
+base64 character before and after +
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(5) "UTF-7"
+bool(false)
+string(6) "A 1? B"
+int(2)
+
+base64 character before and after -
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(5) "UTF-7"
+string(5) "UTF-7"
+bool(true)
+string(7) "A 1-1 B"
+int(2)
+
+string ends with +
+string(5) "UTF-7"
+string(5) "UTF-7"
+string(5) "UTF-7"
+string(5) "UTF-7"
+bool(true)
+string(2) "A "
+int(2)
+
+string ends with -
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(5) "UTF-7"
+string(5) "UTF-7"
+bool(true)
+string(3) "A -"
+int(2)
+
++ and -
+string(5) "UTF-7"
+string(5) "UTF-7"
+string(5) "UTF-7"
+string(5) "UTF-7"
+bool(true)
+string(5) "A + B"
+int(2)
+
+- and +
+string(5) "UTF-8"
+string(5) "UTF-7"
+bool(false)
+string(5) "UTF-7"
+bool(false)
+string(5) "A - B"
+int(2)
+
+valid direct encoding character =
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(5) "UTF-7"
+string(5) "UTF-7"
+bool(true)
+string(5) "A = B"
+int(2)
+
+invalid direct encoding character ~
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(5) "UTF-7"
+bool(false)
+string(5) "A ~ B"
+int(2)
+
+invalid direct encoding character \
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(5) "UTF-7"
+bool(false)
+string(5) "A \ B"
+int(2)
+
+invalid direct encoding character ESC
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(5) "UTF-7"
+bool(false)
+string(8) "A \033 B"
+int(2)
+
+valid direct encoding character = after +
+string(5) "UTF-8"
+string(5) "UTF-7"
+bool(false)
+string(5) "UTF-7"
+bool(false)
+string(5) "A = B"
+int(2)
+
+invalid direct encoding character ~ after +
+string(5) "UTF-8"
+string(5) "UTF-7"
+bool(false)
+string(5) "UTF-7"
+bool(false)
+string(5) "A ~ B"
+int(2)
+
+invalid direct encoding character \ after +
+string(5) "UTF-8"
+string(5) "UTF-7"
+bool(false)
+string(5) "UTF-7"
+bool(false)
+string(5) "A \ B"
+int(2)
+
+invalid direct encoding character ESC after +
+string(5) "UTF-8"
+string(5) "UTF-7"
+bool(false)
+string(5) "UTF-7"
+bool(false)
+string(8) "A \033 B"
+int(2)
+
+valid base64 character between + and -
+string(5) "UTF-7"
+string(5) "UTF-7"
+string(5) "UTF-7"
+string(5) "UTF-7"
+bool(true)
+string(13) "A 日本語 B"
+int(2)
+
+invalid base64 character between + and -
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(5) "UTF-7"
+bool(false)
+string(11) "A 日本? B"
+int(3)
+
+valid base64 character between + and non-base64 character
+string(5) "UTF-7"
+string(5) "UTF-7"
+string(5) "UTF-7"
+string(5) "UTF-7"
+bool(true)
+string(13) "A 日本語 B"
+int(3)
+
+invalid base64 character between + and non-base64 character
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(5) "UTF-7"
+bool(false)
+string(11) "A 日本? B"
+int(4)
+
+valid base64 character between + and base64 character
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(5) "UTF-7"
+bool(false)
+string(14) "A 日本語? B"
+int(5)
+
+invalid base64 character between + and base64 character
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(5) "UTF-7"
+string(5) "UTF-7"
+bool(true)
+string(13) "A 日本誵 B"
+int(5)
+
+valid base64 character between + and end of string
+string(5) "UTF-7"
+string(5) "UTF-7"
+string(5) "UTF-7"
+string(5) "UTF-7"
+bool(true)
+string(11) "A 日本語"
+int(5)
+
+invalid base64 character between + and end of string
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(5) "UTF-7"
+bool(false)
+string(9) "A 日本?"
+int(6)
+
+valid base64 character consisting only of + between + and -
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(5) "UTF-7"
+string(5) "UTF-7"
+bool(true)
+string(13) "A ﯯ뻻 B"
+int(6)
+
+invalid base64 character consisting only of + between + and -
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(5) "UTF-7"
+string(5) "UTF-7"
+bool(true)
+string(13) "A ﯯ뻻 B"
+int(6)
+
+valid base64 character consisting only of + between + and non-base64 character
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(5) "UTF-7"
+string(5) "UTF-7"
+bool(true)
+string(13) "A ﯯ뻻 B"
+int(6)
+
+invalid base64 character consisting only of + between + and non-base64 character
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(5) "UTF-7"
+string(5) "UTF-7"
+bool(true)
+string(13) "A ﯯ뻻 B"
+int(6)
+
+valid base64 character consisting only of + between + and base64 character
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(5) "UTF-7"
+bool(false)
+string(14) "A ﯯ뻻? B"
+int(7)
+
+invalid base64 character consisting only of + between + and base64 character
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(5) "UTF-7"
+bool(false)
+string(14) "A ﯯ뻻? B"
+int(8)
+
+valid base64 character consisting only of + between + and end of string
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(5) "UTF-7"
+string(5) "UTF-7"
+bool(true)
+string(11) "A ﯯ뻻"
+int(8)
+
+invalid base64 character consisting only of + between + and end of string
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(5) "UTF-7"
+string(5) "UTF-7"
+bool(true)
+string(11) "A ﯯ뻻"
+int(8)
+
+valid base64 character using surrogate pair between + and -
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(5) "UTF-7"
+string(5) "UTF-7"
+bool(true)
+string(8) "A 𩸽 B"
+int(8)
+
+invalid base64 character using surrogate pair between + and -
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(5) "UTF-7"
+bool(false)
+string(5) "A ? B"
+int(9)
+
+valid base64 character using surrogate pair between + and non-base64 character
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(5) "UTF-7"
+string(5) "UTF-7"
+bool(true)
+string(8) "A 𩸽 B"
+int(9)
+
+invalid base64 character using surrogate pair between + and non-base64 character
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(5) "UTF-7"
+bool(false)
+string(5) "A ? B"
+int(10)
+
+valid base64 character using surrogate pair between + and base64 character
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(5) "UTF-7"
+bool(false)
+string(9) "A 𩸽? B"
+int(11)
+
+invalid base64 character using surrogate pair between + and base64 character
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(5) "UTF-7"
+bool(false)
+string(5) "A ? B"
+int(12)
+
+valid base64 character using surrogate pair between + and end of string
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(5) "UTF-7"
+string(5) "UTF-7"
+bool(true)
+string(6) "A 𩸽"
+int(12)
+
+invalid base64 character using surrogate pair between + and end of string
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(5) "UTF-7"
+bool(false)
+string(3) "A ?"
+int(13)

php-8.1.21.tar.xz/ext/mbstring/tests/gh10192_utf7imap.phpt Added

@@ -0,0 +1,343 @@
+--TEST--
+GH-10192 (mb_detect_encoding() results for UTF-7 differ between PHP 8.0 and 8.1)
+--EXTENSIONS--
+mbstring
+--FILE--
+<?php
+
+$testcases = 
+ 'non-base64 character after &' => 'A & B',
+ 'non-base64 character after -' => 'A - B',
+ 'base64 character before &' => 'A 1& B',
+ 'base64 character before -' => 'A 1- B',
+ 'base64 character after &' => 'A &1 B',
+ 'base64 character after -' => 'A -1 B',
+ 'base64 character before and after &' => 'A 1&1 B',
+ 'base64 character before and after -' => 'A 1-1 B',
+ 'string ends with &' => 'A &',
+ 'string ends with -' => 'A -',
+ '& and -' => 'A &- B',
+ '- and &' => 'A -& B',
+ 'valid direct encoding character ~' => 'A ~ B',
+ 'invalid direct encoding character ESC' => "A \x1b B",
+ 'valid direct encoding character ~ after &' => 'A &~ B',
+ 'invalid direct encoding character ESC after &' => "A &\x1b B",
+ 'valid base64 character between & and -' => 'A &ZeVnLIqe- B', // 日本語 in UTF-16BE
+ 'invalid base64 character between & and -' => 'A &ZeVnLIq- B', // 日本語 in UTF-16BE without the last character
+ 'valid base64 character between & and non-base64 character' => 'A &ZeVnLIqe B',
+ 'invalid base64 character between & and non-base64 character' => 'A &ZeVnLIq B',
+ 'valid base64 character between & and base64 character' => 'A &ZeVnLIqe1 B',
+ 'invalid base64 character between & and base64 character' => 'A &ZeVnLIq1 B',
+ 'valid base64 character between & and end of string' => 'A &ZeVnLIqe',
+ 'invalid base64 character between & and end of string' => 'A &ZeVnLIq',
+ 'valid base64 character using surrogate pair between & and -' => 'A &2GfePQ- B', // 𩸽 in UTF-16BE
+ 'invalid base64 character using surrogate pair between & and -' => 'A &2Gc- B', // first 16 bits of 𩸽 in UTF-16BE
+ 'valid base64 character using surrogate pair between & and non-base64 character' => 'A &2GfePQ B',
+ 'invalid base64 character using surrogate pair between & and non-base64 character' => 'A &2Gc B',
+ 'valid base64 character using surrogate pair between & and base64 character' => 'A &2GfePQ1 B',
+ 'invalid base64 character using surrogate pair between & and base64 character' => 'A &2Gc1 B',
+ 'valid base64 character using surrogate pair between & and end of string' => 'A &2GfePQ',
+ 'invalid base64 character using surrogate pair between & and end of string' => 'A &2Gc'
+;
+
+foreach ($testcases as $title => $case) {
+ echo $title . PHP_EOL;
+ var_dump(mb_detect_encoding($case, 'UTF-8, UTF7-IMAP', true));
+ var_dump(mb_detect_encoding($case, 'UTF-8, UTF7-IMAP', false));
+ var_dump(mb_detect_encoding($case, 'UTF7-IMAP', true));
+ var_dump(mb_detect_encoding($case, 'UTF7-IMAP', false));
+ var_dump(mb_check_encoding($case, 'UTF7-IMAP'));
+ var_dump(addcslashes(mb_convert_encoding($case, 'UTF-8', 'UTF7-IMAP'), "\0..\37\177"));
+ var_dump(mb_get_info('illegal_chars'));
+ echo PHP_EOL;
+}
+
+?>
+--EXPECT--
+non-base64 character after &
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(9) "UTF7-IMAP"
+bool(false)
+string(4) "A ?B"
+int(1)
+
+non-base64 character after -
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(9) "UTF7-IMAP"
+string(9) "UTF7-IMAP"
+bool(true)
+string(5) "A - B"
+int(1)
+
+base64 character before &
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(9) "UTF7-IMAP"
+bool(false)
+string(5) "A 1?B"
+int(2)
+
+base64 character before -
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(9) "UTF7-IMAP"
+string(9) "UTF7-IMAP"
+bool(true)
+string(6) "A 1- B"
+int(2)
+
+base64 character after &
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(9) "UTF7-IMAP"
+bool(false)
+string(4) "A ?B"
+int(3)
+
+base64 character after -
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(9) "UTF7-IMAP"
+string(9) "UTF7-IMAP"
+bool(true)
+string(6) "A -1 B"
+int(3)
+
+base64 character before and after &
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(9) "UTF7-IMAP"
+bool(false)
+string(5) "A 1?B"
+int(4)
+
+base64 character before and after -
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(9) "UTF7-IMAP"
+string(9) "UTF7-IMAP"
+bool(true)
+string(7) "A 1-1 B"
+int(4)
+
+string ends with &
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(9) "UTF7-IMAP"
+bool(false)
+string(3) "A ?"
+int(5)
+
+string ends with -
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(9) "UTF7-IMAP"
+string(9) "UTF7-IMAP"
+bool(true)
+string(3) "A -"
+int(5)
+
+& and -
+string(9) "UTF7-IMAP"
+string(9) "UTF7-IMAP"
+string(9) "UTF7-IMAP"
+string(9) "UTF7-IMAP"
+bool(true)
+string(5) "A & B"
+int(5)
+
+- and &
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(9) "UTF7-IMAP"
+bool(false)
+string(5) "A -?B"
+int(6)
+
+valid direct encoding character ~
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(9) "UTF7-IMAP"
+string(9) "UTF7-IMAP"
+bool(true)
+string(5) "A ~ B"
+int(6)
+
+invalid direct encoding character ESC
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(9) "UTF7-IMAP"
+bool(false)
+string(5) "A ? B"
+int(7)
+
+valid direct encoding character ~ after &
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(9) "UTF7-IMAP"
+bool(false)
+string(5) "A ? B"
+int(8)
+
+invalid direct encoding character ESC after &
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(9) "UTF7-IMAP"
+bool(false)
+string(5) "A ? B"
+int(9)
+
+valid base64 character between & and -
+string(9) "UTF7-IMAP"
+string(9) "UTF7-IMAP"
+string(9) "UTF7-IMAP"
+string(9) "UTF7-IMAP"
+bool(true)
+string(13) "A 日本語 B"
+int(9)
+
+invalid base64 character between & and -
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(9) "UTF7-IMAP"
+bool(false)
+string(11) "A 日本? B"
+int(10)
+
+valid base64 character between & and non-base64 character
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(9) "UTF7-IMAP"
+bool(false)
+string(13) "A 日本語?B"
+int(11)
+
+invalid base64 character between & and non-base64 character
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(9) "UTF7-IMAP"
+bool(false)
+string(10) "A 日本?B"
+int(12)
+
+valid base64 character between & and base64 character
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(9) "UTF7-IMAP"
+bool(false)
+string(13) "A 日本語?B"
+int(13)
+
+invalid base64 character between & and base64 character
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(9) "UTF7-IMAP"
+bool(false)
+string(13) "A 日本誵?B"
+int(14)
+
+valid base64 character between & and end of string
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(9) "UTF7-IMAP"
+bool(false)
+string(12) "A 日本語?"
+int(15)
+
+invalid base64 character between & and end of string
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(9) "UTF7-IMAP"
+bool(false)
+string(9) "A 日本?"
+int(16)
+
+valid base64 character using surrogate pair between & and -
+string(5) "UTF-8"
+string(5) "UTF-8"
+string(9) "UTF7-IMAP"
+string(9) "UTF7-IMAP"
+bool(true)
+string(8) "A 𩸽 B"
+int(16)
+
+invalid base64 character using surrogate pair between & and -
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(9) "UTF7-IMAP"
+bool(false)
+string(5) "A ? B"
+int(17)
+
+valid base64 character using surrogate pair between & and non-base64 character
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(9) "UTF7-IMAP"
+bool(false)
+string(8) "A 𩸽?B"
+int(18)
+
+invalid base64 character using surrogate pair between & and non-base64 character
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(9) "UTF7-IMAP"
+bool(false)
+string(4) "A ?B"
+int(19)
+
+valid base64 character using surrogate pair between & and base64 character
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(9) "UTF7-IMAP"
+bool(false)
+string(8) "A 𩸽?B"
+int(20)
+
+invalid base64 character using surrogate pair between & and base64 character
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(9) "UTF7-IMAP"
+bool(false)
+string(4) "A ?B"
+int(21)
+
+valid base64 character using surrogate pair between & and end of string
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(9) "UTF7-IMAP"
+bool(false)
+string(7) "A 𩸽?"
+int(22)
+
+invalid base64 character using surrogate pair between & and end of string
+string(5) "UTF-8"
+string(5) "UTF-8"
+bool(false)
+string(9) "UTF7-IMAP"
+bool(false)
+string(3) "A ?"
+int(23)

php-8.1.21.tar.xz/ext/mbstring/tests/gh10627.phpt Added

php-8.1.21.tar.xz/ext/mbstring/tests/gh10648.phpt Added

@@ -0,0 +1,155 @@
+--TEST--
+GH-10648 (mb_check_encoding() returns true for incorrect but interpretable ISO-2022-JP byte sequences)
+--EXTENSIONS--
+mbstring
+--FILE--
+<?php
+
+$testcases = 
+ 'ISO-2022-JP bytes' => '1b244224221b2842', // 'あ' in ISO-2022-JP
+ 'ISO-2022-JP bytes without escape sequence' => '1b24422422', // 'ｱ' in JIS
+ 'JIS X 0201 7bit kana with escape sequence' => '1b2849311b2842', // 'ｱ' in JIS
+ 'JIS X 0201 7bit kana with SO/SI' => '0e310f', // 'ｱ' in JIS
+ 'JIS X 0201 8bit kana' => 'b1', // 'ｱ' in JIS
+ 'JIS X 0201 7bit kana with SO and ESC' => '0e311b2842', // 'ｱ' in JIS
+ 'JIS X 0201 7bit kana with ESC and SI' => '1b2849310f', // 'ｱ' in JIS
+ 'JIS X 0208 character' => '1b244242641b2842', // '鯛' in JIS and ISO-2022-JP, included in JIS X 0208
+ 'JIS X 0212 character' => '1b2428446a591b2842', // '鮋' in JIS, included in JIS X 0212
+ 'JIS X 0213 character' => '1b2428507d4c1b2842', // '𩸽' in ISO-2022-JP-2004, included in JIS X 0213
+ 'JIS C 6220-1969 ESC ( H' => '1b284a1b2848', // an escape sequence transitioning to ASCII
+ 'SO/SI when not in ASCII mode' => '1b284a0e0f1b2842', // an escape sequence transitioning to ASCII
+;
+
+foreach ($testcases as $title => $case) {
+ echo $title . PHP_EOL;
+ echo 'JIS:' . PHP_EOL;
+ var_dump(mb_check_encoding(hex2bin($case), 'JIS'));
+ echo mb_convert_encoding(hex2bin($case), 'UTF-8', 'JIS'). PHP_EOL;
+ var_dump(mb_get_info('illegal_chars'));
+ echo 'ISO-2022-JP:' . PHP_EOL;
+ var_dump(mb_check_encoding(hex2bin($case), 'ISO-2022-JP'));
+ echo mb_convert_encoding(hex2bin($case), 'UTF-8', 'ISO-2022-JP'). PHP_EOL;
+ var_dump(mb_get_info('illegal_chars'));
+ echo PHP_EOL;
+}
+?>
+--EXPECT--
+ISO-2022-JP bytes
+JIS:
+bool(true)
+あ
+int(0)
+ISO-2022-JP:
+bool(true)
+あ
+int(0)
+
+ISO-2022-JP bytes without escape sequence
+JIS:
+bool(false)
+あ
+int(0)
+ISO-2022-JP:
+bool(false)
+あ
+int(0)
+
+JIS X 0201 7bit kana with escape sequence
+JIS:
+bool(true)
+ｱ
+int(0)
+ISO-2022-JP:
+bool(false)
+ｱ
+int(0)
+
+JIS X 0201 7bit kana with SO/SI
+JIS:
+bool(true)
+ｱ
+int(0)
+ISO-2022-JP:
+bool(false)
+ｱ
+int(0)
+
+JIS X 0201 8bit kana
+JIS:
+bool(true)
+ｱ
+int(0)
+ISO-2022-JP:
+bool(false)
+ｱ
+int(0)
+
+JIS X 0201 7bit kana with SO and ESC
+JIS:
+bool(false)
+ｱ
+int(0)
+ISO-2022-JP:
+bool(false)
+ｱ
+int(0)
+
+JIS X 0201 7bit kana with ESC and SI
+JIS:
+bool(false)
+ｱ
+int(0)
+ISO-2022-JP:
+bool(false)
+ｱ
+int(0)
+
+JIS X 0208 character
+JIS:
+bool(true)
+鯛
+int(0)
+ISO-2022-JP:
+bool(true)
+鯛
+int(0)
+
+JIS X 0212 character
+JIS:
+bool(true)
+鮋
+int(0)
+ISO-2022-JP:
+bool(false)
+鮋
+int(0)
+
+JIS X 0213 character
+JIS:
+bool(false)
+?$(P}L
+int(1)
+ISO-2022-JP:
+bool(false)
+?$(P}L
+int(2)
+
+JIS C 6220-1969 ESC ( H
+JIS:
+bool(true)
+
+int(2)
+ISO-2022-JP:
+bool(false)
+
+int(2)
+
+SO/SI when not in ASCII mode
+JIS:
+bool(false)
+
+int(2)
+ISO-2022-JP:
+bool(false)
+
+int(2)

php-8.1.21.tar.xz/ext/mbstring/tests/gh9535.phpt Added

@@ -0,0 +1,187 @@
+--TEST--
+GH-9535 (mb_strcut(): The behavior of mb_strcut in mbstring has been changed in PHP8.1)
+--EXTENSIONS--
+mbstring
+--FILE--
+<?php
+$encodings = 
+	'BASE64',
+	'HTML-ENTITIES',
+	'Quoted-Printable',
+ 'UTF-16',
+ 'UTF-16BE',
+ 'UTF-16LE',
+ 'UTF-7',
+ 'UTF7-IMAP',
+ 'ISO-2022-JP-MS',
+ 'GB18030',
+ 'HZ',
+ 'ISO-2022-KR',
+ 'ISO-2022-JP-MOBILE#KDDI',
+ 'CP50220',
+ 'CP50221',
+ 'CP50222',
+;
+
+$input = '宛如繁星般宛如皎月般';
+$bytes_length = 15;
+foreach($encodings as $encoding) {
+ $converted_str = mb_convert_encoding($input, $encoding, mb_internal_encoding());
+ $cut_str = mb_strcut($converted_str, 0, $bytes_length, $encoding);
+ $reconverted_str = mb_convert_encoding($cut_str, mb_internal_encoding(), $encoding);
+ echo $encoding.': '.$reconverted_str.PHP_EOL;
+}
+
+echo PHP_EOL;
+
+$input = '星のように月のように';
+$bytes_length = 20;
+foreach($encodings as $encoding) {
+ $converted_str = mb_convert_encoding($input, $encoding, mb_internal_encoding());
+ $cut_str = mb_strcut($converted_str, 0, $bytes_length, $encoding);
+ $reconverted_str = mb_convert_encoding($cut_str, mb_internal_encoding(), $encoding);
+ echo $encoding.': '.$reconverted_str.PHP_EOL;
+}
+
+echo PHP_EOL;
+
+$input = 'あaいb';
+$bytes_length = 10;
+foreach($encodings as $encoding) {
+ $converted_str = mb_convert_encoding($input, $encoding, mb_internal_encoding());
+ $cut_str = mb_strcut($converted_str, 0, $bytes_length, $encoding);
+ $reconverted_str = mb_convert_encoding($cut_str, mb_internal_encoding(), $encoding);
+ echo $encoding.': '.$reconverted_str.PHP_EOL;
+}
+
+echo PHP_EOL;
+
+$input = 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+$bytes_length = 10;
+foreach($encodings as $encoding) {
+ $converted_str = mb_convert_encoding($input, $encoding, mb_internal_encoding());
+ $cut_str = mb_strcut($converted_str, 0, $bytes_length, $encoding);
+ $reconverted_str = mb_convert_encoding($cut_str, mb_internal_encoding(), $encoding);
+ echo $encoding.': '.$reconverted_str.PHP_EOL;
+}
+
+echo PHP_EOL;
+
+$input = '???';
+$bytes_length = 2;
+foreach($encodings as $encoding) {
+ $converted_str = mb_convert_encoding($input, $encoding, mb_internal_encoding());
+ $cut_str = mb_strcut($converted_str, 0, $bytes_length, $encoding);
+ $reconverted_str = mb_convert_encoding($cut_str, mb_internal_encoding(), $encoding);
+ echo $encoding.': '.$reconverted_str.PHP_EOL;
+}
+
+echo PHP_EOL;
+
+foreach($encodings as $encoding) {
+ var_dump(mb_strcut($input, 0, $bytes_length, $encoding));
+}
+
+?>
+--EXPECTF--
+BASE64: 宛如繁
+HTML-ENTITIES: 宛&#22914
+Quoted-Printable: %s
+UTF-16: 宛如繁星般宛如
+UTF-16BE: 宛如繁星般宛如
+UTF-16LE: 宛如繁星般宛如
+UTF-7: 宛如繁星
+UTF7-IMAP: 宛如繁星
+ISO-2022-JP-MS: 宛如繁星
+GB18030: 宛如繁星般宛如
+HZ: 宛如繁星般
+ISO-2022-KR: 宛如繁星
+ISO-2022-JP-MOBILE#KDDI: 宛如繁星
+CP50220: 宛如繁星
+CP50221: 宛如繁星
+CP50222: 宛如繁星
+
+BASE64: 星のように
+HTML-ENTITIES: 星の&#12
+Quoted-Printable: 星の
+UTF-16: 星のように月のように
+UTF-16BE: 星のように月のように
+UTF-16LE: 星のように月のように
+UTF-7: 星のように月
+UTF7-IMAP: 星のように月
+ISO-2022-JP-MS: 星のように月の
+GB18030: 星のように月のように
+HZ: 星のように月のよ
+ISO-2022-KR: 星のように月の
+ISO-2022-JP-MOBILE#KDDI: 星のように月の
+CP50220: 星のように月の
+CP50221: 星のように月の
+CP50222: 星のように月の
+
+BASE64: %s
+HTML-ENTITIES: あa&
+Quoted-Printable: あa
+UTF-16: あaいb
+UTF-16BE: あaいb
+UTF-16LE: あaいb
+UTF-7: あa
+UTF7-IMAP: あa
+ISO-2022-JP-MS: あa
+GB18030: あaいb
+HZ: あa
+ISO-2022-KR: あa
+ISO-2022-JP-MOBILE#KDDI: あa
+CP50220: あa
+CP50221: あa
+CP50222: あa
+
+BASE64: AAAAAA
+HTML-ENTITIES: AAAAAAAAAA
+Quoted-Printable: AAAAAAAAAA
+UTF-16: AAAAA
+UTF-16BE: AAAAA
+UTF-16LE: AAAAA
+UTF-7: AAAAAAAAAA
+UTF7-IMAP: AAAAAAAAAA
+ISO-2022-JP-MS: AAAAAAAAAA
+GB18030: AAAAAAAAAA
+HZ: AAAAAAAAAA
+ISO-2022-KR: AAAAAAAAAA
+ISO-2022-JP-MOBILE#KDDI: AAAAAAAAAA
+CP50220: AAAAAAAAAA
+CP50221: AAAAAAAAAA
+CP50222: AAAAAAAAAA
+
+BASE64:%s
+HTML-ENTITIES: ??
+Quoted-Printable: ??
+UTF-16: ?
+UTF-16BE: ?
+UTF-16LE: ?
+UTF-7: ??
+UTF7-IMAP: ??
+ISO-2022-JP-MS: ??
+GB18030: ??
+HZ: ??
+ISO-2022-KR: ??
+ISO-2022-JP-MOBILE#KDDI: ??
+CP50220: ??
+CP50221: ??
+CP50222: ??
+
+string(0) ""
+string(2) "??"
+string(2) "??"
+string(2) "??"
+string(2) "??"
+string(2) "??"
+string(2) "??"
+string(2) "??"
+string(2) "??"
+string(2) "??"
+string(2) "??"
+string(2) "??"
+string(2) "??"
+string(2) "??"
+string(2) "??"
+string(2) "??"

php-8.1.21.tar.xz/ext/mbstring/tests/gh9535b.phpt Added

@@ -0,0 +1,106 @@
+--TEST--
+Output of mb_strcut covers requested range of bytes even when output contains ending escape sequences
+--EXTENSIONS--
+mbstring
+--FILE--
+<?php
+// The existing behavior of mb_strcut is wrong for these encodings, when they add an extra closing
+// escape sequence to a string which would otherwise end in a non-default conversion mode
+// See https://github.com/php/php-src/pull/9562 for details on the bug
+
+// These tests were developed when fixing a different bug, but they don't pass because of
+// the bug involving the added closing escape sequences
+// When that bug is fixed, we can remove XFAIL (or combine this file with gh9535.phpt)
+
+$encodings = 
+ 'JIS',
+ 'ISO-2022-JP',
+ 'ISO-2022-JP-2004',
+;
+
+$input = '宛如繁星般宛如皎月般';
+$bytes_length = 15;
+foreach($encodings as $encoding) {
+ $converted_str = mb_convert_encoding($input, $encoding, mb_internal_encoding());
+ $cut_str = mb_strcut($converted_str, 0, $bytes_length, $encoding);
+ $reconverted_str = mb_convert_encoding($cut_str, mb_internal_encoding(), $encoding);
+ echo $encoding.': '.$reconverted_str.PHP_EOL;
+}
+
+echo PHP_EOL;
+
+$input = '星のように月のように';
+$bytes_length = 20;
+foreach($encodings as $encoding) {
+ $converted_str = mb_convert_encoding($input, $encoding, mb_internal_encoding());
+ $cut_str = mb_strcut($converted_str, 0, $bytes_length, $encoding);
+ $reconverted_str = mb_convert_encoding($cut_str, mb_internal_encoding(), $encoding);
+ echo $encoding.': '.$reconverted_str.PHP_EOL;
+}
+
+echo PHP_EOL;
+
+$input = 'あaいb';
+$bytes_length = 10;
+foreach($encodings as $encoding) {
+ $converted_str = mb_convert_encoding($input, $encoding, mb_internal_encoding());
+ $cut_str = mb_strcut($converted_str, 0, $bytes_length, $encoding);
+ $reconverted_str = mb_convert_encoding($cut_str, mb_internal_encoding(), $encoding);
+ echo $encoding.': '.$reconverted_str.PHP_EOL;
+}
+
+echo PHP_EOL;
+
+$input = 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+$bytes_length = 10;
+foreach($encodings as $encoding) {
+ $converted_str = mb_convert_encoding($input, $encoding, mb_internal_encoding());
+ $cut_str = mb_strcut($converted_str, 0, $bytes_length, $encoding);
+ $reconverted_str = mb_convert_encoding($cut_str, mb_internal_encoding(), $encoding);
+ echo $encoding.': '.$reconverted_str.PHP_EOL;
+}
+
+echo PHP_EOL;
+
+$input = '???';
+$bytes_length = 2;
+foreach($encodings as $encoding) {
+ $converted_str = mb_convert_encoding($input, $encoding, mb_internal_encoding());
+ $cut_str = mb_strcut($converted_str, 0, $bytes_length, $encoding);
+ $reconverted_str = mb_convert_encoding($cut_str, mb_internal_encoding(), $encoding);
+ echo $encoding.': '.$reconverted_str.PHP_EOL;
+}
+
+echo PHP_EOL;
+
+foreach($encodings as $encoding) {
+ var_dump(mb_strcut($input, 0, $bytes_length, $encoding));
+}
+
+?>
+--XFAIL--
+Discussion: https://github.com/php/php-src/pull/9562
+--EXPECTF--
+JIS: 宛如繁星般
+ISO-2022-JP: 宛如繁星般
+ISO-2022-JP-2004: 宛如繁星
+
+JIS: 星のように月の
+ISO-2022-JP: 星のように月の
+ISO-2022-JP-2004: 星のように月の
+
+JIS: あa
+ISO-2022-JP: あa
+ISO-2022-JP-2004: あa
+
+JIS: AAAAAAAAAA
+ISO-2022-JP: AAAAAAAAAA
+ISO-2022-JP-2004: AAAAAAAAAA
+
+JIS: ??
+ISO-2022-JP: ??
+ISO-2022-JP-2004: ??
+
+string(2) "??"
+string(2) "??"
+string(2) "??"

php-8.1.13.tar.xz/ext/mbstring/tests/iso2022jp_encoding.phpt -> php-8.1.21.tar.xz/ext/mbstring/tests/iso2022jp_encoding.phpt Changed

@@ -50,11 +50,6 @@
 		/* ESC ( B at the beginning is redundant, since ASCII mode is the default */
 		if (substr($from, 0, 3) == "\x1B(B")
 			$from = substr($from, 3, strlen($from) - 3);
-		/* If the string switches to a different charset, it should switch back to
-		 * ASCII at the end */
-		if (strpos($from, "\x1B\$B") !== false || strpos($from, "\x1B(J") !== false)
-			$from .= "\x1B(B";
-
 		convertValidString($to, $from, 'UTF-16BE', $encoding, false);
 	}
 }
@@ -66,11 +61,11 @@
 for ($i = 0; $i < 0x80; $i++) {
 	if ($i == 0xE || $i == 0xF || $i == 0x1B)
 		continue;
-	testValid(chr($i), "\x00" . chr($i), 'JIS');
-	testValid("\x0F" . chr($i), "\x00" . chr($i), 'JIS'); /* 0xF is 'Shift Out' code */
-	testValid("\x1B(B" . chr($i), "\x00" . chr($i), 'JIS');
-	testValid(chr($i), "\x00" . chr($i), 'ISO-2022-JP');
-	testValid("\x1B(B" . chr($i), "\x00" . chr($i), 'ISO-2022-JP');
+	testValid(chr($i), "\x00" . chr($i), 'JIS');
+	convertValidString("\x0F" . chr($i), "\x00" . chr($i), 'JIS', 'UTF-16BE', false); /* 0xF is 'Shift In' code */
+	testValid("\x1B(B" . chr($i), "\x00" . chr($i), 'JIS');
+	testValid(chr($i), "\x00" . chr($i), 'ISO-2022-JP');
+	testValid("\x1B(B" . chr($i), "\x00" . chr($i), 'ISO-2022-JP');
 }
 
 for ($i = 0x80; $i < 256; $i++) {
@@ -92,27 +87,27 @@
 foreach ($jisx0201Chars as $jisx0201 => $utf16BE) {
 	if (ord($jisx0201) >= 128) {
 		$kana = chr(ord($jisx0201) - 128);
-		testValid("\x1B(I" . $kana, $utf16BE, 'JIS', false);
-		testValid("\x0E" . $kana, $utf16BE, 'JIS', false); /* 0xE is 'Shift In' code */
+		testValid("\x1B(I" . $kana . "\x1B(B", $utf16BE, 'JIS', false);
+		testValid("\x0E" . $kana . "\x0F", $utf16BE, 'JIS', false); /* 0xE is 'Shift Out' code */
 		testValid($jisx0201, $utf16BE, 'JIS', false);
 	} else {
-		testValid("\x1B(J" . $jisx0201, $utf16BE, 'JIS', $utf16BE > "\x00\x80");
+		testValid("\x1B(J" . $jisx0201 . "\x1B(B", $utf16BE, 'JIS', $utf16BE > "\x00\x80");
 	}
 }
 
 for ($i = 0x80; $i < 256; $i++) {
 	if ($i >= 0xA1 && $i <= 0xDF)
 		continue;
-	testInvalid("\x1B(I" . chr($i), "\x00%", 'JIS');
-	testInvalid("\x1B(J" . chr($i), "\x00%", 'JIS');
+	testInvalid("\x1B(I" . chr($i) . "\x1B(B", "\x00%", 'JIS');
+	testInvalid("\x1B(J" . chr($i) . "\x1B(B", "\x00%", 'JIS');
 }
 
 echo "JIS X 0201 support OK\n";
 
 /* All valid JISX0208 characters */
 foreach ($jisx0208Chars as $jisx0208 => $utf16BE) {
-	testValid("\x1B\$B" . $jisx0208, $utf16BE, 'JIS');
-	testValid("\x1B\$B" . $jisx0208, $utf16BE, 'ISO-2022-JP');
+	testValid("\x1B\$B" . $jisx0208 . "\x1B(B", $utf16BE, 'JIS');
+	testValid("\x1B\$B" . $jisx0208 . "\x1B(B", $utf16BE, 'ISO-2022-JP');
 }
 
 /* All invalid 2-byte JISX0208 characters */
@@ -120,8 +115,8 @@
 	for ($j = 0; $j < 256; $j++) {
 		$testString = chr($i) . chr($j);
 		if (!isset($jisx0208Chars$testString)) {
-			testInvalid("\x1B\$B" . $testString, "\x00%", 'JIS');
-			testInvalid("\x1B\$B" . $testString, "\x00%", 'ISO-2022-JP');
+			testInvalid("\x1B\$B" . $testString . "\x1B(B", "\x00%", 'JIS');
+			testInvalid("\x1B\$B" . $testString . "\x1B(B", "\x00%", 'ISO-2022-JP');
 		}
 	}
 }
@@ -138,7 +133,7 @@
 
 /* All valid JISX0212 characters */
 foreach ($jisx0212Chars as $jisx0212 => $utf16BE) {
-	testValid("\x1B\$(D" . $jisx0212, $utf16BE, 'JIS', false);
+	testValid("\x1B\$(D" . $jisx0212 . "\x1B(B", $utf16BE, 'JIS', false);
 }
 
 /* All invalid 2-byte JISX0212 characters */
@@ -146,42 +141,49 @@
 	for ($j = 0; $j < 256; $j++) {
 		$testString = chr($i) . chr($j);
 		if (!isset($jisx0212Chars$testString)) {
-			testInvalid("\x1B\$(D" . $testString, "\x00%", 'JIS');
+			testInvalid("\x1B\$(D" . $testString . "\x1B(B", "\x00%", 'JIS');
 		}
 	}
 }
 
 /* Try truncated JISX0212 characters */
 for ($i = 0x21; $i <= 0x7E; $i++) {
-	testInvalid("\x1B\$(D" . chr($i), "\x00%", 'JIS');
+	testInvalid("\x1B\$(D" . chr($i) . "\x1B(B", "\x00%\x00%", 'JIS');
 }
 
 echo "JIS X 0212 support OK\n";
 
 /* All possible escape sequences */
-$validEscapes = "\x1B\$@" => true, "\x1B\$B" => true, "\x1B\$(@" => true, "\x1B\$(B" => true, "\x1B\$(D" => true, "\x1B(B" => true, "\x1B(H" => true, "\x1B(J" => true, "\x1B(I" => true;
+$validJisEscapes = "\x1B\$@" => true, "\x1B\$B" => true, "\x1B\$(@" => true, "\x1B\$(B" => true, "\x1B\$(D" => true, "\x1B(B" => true, "\x1B(H" => true, "\x1B(J" => true, "\x1B(I" => true;
+$validIso2022jpEscapes = "\x1B\$@" => true, "\x1B\$B" => true, "\x1B(B" => true, "\x1B(J" => true;
 for ($i = 0; $i <= 0xFF; $i++) {
 	for ($j = 0; $j <= 0xFF; $j++) {
 		$escapeSequence = "\x1B" . chr($i) . chr($j);
 		if ($escapeSequence === "\x1B\$(")
 			continue;
-		if (isset($validEscapes$escapeSequence)) {
-			testValid($escapeSequence, "", 'JIS', false);
-			testValid($escapeSequence, "", 'ISO-2022-JP', false);
+		if (isset($validJisEscapes$escapeSequence)) {
+			testValid($escapeSequence . "\x1B(B", "", 'JIS', false);
+		} else {
+			identifyInvalidString($escapeSequence . "\x1B(B", 'JIS');
+		}
+		if (isset($validIso2022jpEscapes$escapeSequence)) {
+			testValid($escapeSequence . "\x1B(B", "", 'ISO-2022-JP', false);
 		} else {
-			identifyInvalidString($escapeSequence, 'JIS');
-			identifyInvalidString($escapeSequence, 'ISO-2022-JP');
+			identifyInvalidString($escapeSequence . "\x1B(B", 'ISO-2022-JP');
 		}
 	}
 }
 for ($i = 0; $i <= 0xFF; $i++) {
 	$escapeSequence = "\x1B\$(" . chr($i);
-	if (isset($validEscapes$escapeSequence)) {
-		testValid($escapeSequence, "", 'JIS', false);
-		testValid($escapeSequence, "", 'ISO-2022-JP', false);
+	if (isset($validJisEscapes$escapeSequence)) {
+		testValid($escapeSequence . "\x1B(B", "", 'JIS', false);
+	} else {
+		identifyInvalidString($escapeSequence . "\x1B(B", 'JIS');
+	}
+	if (isset($validIso2022jpEscapes$escapeSequence)) {
+		testValid($escapeSequence . "\x1B(B", "", 'ISO-2022-JP', false);
 	} else {
-		identifyInvalidString($escapeSequence, 'JIS');
-		identifyInvalidString($escapeSequence, 'ISO-2022-JP');
+		identifyInvalidString($escapeSequence . "\x1B(B", 'ISO-2022-JP');
 	}
 }

php-8.1.21.tar.xz/ext/mbstring/tests/mb_encode_mimeheader_crash.phpt Added

php-8.1.13.tar.xz/ext/mbstring/tests/mb_str_split_jp.phpt -> php-8.1.21.tar.xz/ext/mbstring/tests/mb_str_split_jp.phpt Changed

@@ -62,6 +62,17 @@
         last array element: %s expected: %s\n", unpack("H*", end($array))1,unpack("H*", $enc)1);
 }
 
+/* SJIS byte 0x80 was previously wrongly treated as the starting byte for a 2-byte character */
+echo "== Regression test for SJIS byte 0x80 ==\n";
+foreach ('SJIS', 'SJIS-2004', 'MacJapanese', 'SJIS-Mobile#DOCOMO', 'SJIS-Mobile#KDDI', 'SJIS-Mobile#SoftBank' as $encoding) {
+    $array = mb_str_split("\x80\xA1abc\x80\xA1", 2, $encoding);
+    echo "$encoding: " . implode(', ', array_map('bin2hex', $array)) . "\n";
+
+    // Also try bytes 0xFD, 0xFE, and 0xFF
+    $array = mb_str_split("abc\xFD\xFE\xFFab\xFD\xFE\xFF", 2, $encoding);
+    echo "$encoding: " . implode(', ', array_map('bin2hex', $array)) . "\n";
+}
+
 ?>
 --EXPECT--
 BIG-5: a4e9 a5bb
@@ -73,3 +84,16 @@
 UTF-32BE: 000065e5 0000672c
 UTF-32LE: e5650000 2c670000
 UTF-8: e697a5 e69cac
+== Regression test for SJIS byte 0x80 ==
+SJIS: 80a1, 6162, 6380, a1
+SJIS: 6162, 63fd, feff, 6162, fdfe, ff
+SJIS-2004: 80a1, 6162, 6380, a1
+SJIS-2004: 6162, 63fd, feff, 6162, fdfe, ff
+MacJapanese: 80a1, 6162, 6380, a1
+MacJapanese: 6162, 63fd, feff, 6162, fdfe, ff
+SJIS-Mobile#DOCOMO: 80a1, 6162, 6380, a1
+SJIS-Mobile#DOCOMO: 6162, 63fd, feff, 6162, fdfe, ff
+SJIS-Mobile#KDDI: 80a1, 6162, 6380, a1
+SJIS-Mobile#KDDI: 6162, 63fd, feff, 6162, fdfe, ff
+SJIS-Mobile#SoftBank: 80a1, 6162, 6380, a1
+SJIS-Mobile#SoftBank: 6162, 63fd, feff, 6162, fdfe, ff

php-8.1.13.tar.xz/ext/mbstring/tests/mb_strlen.phpt -> php-8.1.21.tar.xz/ext/mbstring/tests/mb_strlen.phpt Changed

@@ -13,43 +13,64 @@
 mb_detect_order('auto');
 
 // Test string
-$euc_jp = '0123¤³¤ÎÊ¸»úÎó¤ÏÆüËÜ¸ì¤Ç¤¹¡£EUC-JP¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£0123ÆüËÜ¸ì¤ÏÌÌÅÝ½¤¤¡£';
+$euc_jp = mb_convert_encoding("0123ãã®æååã¯æ¥æ¬èªã§ããEUC-JPãä½¿ã£ã¦ãã¾ãã0123æ¥æ¬èªã¯é¢åèãã", 'EUC-JP', 'UTF-8');
 $ascii  = 'abcdefghijklmnopqrstuvwxyz;=#0123456789';
 
-// ASCII
 echo "== ASCII ==\n";
-print  mb_strlen($ascii,'ASCII') . "\n";
-print  strlen($ascii) . "\n";
+print mb_strlen($ascii,'ASCII') . "\n";
+print strlen($ascii) . "\n";
 
-// EUC-JP
 echo "== EUC-JP ==\n";
-print  mb_strlen($euc_jp,'EUC-JP') . "\n";
+print mb_strlen($euc_jp,'EUC-JP') . "\n";
 mb_internal_encoding('EUC-JP') or print("mb_internal_encoding() failed\n");
-print  strlen($euc_jp) . "\n";
+print strlen($euc_jp) . "\n";
 
-// SJIS
 echo "== SJIS ==\n";
 $sjis = mb_convert_encoding($euc_jp, 'SJIS','EUC-JP');
-print  mb_strlen($sjis,'SJIS') . "\n";
+print mb_strlen($sjis,'SJIS') . "\n";
 mb_internal_encoding('SJIS') or print("mb_internal_encoding() failed\n");
-print  strlen($sjis) . "\n";
+print strlen($sjis) . "\n";
+print "-- Testing illegal bytes 0x80,0xFD-FF --\n";
+// mb_strlen used to wrongly treat 0x80 as the starting byte of a 2-byte SJIS character
+print mb_strlen("\x80\xA1", 'SJIS') . "\n";
+print mb_strlen("abc\xFD\xFE\xFF", 'SJIS') . "\n";
+
+echo "== CP932 ==\n";
+print mb_strlen("\x80\xA1", "CP932") . "\n";
+// 0xFD, 0xFE, 0xFF is reserved.
+print mb_strlen("abc\xFD\xFE\xFF", 'CP932') . "\n";
+
+echo "== MacJapanese ==\n";
+print mb_strlen("\x80\xA1", 'MacJapanese') . "\n";
+print mb_strlen("abc\xFD\xFE\xFF", 'MacJapanese') . "\n";
+
+echo "== SJIS-2004 ==\n";
+print mb_strlen("\x80\xA1", 'SJIS-2004') . "\n";
+print mb_strlen("abc\xFD\xFE\xFF", 'SJIS-2004') . "\n";
+
+echo "== SJIS-Mobile#DOCOMO ==\n";
+print mb_strlen("\x80\xA1", 'SJIS-Mobile#DOCOMO') . "\n";
+print mb_strlen("abc\xFD\xFE\xFF", 'SJIS-Mobile#DOCOMO') . "\n";
+
+echo "== SJIS-Mobile#KDDI ==\n";
+print mb_strlen("\x80\xA1", 'SJIS-Mobile#KDDI') . "\n";
+print mb_strlen("abc\xFD\xFE\xFF", 'SJIS-Mobile#KDDI') . "\n";
+
+echo "== SJIS-Mobile#SoftBank ==\n";
+print mb_strlen("\x80\xA1", 'SJIS-Mobile#SoftBank') . "\n";
+print mb_strlen("abc\xFD\xFE\xFF", 'SJIS-Mobile#SoftBank') . "\n";
 
-// JIS
-// Note: either convert_encoding or strlen has problem
 echo "== JIS ==\n";
 $jis = mb_convert_encoding($euc_jp, 'JIS','EUC-JP');
-print  mb_strlen($jis,'JIS') . "\n";
+print mb_strlen($jis,'JIS') . "\n";
 mb_internal_encoding('JIS')  or print("mb_internal_encoding() failed\n");
-print  strlen($jis) . "\n";
+print strlen($jis) . "\n";
 
-// UTF-8
-// Note: either convert_encoding or strlen has problem
 echo "== UTF-8 ==\n";
 $utf8 = mb_convert_encoding($euc_jp, 'UTF-8','EUC-JP');
-print  mb_strlen($utf8,'UTF-8') . "\n";
+print mb_strlen($utf8,'UTF-8') . "\n";
 mb_internal_encoding('UTF-8')  or print("mb_internal_encoding() failed\n");
-print  strlen($utf8) . "\n";
-
+print strlen($utf8) . "\n";
 
 // Wrong Parameters
 echo "== WRONG PARAMETERS ==\n";
@@ -72,6 +93,27 @@
 == SJIS ==
 43
 72
+-- Testing illegal bytes 0x80,0xFD-FF --
+2
+6
+== CP932 ==
+2
+5
+== MacJapanese ==
+2
+6
+== SJIS-2004 ==
+2
+6
+== SJIS-Mobile#DOCOMO ==
+2
+6
+== SJIS-Mobile#KDDI ==
+2
+6
+== SJIS-Mobile#SoftBank ==
+2
+6
 == JIS ==
 43
 90

php-8.1.13.tar.xz/ext/mbstring/tests/mb_substr.phpt -> php-8.1.21.tar.xz/ext/mbstring/tests/mb_substr.phpt Changed

@@ -11,7 +11,21 @@
 include_once('common.inc');
 
 // EUC-JP
-$euc_jp = '0123¤³¤ÎÊ¸»úÎó¤ÏÆüËÜ¸ì¤Ç¤¹¡£EUC-JP¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£ÆüËÜ¸ì¤ÏÌÌÅÝ½¤¤¡£';
+$euc_jp = mb_convert_encoding('0123ãã®æååã¯æ¥æ¬èªã§ããEUC-JPãä½¿ã£ã¦ãã¾ããæ¥æ¬èªã¯é¢åèãã', 'EUC-JP', 'UTF-8');
+// SJIS
+$sjis = mb_convert_encoding('æ¥æ¬èªããã¹ãã§ãã01234ï¼ï¼ï¼ï¼ï¼ã', 'SJIS', 'UTF-8');
+// ISO-2022-JP
+$iso2022jp = "\x1B\$B\x21\x21!r\x1B(BABC";
+// GB-18030
+$gb18030 = mb_convert_encoding('å¯ç ç¨æ·åå¯ç åç§°åç§°', 'GB18030', 'UTF-8');
+// HZ
+$hz = "The next sentence is in GB.~{<:Ky2;S{#,NpJ)l6HK!#~}Bye.";
+// UTF-8
+$utf8 = "Greek: Î£á½² Î³Î½ÏÏá½·Î¶Ï á¼Ïá½¸ Ïá½´Î½ Îºá½¹ÏÎ· Russian: ÐÐ°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÑÐ¹ÑÐµÑÑ";
+// UTF-32
+$utf32 = mb_convert_encoding($utf8, 'UTF-32', 'UTF-8');
+// UTF-7
+$utf7 = mb_convert_encoding($utf8, 'UTF-7', 'UTF-8');
 
 print "1: ". bin2hex(mb_substr($euc_jp, 10, 10,'EUC-JP')) . "\n";
 print "2: ". bin2hex(mb_substr($euc_jp, 0, 100,'EUC-JP')) . "\n";
@@ -20,8 +34,82 @@
 // Note: returns last character
 ($str === "") ? print "3 OK\n" : print "NG: ".bin2hex($str)."\n";
 
-$str = mb_substr($euc_jp, -100, 10,'EUC-JP');
-($str !== "") ? print "4 OK: ".bin2hex($str)."\n" : print "NG: ".bin2hex($str)."\n";
+$str = mb_substr($euc_jp, -100, 10, 'EUC-JP');
+print ($str !== "") ? "4 OK: " . bin2hex($str) . "\n" : "BAD: " . bin2hex($str) . "\n";
+
+echo "SJIS:\n";
+print "1: " . bin2hex(mb_substr($sjis, 0, 3, 'SJIS')) . "\n";
+print "2: " . bin2hex(mb_substr($sjis, -1, null, 'SJIS')) . "\n";
+print "3: " . bin2hex(mb_substr($sjis, -5, 3, 'SJIS')) . "\n";
+print "4: " . bin2hex(mb_substr($sjis, 1, null, 'SJIS')) . "\n";
+print "5:" . bin2hex(mb_substr($sjis, 10, 0, 'SJIS')) . "\n";
+echo "-- Testing illegal SJIS byte 0x80 --\n";
+print bin2hex(mb_substr("\x80abc\x80\xA1", 3, 2, 'SJIS')) . "\n";
+print bin2hex(mb_substr("\x80abc\x80\xA1", 0, 3, 'SJIS')) . "\n";
+
+echo "SJIS-2004:\n";
+print bin2hex(mb_substr("\x80abc\x80\xA1", 3, 2, 'SJIS-2004')) . "\n";
+print bin2hex(mb_substr("\x80abc\x80\xA1", 0, 3, 'SJIS-2004')) . "\n";
+
+echo "MacJapanese:\n";
+print bin2hex(mb_substr("\x80abc\x80\xA1", 3, 2, 'MacJapanese')) . "\n";
+print bin2hex(mb_substr("\x80abc\x80\xA1", 0, 3, 'MacJapanese')) . "\n";
+
+echo "SJIS-Mobile#DOCOMO:\n";
+print bin2hex(mb_substr("\x80abc\x80\xA1", 3, 2, 'SJIS-Mobile#DOCOMO')) . "\n";
+print bin2hex(mb_substr("\x80abc\x80\xA1", 0, 3, 'SJIS-Mobile#DOCOMO')) . "\n";
+
+echo "SJIS-Mobile#KDDI:\n";
+print bin2hex(mb_substr("\x80abc\x80\xA1", 3, 2, 'SJIS-Mobile#KDDI')) . "\n";
+print bin2hex(mb_substr("\x80abc\x80\xA1", 0, 3, 'SJIS-Mobile#KDDI')) . "\n";
+
+echo "SJIS-Mobile#SoftBank:\n";
+print bin2hex(mb_substr("\x80abc\x80\xA1", 3, 2, 'SJIS-Mobile#SoftBank')) . "\n";
+print bin2hex(mb_substr("\x80abc\x80\xA1", 0, 3, 'SJIS-Mobile#SoftBank')) . "\n";
+
+echo "ISO-2022-JP:\n";
+print "1: " . bin2hex(mb_substr($iso2022jp, 0, 3, 'ISO-2022-JP')) . "\n";
+print "2: " . bin2hex(mb_substr($iso2022jp, -1, null, 'ISO-2022-JP')) . "\n";
+print "3: " . bin2hex(mb_substr($iso2022jp, -6, 3, 'ISO-2022-JP')) . "\n";
+print "4: " . bin2hex(mb_substr($iso2022jp, -3, 2, 'ISO-2022-JP')) . "\n";
+print "5: " . bin2hex(mb_substr($iso2022jp, 1, null, 'ISO-2022-JP')) . "\n";
+print "6:" . bin2hex(mb_substr($iso2022jp, 10, 0, 'ISO-2022-JP')) . "\n";
+print "7:" . bin2hex(mb_substr($iso2022jp, 100, 10, 'ISO-2022-JP')) . "\n";
+
+echo "GB-18030:\n";
+print "1: " . bin2hex(mb_substr($gb18030, 0, 3, 'GB-18030')) . "\n";
+print "2: " . bin2hex(mb_substr($gb18030, -1, null, 'GB-18030')) . "\n";
+print "3: " . bin2hex(mb_substr($gb18030, -5, 3, 'GB-18030')) . "\n";
+print "4: " . bin2hex(mb_substr($gb18030, 1, null, 'GB-18030')) . "\n";
+print "5:" . bin2hex(mb_substr($gb18030, 10, 0, 'GB-18030')) . "\n";
+
+echo "HZ:\n";
+print "1: " . mb_substr($hz, 0, 3, 'HZ') . "\n";
+print "2: " . mb_substr($hz, -1, null, 'HZ') . "\n";
+print "3: " . mb_substr($hz, -5, 3, 'HZ') . "\n";
+print "4: " . mb_substr($hz, 1, null, 'HZ') . "\n";
+print "5:" . mb_substr($hz, 10, 0, 'HZ') . "\n";
+
+echo "UTF-8:\n";
+print "1: " . mb_substr($utf8, 0, 3, 'UTF-8') . "\n";
+print "2: " . mb_substr($utf8, -1, null, 'UTF-8') . "\n";
+print "3: " . mb_substr($utf8, -5, 3, 'UTF-8') . "\n";
+print "4: " . mb_substr($utf8, 1, null, 'UTF-8') . "\n";
+print "5:" . mb_substr($utf8, 10, 0, 'UTF-8') . "\n";
+
+echo "UTF-32:\n";
+print "1: " . mb_convert_encoding(mb_substr($utf32, 0, 3, 'UTF-32'), 'UTF-8', 'UTF-32') . "\n";
+print "2: " . mb_convert_encoding(mb_substr($utf32, -1, null, 'UTF-32'), 'UTF-8', 'UTF-32') . "\n";
+print "3: " . mb_convert_encoding(mb_substr($utf32, -5, 3, 'UTF-32'), 'UTF-8', 'UTF-32') . "\n";
+print "4: " . mb_convert_encoding(mb_substr($utf32, 1, null, 'UTF-32'), 'UTF-8', 'UTF-32') . "\n";
+print "5:" . mb_convert_encoding(mb_substr($utf32, 10, 0, 'UTF-32'), 'UTF-8', 'UTF-32') . "\n";
+
+echo "UTF-7:\n";
+print "1: " . mb_convert_encoding(mb_substr($utf7, 0, 3, 'UTF-7'), 'UTF-8', 'UTF-7') . "\n";
+print "2: " . mb_convert_encoding(mb_substr($utf7, -1, null, 'UTF-7'), 'UTF-8', 'UTF-7') . "\n";
+print "3: " . mb_convert_encoding(mb_substr($utf7, -5, 3, 'UTF-7'), 'UTF-8', 'UTF-7') . "\n";
+print "4: " . mb_convert_encoding(mb_substr($utf7, 1, null, 'UTF-7'), 'UTF-8', 'UTF-7') . "\n";
+print "5:" . mb_convert_encoding(mb_substr($utf7, 10, 0, 'UTF-7'), 'UTF-8', 'UTF-7') . "\n";
 
 ?>
 --EXPECT--
@@ -29,3 +117,65 @@
 2: 30313233a4b3a4cecab8bbfacef3a4cfc6fccbdcb8eca4c7a4b9a1a34555432d4a50a4f2bbc8a4c3a4c6a4a4a4dea4b9a1a3c6fccbdcb8eca4cfccccc5ddbdada4a4a1a3
 3 OK
 4 OK: 30313233a4b3a4cecab8bbfacef3a4cf
+SJIS:
+1: 93fa967b8cea
+2: 8142
+3: 825582568257
+4: 967b8cea8365834c8358836782c582b781423031323334825482558256825782588142
+5:
+-- Testing illegal SJIS byte 0x80 --
+6380
+806162
+SJIS-2004:
+6380
+806162
+MacJapanese:
+6380
+806162
+SJIS-Mobile#DOCOMO:
+6380
+806162
+SJIS-Mobile#KDDI:
+6380
+806162
+SJIS-Mobile#SoftBank:
+6380
+806162
+ISO-2022-JP:
+1: 1b2442212121721b284241
+2: 43
+3: 1b2442212121721b284241
+4: 4142
+5: 1b244221721b2842414243
+6:
+7:
+GB-18030:
+1: c3dcc2ebd3c3
+2: b3c6
+3: c2ebc3fbb3c6
+4: c2ebd3c3bba7c3fbc3dcc2ebc3fbb3c6c3fbb3c6
+5:
+HZ:
+1: The
+2: .
+3: ~{!#~}By
+4: he next sentence is in GB.~{<:Ky2;S{#,NpJ)l6HK!#~}Bye.
+5:
+UTF-8:
+1: Gre
+2: Ñ
+3: Ð¹ÑÐµ
+4: reek: Î£á½² Î³Î½ÏÏá½·Î¶Ï á¼Ïá½¸ Ïá½´Î½ Îºá½¹ÏÎ· Russian: ÐÐ°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÑÐ¹ÑÐµÑÑ
+5:
+UTF-32:
+1: Gre
+2: Ñ
+3: Ð¹ÑÐµ
+4: reek: Î£á½² Î³Î½ÏÏá½·Î¶Ï á¼Ïá½¸ Ïá½´Î½ Îºá½¹ÏÎ· Russian: ÐÐ°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÑÐ¹ÑÐµÑÑ
+5:
+UTF-7:
+1: Gre
+2: Ñ
+3: Ð¹ÑÐµ
+4: reek: Î£á½² Î³Î½ÏÏá½·Î¶Ï á¼Ïá½¸ Ïá½´Î½ Îºá½¹ÏÎ· Russian: ÐÐ°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÑÐ¹ÑÐµÑÑ
+5:

php-8.1.13.tar.xz/ext/mbstring/tests/utf_encodings.phpt -> php-8.1.21.tar.xz/ext/mbstring/tests/utf_encodings.phpt Changed

php-8.1.13.tar.xz/ext/mysqli/tests/bug73462.phpt -> php-8.1.21.tar.xz/ext/mysqli/tests/bug73462.phpt Changed

php-8.1.13.tar.xz/ext/mysqli/tests/bug73949.phpt -> php-8.1.21.tar.xz/ext/mysqli/tests/bug73949.phpt Changed

php-8.1.13.tar.xz/ext/mysqli/tests/mysqli_connect.phpt -> php-8.1.21.tar.xz/ext/mysqli/tests/mysqli_connect.phpt Changed

php-8.1.13.tar.xz/ext/mysqli/tests/mysqli_connect_oo.phpt -> php-8.1.21.tar.xz/ext/mysqli/tests/mysqli_connect_oo.phpt Changed

php-8.1.13.tar.xz/ext/mysqli/tests/mysqli_fetch_array_large.phpt -> php-8.1.21.tar.xz/ext/mysqli/tests/mysqli_fetch_array_large.phpt Changed

php-8.1.13.tar.xz/ext/mysqli/tests/mysqli_real_connect.phpt -> php-8.1.21.tar.xz/ext/mysqli/tests/mysqli_real_connect.phpt Changed

php-8.1.13.tar.xz/ext/mysqli/tests/mysqli_real_connect_pconn.phpt -> php-8.1.21.tar.xz/ext/mysqli/tests/mysqli_real_connect_pconn.phpt Changed

php-8.1.13.tar.xz/ext/mysqli/tests/mysqli_report.phpt -> php-8.1.21.tar.xz/ext/mysqli/tests/mysqli_report.phpt Changed

php-8.1.13.tar.xz/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt -> php-8.1.21.tar.xz/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt Changed

php-8.1.13.tar.xz/ext/mysqlnd/mysqlnd_vio.c -> php-8.1.21.tar.xz/ext/mysqlnd/mysqlnd_vio.c Changed

php-8.1.13.tar.xz/ext/oci8/tests/CONFLICTS -> php-8.1.21.tar.xz/ext/oci8/tests/CONFLICTS Changed

php-8.1.13.tar.xz/ext/opcache/ZendAccelerator.c -> php-8.1.21.tar.xz/ext/opcache/ZendAccelerator.c Changed

@@ -354,6 +354,10 @@
 #ifdef ZEND_WIN32
 	accel_deactivate_sub();
 #else
+	if (lock_file == -1) {
+		return;
+	}
+
 	struct flock mem_usage_unlock_all;
 
 	mem_usage_unlock_all.l_type = F_UNLCK;
@@ -2354,18 +2358,18 @@
 	SHM_UNPROTECT();
 	zend_shared_alloc_lock();
 
-	entry = ce->inheritance_cache;
+	entry = proto->inheritance_cache;
 	while (entry) {
-		entry = zend_accel_inheritance_cache_find(entry, ce, parent, traits_and_interfaces, &needs_autoload);
+		entry = zend_accel_inheritance_cache_find(entry, proto, parent, traits_and_interfaces, &needs_autoload);
 		if (entry) {
+			zend_shared_alloc_unlock();
+			SHM_PROTECT();
 			if (!needs_autoload) {
-				zend_shared_alloc_unlock();
-				SHM_PROTECT();
-
 				zend_map_ptr_extend(ZCSG(map_ptr_last));
 				return entry->ce;
+			} else {
+				return NULL;
 			}
-			ZEND_ASSERT(0); // entry = entry->next; // This shouldn't be posible ???
 		}
 	}
 
@@ -3029,7 +3033,7 @@
 		int ret;
 
 		while (1) {
-			ret = fscanf(f, "%lx-%lx %4s %lx %9s %ld %s\n", &start, &end, perm, &offset, dev, &inode, name);
+			ret = fscanf(f, "%lx-%lx %4s %lx %9s %lu %s\n", &start, &end, perm, &offset, dev, &inode, name);
 			if (ret == 7) {
 				if (perm0 == 'r' && perm1 == '-' && perm2 == 'x' && name0 == '/') {
 					long unsigned int  seg_start = ZEND_MM_ALIGNED_SIZE_EX(start, huge_page_size);
@@ -3197,7 +3201,7 @@
 			size_t page_size;
 
 			page_size = zend_get_page_size();
-			if (!page_size && (page_size & (page_size - 1))) {
+			if (!page_size || (page_size & (page_size - 1))) {
 				zend_accel_error_noreturn(ACCEL_LOG_FATAL, "Failure to initialize shared memory structures - can't get page size.");
 				abort();
 			}
@@ -3975,7 +3979,7 @@
 			if (ce->type == ZEND_INTERNAL_CLASS) {
 				break;
 			}
-			if (!(ce->ce_flags & ZEND_ACC_CONSTANTS_UPDATED)) {
+			if ((ce->ce_flags & ZEND_ACC_LINKED) && !(ce->ce_flags & ZEND_ACC_CONSTANTS_UPDATED)) {
 				if (!(ce->ce_flags & ZEND_ACC_TRAIT)) { /* don't update traits */
 					CG(in_compilation) = 1; /* prevent autoloading */
 					if (preload_try_resolve_constants(ce)) {
@@ -4444,6 +4448,8 @@
 
 		if (PG(auto_globals_jit)) {
 			ping_auto_globals_mask = zend_accel_get_auto_globals();
+		} else {
+			ping_auto_globals_mask = 0;
 		}
 
 		if (EG(zend_constants)) {

php-8.1.13.tar.xz/ext/opcache/jit/zend_jit.c -> php-8.1.21.tar.xz/ext/opcache/jit/zend_jit.c Changed

@@ -4287,7 +4287,7 @@
 			/* perform real JIT for this function */
 			zend_real_jit_func(op_array, NULL, NULL);
 		} zend_catch {
-			do_bailout = 0;
+			do_bailout = true;
 		} zend_end_try();
 
 		zend_jit_protect();
@@ -4759,6 +4759,13 @@
 	zend_jit_trace_init_caches();
 }
 
+#ifdef ZTS
+static void zend_jit_globals_dtor(zend_jit_globals *jit_globals)
+{
+	zend_jit_trace_free_caches(jit_globals);
+}
+#endif
+
 static int zend_jit_parse_config_num(zend_long jit)
 {
 	if (jit == 0) {
@@ -4871,7 +4878,7 @@
 ZEND_EXT_API void zend_jit_init(void)
 {
 #ifdef ZTS
-	jit_globals_id = ts_allocate_id(&jit_globals_id, sizeof(zend_jit_globals), (ts_allocate_ctor) zend_jit_globals_ctor, NULL);
+	jit_globals_id = ts_allocate_id(&jit_globals_id, sizeof(zend_jit_globals), (ts_allocate_ctor) zend_jit_globals_ctor, (ts_allocate_dtor) zend_jit_globals_dtor);
 #else
 	zend_jit_globals_ctor(&jit_globals);
 #endif
@@ -5071,9 +5078,11 @@
 		zend_jit_perf_jitdump_close();
 	}
 #endif
-	if (JIT_G(exit_counters)) {
-		free(JIT_G(exit_counters));
-	}
+#ifdef ZTS
+	ts_free_id(jit_globals_id);
+#else
+	zend_jit_trace_free_caches(&jit_globals);
+#endif
 }
 
 static void zend_jit_reset_counters(void)

php-8.1.13.tar.xz/ext/opcache/jit/zend_jit_arm64.dasc -> php-8.1.21.tar.xz/ext/opcache/jit/zend_jit_arm64.dasc Changed

@@ -4834,7 +4834,7 @@
 				op2_reg = Z_REG(op2_addr);
 			}
 
-			if (!op2_range || (op2_range->min <= 0 && op2_range->max >= 0)) {
+			if ((op2_type & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE)) || !op2_range || (op2_range->min <= 0 && op2_range->max >= 0)) {
 				|	cbz Rx(op2_reg), >1
 				|.cold_code
 				|1:
@@ -5579,7 +5579,8 @@
 uint32_t val_info,
 zend_jit_addr res_addr,
 int in_cold,
- int save_r1)
+ int save_r1,
+ bool check_exception)
 /* Labels: 1,2,3 */
 {
 	zend_reg tmp_reg;
@@ -5629,7 +5630,9 @@
 			ZEND_ASSERT(Z_MODE(val_addr) == IS_MEM_ZVAL && Z_REG(val_addr) == ZREG_FP);
 			|	LOAD_32BIT_VAL FCARG1w, Z_OFFSET(val_addr)
 			|	EXT_CALL zend_jit_undefined_op_helper, REG0
-			|	cbz RETVALx, ->exception_handler_undef
+			if (check_exception) {
+				|	cbz RETVALx, ->exception_handler_undef
+			}
 			if (save_r1) {
 				|	ldr FCARG1x, T1	// restore
 			}
@@ -5938,7 +5941,7 @@
 				if (!keep_gc) {
 					|	str Rx(tmp_reg), T1 // save
 				}
-				if (!zend_jit_simple_assign(Dst, opline, var_addr, var_info, var_def_info, val_type, val_addr, val_info, res_addr, in_cold, 0)) {
+				if (!zend_jit_simple_assign(Dst, opline, var_addr, var_info, var_def_info, val_type, val_addr, val_info, res_addr, in_cold, 0, 0)) {
 					return 0;
 				}
 				if (!keep_gc) {
@@ -5946,7 +5949,7 @@
 				}
 			} else {
 				|	GET_ZVAL_PTR FCARG1x, var_use_addr, TMP1
-				if (!zend_jit_simple_assign(Dst, opline, var_addr, var_info, var_def_info, val_type, val_addr, val_info, res_addr, in_cold, 1)) {
+				if (!zend_jit_simple_assign(Dst, opline, var_addr, var_info, var_def_info, val_type, val_addr, val_info, res_addr, in_cold, 1, 0)) {
 					return 0;
 				}
 			}
@@ -5958,7 +5961,7 @@
 			}
 			|	ZVAL_DTOR_FUNC var_info, opline, TMP1
 			if (in_cold || (RC_MAY_BE_N(var_info) && (var_info & (MAY_BE_ARRAY|MAY_BE_OBJECT)) != 0)) {
-				if (check_exception) {
+				if (check_exception && !(val_info & MAY_BE_UNDEF)) {
 					|	MEM_LOAD_64_ZTS ldr, REG0, executor_globals, exception, TMP1
 					|	cbz REG0, >8
 					|	b ->exception_handler
@@ -5974,6 +5977,12 @@
 					|	b >8
 				}
 			}
+			if (check_exception && (val_info & MAY_BE_UNDEF)) {
+				|8:
+				|	MEM_LOAD_64_ZTS ldr, REG0, executor_globals, exception, TMP1
+				|	cbz REG0, >8
+				|	b ->exception_handler
+			}
 			if (in_cold) {
 				|.code
 			} else {
@@ -6002,7 +6011,7 @@
 	 }
 	}
 
-	if (!done && !zend_jit_simple_assign(Dst, opline, var_addr, var_info, var_def_info, val_type, val_addr, val_info, res_addr, 0, 0)) {
+	if (!done && !zend_jit_simple_assign(Dst, opline, var_addr, var_info, var_def_info, val_type, val_addr, val_info, res_addr, 0, 0, check_exception)) {
 		return 0;
 	}
 
@@ -6102,7 +6111,7 @@
 			|	b >9
 			|.code
 
-			if (!zend_jit_simple_assign(Dst, opline, var_addr, var_info, -1, (opline+1)->op1_type, op3_addr, val_info, res_addr, 0, 0)) {
+			if (!zend_jit_simple_assign(Dst, opline, var_addr, var_info, -1, (opline+1)->op1_type, op3_addr, val_info, res_addr, 0, 0, 0)) {
 				return 0;
 			}
 		} else {
@@ -7713,7 +7722,6 @@
 				}
 				op1_addr = real_addr;
 			}
-			|	LOAD_ZVAL_ADDR FCARG1x, op1_addr
 		}
 		if (opline->op2_type != IS_CONST) {
 			if (Z_MODE(op2_addr) == IS_REG) {
@@ -7725,6 +7733,9 @@
 			}
 			|	LOAD_ZVAL_ADDR FCARG2x, op2_addr
 		}
+		if (opline->op1_type != IS_CONST) {
+			|	LOAD_ZVAL_ADDR FCARG1x, op1_addr
+		}
 	}
 
 	if ((op1_info & op2_info & MAY_BE_ANY) == 0) {
@@ -8453,7 +8464,7 @@
 		}
 	}
 
-	if (!zend_jit_simple_assign(Dst, opline, res_addr, res_use_info, res_info, opline->op1_type, op1_addr, op1_info, 0, 0, 0)) {
+	if (!zend_jit_simple_assign(Dst, opline, res_addr, res_use_info, res_info, opline->op1_type, op1_addr, op1_info, 0, 0, 0, 1)) {
 		return 0;
 	}
 	if (!zend_jit_store_var_if_necessary(Dst, opline->result.var, res_addr, res_info)) {
@@ -8825,7 +8836,17 @@
 		|	// if (CACHED_PTR(opline->result.num))
 		|	ldr REG2, EX->run_time_cache
 		|	MEM_ACCESS_64_WITH_UOFFSET ldr, REG0, REG2, opline->result.num, TMP1
-		|	cbz REG0, >1
+		if (JIT_G(trigger) == ZEND_JIT_ON_HOT_TRACE
+		 && func
+		 && (func->common.fn_flags & ZEND_ACC_IMMUTABLE)
+		 && opline->opcode != ZEND_INIT_FCALL) {
+			/* Called func may be changed because of recompilation. See ext/opcache/tests/jit/init_fcall_003.phpt */
+			|	LOAD_ADDR REG1, ((ptrdiff_t)func)
+			|	cmp REG0, REG1
+			|	bne >1
+		} else {
+			|	cbz REG0, >1
+		}
 		|.cold_code
 		|1:
 		if (opline->opcode == ZEND_INIT_FCALL
@@ -9694,13 +9715,17 @@
 
 		zend_jit_reset_last_valid_opline();
 
-		|	// fbc->internal_function.handler(call, ret);
+		|	// (zend_execute_internal ? zend_execute_internal : fbc->internal_function.handler)(call, ret);
 		|	mov FCARG1x, RX
-		if (func) {
-			|	EXT_CALL func->internal_function.handler, REG0
+		if (zend_execute_internal) {
+			|	EXT_CALL zend_execute_internal, REG0
 		} else {
-			|	ldr TMP1, REG0, #offsetof(zend_internal_function, handler)
-			|	blr TMP1
+			if (func) {
+				|	EXT_CALL func->internal_function.handler, REG0
+			} else {
+				|	ldr TMP1, REG0, #offsetof(zend_internal_function, handler)
+				|	blr TMP1
+			}
 		}
 
 		|	// EG(current_execute_data) = execute_data;
@@ -12340,7 +12365,7 @@
 		type_loaded = 1;
 		prop_addr = ZEND_ADDR_MEM_ZVAL(ZREG_FCARG1, 0);
 		if (opline->opcode == ZEND_FETCH_OBJ_W
-		 && (!ce ||	ce_is_instanceof || (ce->ce_flags & ZEND_ACC_HAS_TYPE_HINTS))) {
+		 && (!ce ||	ce_is_instanceof || (ce->ce_flags & (ZEND_ACC_HAS_TYPE_HINTS|ZEND_ACC_TRAIT)))) {
 			uint32_t flags = opline->extended_value & ZEND_FETCH_OBJ_FLAGS;
 
 			|	ldr REG0, EX->run_time_cache
@@ -12824,7 +12849,7 @@
 		|	ldr TMP1, FCARG1x, #offsetof(zend_object, ce)
 		|	cmp REG2, TMP1
 		|	bne >7
-		if (!ce || ce_is_instanceof || (ce->ce_flags & ZEND_ACC_HAS_TYPE_HINTS)) {
+		if (!ce || ce_is_instanceof || (ce->ce_flags & (ZEND_ACC_HAS_TYPE_HINTS|ZEND_ACC_TRAIT))) {
 			|	MEM_ACCESS_64_WITH_UOFFSET ldr, TMP1, REG0, (opline->extended_value + sizeof(void*) * 2), TMP1
 			|	cbnz TMP1, >7
 		}
@@ -13258,7 +13283,7 @@
 		|	ldr TMP2, FCARG1x, #offsetof(zend_object, ce)
 		|	cmp REG2, TMP2
 		|	bne >7
-		if (!ce || ce_is_instanceof || (ce->ce_flags & ZEND_ACC_HAS_TYPE_HINTS)) {
+		if (!ce || ce_is_instanceof || (ce->ce_flags & (ZEND_ACC_HAS_TYPE_HINTS|ZEND_ACC_TRAIT))) {
 			|	MEM_ACCESS_64_WITH_UOFFSET ldr, TMP1, REG0, ((opline+1)->extended_value + sizeof(void*) * 2), TMP1
 			|	cbnz TMP1, >7
 		}
@@ -13636,7 +13661,7 @@
 		|	ldr TMP1, FCARG1x, #offsetof(zend_object, ce)
 		|	cmp REG2, TMP1
 		|	bne >5
-		if (!ce || ce_is_instanceof || (ce->ce_flags & ZEND_ACC_HAS_TYPE_HINTS)) {
+		if (!ce || ce_is_instanceof || (ce->ce_flags & (ZEND_ACC_HAS_TYPE_HINTS|ZEND_ACC_TRAIT))) {
 			|	MEM_ACCESS_64_WITH_UOFFSET ldr, FCARG2x, REG0, (opline->extended_value + sizeof(void*) * 2), TMP1
 		}
 		|	MEM_ACCESS_64_WITH_UOFFSET ldr, REG0, REG0, (opline->extended_value + sizeof(void*)), TMP1
@@ -13647,7 +13672,7 @@
 		|	IF_TYPE TMP1w, IS_UNDEF, >5
 		|	mov FCARG1x, TMP2
 		prop_addr = ZEND_ADDR_MEM_ZVAL(ZREG_FCARG1, 0);
-		if (!ce || ce_is_instanceof || (ce->ce_flags & ZEND_ACC_HAS_TYPE_HINTS)) {
+		if (!ce || ce_is_instanceof || (ce->ce_flags & (ZEND_ACC_HAS_TYPE_HINTS|ZEND_ACC_TRAIT))) {
 			|	cbnz FCARG2x, >1
 			|.cold_code
 			|1:
@@ -14527,6 +14552,20 @@
 {
 	zend_jit_addr op1_addr = ZEND_ADDR_MEM_ZVAL(ZREG_FP, opline->op1.var);
 
+	if (!MAY_BE_HASH(op1_info) && !MAY_BE_PACKED(op1_info)) {
+		/* empty array */
+		if (exit_addr) {
+			if (exit_opcode == ZEND_JMP) {
+				|	b &exit_addr
+			} else {
+				|	b >3
+			}
+		} else {
+			|	b =>target_label
+		}
+		return 1;
+	}
+
 	|	// array = EX_VAR(opline->op1.var);
 	|	// fe_ht = Z_ARRVAL_P(array);
 	|	GET_ZVAL_PTR FCARG1x, op1_addr, TMP1

php-8.1.13.tar.xz/ext/opcache/jit/zend_jit_disasm.c -> php-8.1.21.tar.xz/ext/opcache/jit/zend_jit_disasm.c Changed

php-8.1.13.tar.xz/ext/opcache/jit/zend_jit_helpers.c -> php-8.1.21.tar.xz/ext/opcache/jit/zend_jit_helpers.c Changed

@@ -2655,6 +2655,13 @@
 
 static void ZEND_FASTCALL zend_jit_inc_typed_prop(zval *var_ptr, zend_property_info *prop_info)
 {
+	ZEND_ASSERT(Z_TYPE_P(var_ptr) != IS_UNDEF);
+
+	if (UNEXPECTED((prop_info->flags & ZEND_ACC_READONLY))) {
+		zend_readonly_property_modification_error(prop_info);
+		return;
+	}
+
 	zend_execute_data *execute_data = EG(current_execute_data);
 	zval tmp;
 
@@ -2678,6 +2685,13 @@
 
 static void ZEND_FASTCALL zend_jit_dec_typed_prop(zval *var_ptr, zend_property_info *prop_info)
 {
+	ZEND_ASSERT(Z_TYPE_P(var_ptr) != IS_UNDEF);
+
+	if (UNEXPECTED((prop_info->flags & ZEND_ACC_READONLY))) {
+		zend_readonly_property_modification_error(prop_info);
+		return;
+	}
+
 	zend_execute_data *execute_data = EG(current_execute_data);
 	zval tmp;
 
@@ -2715,6 +2729,16 @@
 
 static void ZEND_FASTCALL zend_jit_post_inc_typed_prop(zval *var_ptr, zend_property_info *prop_info, zval *result)
 {
+	ZEND_ASSERT(Z_TYPE_P(var_ptr) != IS_UNDEF);
+
+	if (UNEXPECTED((prop_info->flags & ZEND_ACC_READONLY))) {
+		zend_readonly_property_modification_error(prop_info);
+		if (result) {
+			ZVAL_UNDEF(result);
+		}
+		return;
+	}
+
 	zend_execute_data *execute_data = EG(current_execute_data);
 
 	ZVAL_DEREF(var_ptr);
@@ -2736,6 +2760,16 @@
 
 static void ZEND_FASTCALL zend_jit_post_dec_typed_prop(zval *var_ptr, zend_property_info *prop_info, zval *result)
 {
+	ZEND_ASSERT(Z_TYPE_P(var_ptr) != IS_UNDEF);
+
+	if (UNEXPECTED((prop_info->flags & ZEND_ACC_READONLY))) {
+		zend_readonly_property_modification_error(prop_info);
+		if (result) {
+			ZVAL_UNDEF(result);
+		}
+		return;
+	}
+
 	zend_execute_data *execute_data = EG(current_execute_data);
 
 	ZVAL_DEREF(var_ptr);
@@ -3035,7 +3069,19 @@
 		} else {
 			zval tmp;
 
-			if (UNEXPECTED(zend_ast_evaluate(&tmp, ast, scope) != SUCCESS)) {
+			// Increase the refcount during zend_ast_evaluate to avoid releasing the ast too early
+			// on nested calls to zval_update_constant_ex which can happen when retriggering ast
+			// evaluation during autoloading.
+			zend_ast_ref *ast_ref = Z_AST_P(p);
+			bool ast_is_refcounted = !(GC_FLAGS(ast_ref) & GC_IMMUTABLE);
+			if (ast_is_refcounted) {
+				GC_ADDREF(ast_ref);
+			}
+			zend_result result = zend_ast_evaluate(&tmp, ast, scope);
+			if (ast_is_refcounted && !GC_DELREF(ast_ref)) {
+				rc_dtor_func((zend_refcounted *)ast_ref);
+			}
+			if (UNEXPECTED(result != SUCCESS)) {
 				return FAILURE;
 			}
 			zval_ptr_dtor_nogc(p);

php-8.1.13.tar.xz/ext/opcache/jit/zend_jit_internal.h -> php-8.1.21.tar.xz/ext/opcache/jit/zend_jit_internal.h Changed

php-8.1.13.tar.xz/ext/opcache/jit/zend_jit_trace.c -> php-8.1.21.tar.xz/ext/opcache/jit/zend_jit_trace.c Changed

@@ -247,6 +247,13 @@
 	t->code_size  = size;
 }
 
+/**
+ * Locate a trace in the #zend_jit_traces array with the specified
+ * #code_start address.
+ *
+ * @return the #zend_jit_traces index or 0 if no such #code_start
+ * address was found
+ */
 static uint32_t zend_jit_find_trace(const void *addr)
 {
 	uint32_t i;
@@ -256,7 +263,6 @@
 			return i;
 		}
 	}
-	ZEND_UNREACHABLE();
 	return 0;
 }
 
@@ -4973,6 +4979,14 @@
 									res_addr = 0;
 								} else {
 									res_addr = RES_REG_ADDR();
+									if (Z_MODE(res_addr) != IS_REG
+									 && zend_jit_trace_next_is_send_result(opline, p, frame)) {
+										send_result = 1;
+										res_addr = ZEND_ADDR_MEM_ZVAL(ZREG_RX, (opline+1)->result.var);
+										if (!zend_jit_reuse_ip(&dasm_state)) {
+											goto jit_failure;
+										}
+									}
 								}
 								if (!zend_jit_assign_to_typed_ref(&dasm_state, opline, opline->op2_type, op2_addr, res_addr, 1)) {
 									goto jit_failure;
@@ -6589,7 +6603,8 @@
 			op_array_ssa = &jit_extension->func_info.ssa;
 			top = frame;
 			if (frame->prev) {
-				checked_stack -= frame->used_stack;
+				checked_stack = frame->old_checked_stack;
+				peek_checked_stack = frame->old_peek_checked_stack;
 				frame = frame->prev;
 				stack = frame->stack;
 				ZEND_ASSERT(&frame->func->op_array == op_array);
@@ -6748,24 +6763,40 @@
 					}
 				}
 			}
+			call->old_checked_stack = checked_stack;
+			call->old_peek_checked_stack = peek_checked_stack;
 			if (p->info & ZEND_JIT_TRACE_FAKE_INIT_CALL) {
 				frame->call_level++;
-				call->used_stack = 0;
+				call->used_stack = checked_stack = peek_checked_stack = 0;
 			} else {
 				if (p->func) {
 					call->used_stack = zend_vm_calc_used_stack(init_opline->extended_value, (zend_function*)p->func);
 				} else {
 					call->used_stack = (ZEND_CALL_FRAME_SLOT + init_opline->extended_value) * sizeof(zval);
 				}
-				checked_stack += call->used_stack;
-				if (checked_stack > peek_checked_stack) {
-					peek_checked_stack = checked_stack;
+				switch (init_opline->opcode) {
+					case ZEND_INIT_FCALL:
+					case ZEND_INIT_FCALL_BY_NAME:
+					case ZEND_INIT_NS_FCALL_BY_NAME:
+					case ZEND_INIT_METHOD_CALL:
+					case ZEND_INIT_DYNAMIC_CALL:
+					//case ZEND_INIT_STATIC_METHOD_CALL:
+					//case ZEND_INIT_USER_CALL:
+					//case ZEND_NEW:
+						checked_stack += call->used_stack;
+						if (checked_stack > peek_checked_stack) {
+							peek_checked_stack = checked_stack;
+						}
+						break;
+					default:
+						checked_stack = peek_checked_stack = 0;
 				}
 			}
 		} else if (p->op == ZEND_JIT_TRACE_DO_ICALL) {
 			call = frame->call;
 			if (call) {
-				checked_stack -= call->used_stack;
+				checked_stack = call->old_checked_stack;
+				peek_checked_stack = call->old_peek_checked_stack;
 				top = call;
 				frame->call = call->prev;
 			}
@@ -6820,7 +6851,8 @@
 				if (!(t->flags & ZEND_JIT_TRACE_USES_INITIAL_IP)
 				 || (ra
 				  && zend_jit_trace_stack_needs_deoptimization(stack, op_array->last_var + op_array->T))) {
-					uint32_t exit_point = zend_jit_trace_get_exit_point(opline, ZEND_JIT_EXIT_TO_VM);
+					/* Deoptimize to the first instruction of the loop */
+					uint32_t exit_point = zend_jit_trace_get_exit_point(trace_buffer1.opline, ZEND_JIT_EXIT_TO_VM);
 
 					timeout_exit_addr = zend_jit_trace_get_exit_addr(exit_point);
 					if (!timeout_exit_addr) {
@@ -6843,6 +6875,15 @@
 			const void *timeout_exit_addr = NULL;
 
 			t->link = zend_jit_find_trace(p->opline->handler);
+			if (t->link == 0) {
+				/* this can happen if ZEND_JIT_EXIT_INVALIDATE was handled
+				 * by zend_jit_trace_exit() in another thread after this
+				 * thread set ZEND_JIT_TRACE_STOP_LINK in zend_jit_trace_execute();
+				 * ZEND_JIT_EXIT_INVALIDATE resets the opline handler to one of
+				 * the "_counter_handler" functions, and these are not registered
+				 * tracer functions */
+				goto jit_failure;
+			}
 			if ((zend_jit_tracest->link.flags & ZEND_JIT_TRACE_USES_INITIAL_IP)
 			 && !zend_jit_set_ip(&dasm_state, p->opline)) {
 				goto jit_failure;
@@ -7099,6 +7140,7 @@
 			    if (t->stack_map_size) {
 					zend_jit_trace_stack *shared_stack_map = (zend_jit_trace_stack*)zend_shared_alloc(t->stack_map_size * sizeof(zend_jit_trace_stack));
 					if (!shared_stack_map) {
+						efree(t->stack_map);
 						ret = ZEND_JIT_TRACE_STOP_NO_SHM;
 						goto exit;
 					}
@@ -7281,7 +7323,7 @@
 						fprintf(stderr, " op1(%sobject of class %s)", ref,
 							ZSTR_VAL(p->ce->name));
 					} else {
-						const char *type = (op1_type == 0) ? "undef" : zend_get_type_by_const(op1_type & ~(IS_TRACE_REFERENCE|IS_TRACE_INDIRECT|IS_TRACE_PACKED));
+						const char *type = ((op1_type & ~IS_TRACE_INDIRECT) == 0) ? "undef" : zend_get_type_by_const(op1_type & ~(IS_TRACE_REFERENCE|IS_TRACE_INDIRECT|IS_TRACE_PACKED));
 						fprintf(stderr, " op1(%s%s%s)", ref, (op1_type & IS_TRACE_PACKED) ? "packed " : "", type);
 					}
 				}
@@ -7294,7 +7336,7 @@
 						fprintf(stderr, " op2(%sobject of class %s)", ref,
 							ZSTR_VAL(p->ce->name));
 					} else {
-						const char *type = (op2_type == 0) ? "undef" : zend_get_type_by_const(op2_type & ~(IS_TRACE_REFERENCE|IS_TRACE_INDIRECT));
+						const char *type = ((op2_type & ~IS_TRACE_INDIRECT) == 0) ? "undef" : zend_get_type_by_const(op2_type & ~(IS_TRACE_REFERENCE|IS_TRACE_INDIRECT));
 						fprintf(stderr, " op2(%s%s)", ref, type);
 					}
 				}
@@ -7302,7 +7344,7 @@
 					const char *ref = (op3_type & IS_TRACE_INDIRECT) ?
 						((op3_type & IS_TRACE_REFERENCE) ? "*&" : "*") :
 						((op3_type & IS_TRACE_REFERENCE) ? "&" : "");
-					const char *type = (op3_type == 0) ? "undef" : zend_get_type_by_const(op3_type & ~(IS_TRACE_REFERENCE|IS_TRACE_INDIRECT));
+					const char *type = ((op3_type & ~IS_TRACE_INDIRECT) == 0) ? "undef" : zend_get_type_by_const(op3_type & ~(IS_TRACE_REFERENCE|IS_TRACE_INDIRECT));
 					fprintf(stderr, " op3(%s%s)", ref, type);
 				}
 			}
@@ -8126,22 +8168,34 @@
 			t = &zend_jit_tracesnum;
 		}
 
-		SHM_UNPROTECT();
-		zend_jit_unprotect();
+		zend_shared_alloc_lock();
 
 		jit_extension = (zend_jit_op_array_trace_extension*)ZEND_FUNC_INFO(t->op_array);
-		if (ZEND_OP_TRACE_INFO(t->opline, jit_extension->offset)->trace_flags & ZEND_JIT_TRACE_START_LOOP) {
-			((zend_op*)(t->opline))->handler = (const void*)zend_jit_loop_trace_counter_handler;
-		} else if (ZEND_OP_TRACE_INFO(t->opline, jit_extension->offset)->trace_flags & ZEND_JIT_TRACE_START_ENTER) {
-			((zend_op*)(t->opline))->handler = (const void*)zend_jit_func_trace_counter_handler;
-		} else if (ZEND_OP_TRACE_INFO(t->opline, jit_extension->offset)->trace_flags & ZEND_JIT_TRACE_START_RETURN) {
-			((zend_op*)(t->opline))->handler = (const void*)zend_jit_ret_trace_counter_handler;
+
+		/* Checks under lock, just in case something has changed while we were waiting for the lock */
+		if (!(ZEND_OP_TRACE_INFO(t->opline, jit_extension->offset)->trace_flags & (ZEND_JIT_TRACE_JITED|ZEND_JIT_TRACE_BLACKLISTED))) {
+			/* skip: not JIT-ed nor blacklisted */
+		} else if (ZEND_JIT_TRACE_NUM >= JIT_G(max_root_traces)) {
+			/* skip: too many root traces */
+		} else {
+			SHM_UNPROTECT();
+			zend_jit_unprotect();
+
+			if (ZEND_OP_TRACE_INFO(t->opline, jit_extension->offset)->trace_flags & ZEND_JIT_TRACE_START_LOOP) {
+				((zend_op*)(t->opline))->handler = (const void*)zend_jit_loop_trace_counter_handler;
+			} else if (ZEND_OP_TRACE_INFO(t->opline, jit_extension->offset)->trace_flags & ZEND_JIT_TRACE_START_ENTER) {
+				((zend_op*)(t->opline))->handler = (const void*)zend_jit_func_trace_counter_handler;
+			} else if (ZEND_OP_TRACE_INFO(t->opline, jit_extension->offset)->trace_flags & ZEND_JIT_TRACE_START_RETURN) {
+				((zend_op*)(t->opline))->handler = (const void*)zend_jit_ret_trace_counter_handler;
+			}
+			ZEND_OP_TRACE_INFO(t->opline, jit_extension->offset)->trace_flags &=
+				ZEND_JIT_TRACE_START_LOOP|ZEND_JIT_TRACE_START_ENTER|ZEND_JIT_TRACE_START_RETURN;
+
+			zend_jit_protect();
+			SHM_PROTECT();
 		}
-		ZEND_OP_TRACE_INFO(t->opline, jit_extension->offset)->trace_flags &=
-			ZEND_JIT_TRACE_START_LOOP|ZEND_JIT_TRACE_START_ENTER|ZEND_JIT_TRACE_START_RETURN;
 
-		zend_jit_protect();
-		SHM_PROTECT();
+		zend_shared_alloc_unlock();
 
 		return 0;
 	}
@@ -8296,6 +8350,13 @@
 #endif
 }
 
+static void zend_jit_trace_free_caches(zend_jit_globals *jit_globals)
+{
+	if (jit_globals->exit_counters) {
+		free(jit_globals->exit_counters);
+	}
+}
+
 static void zend_jit_trace_restart(void)
 {
 	ZEND_JIT_TRACE_NUM = 1;

php-8.1.13.tar.xz/ext/opcache/jit/zend_jit_x86.dasc -> php-8.1.21.tar.xz/ext/opcache/jit/zend_jit_x86.dasc Changed

@@ -5272,7 +5272,7 @@
 				}
 			}
 		} else {
-			if (!op2_range || (op2_range->min <= 0 && op2_range->max >= 0)) {
+			if ((op2_type & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE)) || !op2_range || (op2_range->min <= 0 && op2_range->max >= 0)) {
 				if (Z_MODE(op2_addr) == IS_MEM_ZVAL) {
 					|	cmp aword Ra(Z_REG(op2_addr))+Z_OFFSET(op2_addr), 0
 				} else if (Z_MODE(op2_addr) == IS_REG) {
@@ -6096,7 +6096,8 @@
 uint32_t val_info,
 zend_jit_addr res_addr,
 int in_cold,
- int save_r1)
+ int save_r1,
+ bool check_exception)
 /* Labels: 1,2,3 */
 {
 	zend_reg tmp_reg;
@@ -6146,8 +6147,10 @@
 			ZEND_ASSERT(Z_MODE(val_addr) == IS_MEM_ZVAL && Z_REG(val_addr) == ZREG_FP);
 			|	mov FCARG1d, Z_OFFSET(val_addr)
 			|	EXT_CALL zend_jit_undefined_op_helper, r0
-			|	test r0, r0
-			|	jz ->exception_handler_undef
+			if (check_exception) {
+				|	test r0, r0
+				|	jz ->exception_handler_undef
+			}
 			if (save_r1) {
 				|	mov FCARG1a, aword T1 // restore
 			}
@@ -6462,7 +6465,7 @@
 				if (!keep_gc) {
 					|	mov aword T1, Ra(tmp_reg) // save
 				}
-				if (!zend_jit_simple_assign(Dst, opline, var_addr, var_info, var_def_info, val_type, val_addr, val_info, res_addr, in_cold, 0)) {
+				if (!zend_jit_simple_assign(Dst, opline, var_addr, var_info, var_def_info, val_type, val_addr, val_info, res_addr, in_cold, 0, 0)) {
 					return 0;
 				}
 				if (!keep_gc) {
@@ -6470,7 +6473,7 @@
 				}
 			} else {
 				|	GET_ZVAL_PTR FCARG1a, var_use_addr
-				if (!zend_jit_simple_assign(Dst, opline, var_addr, var_info, var_def_info, val_type, val_addr, val_info, res_addr, in_cold, 1)) {
+				if (!zend_jit_simple_assign(Dst, opline, var_addr, var_info, var_def_info, val_type, val_addr, val_info, res_addr, in_cold, 1, 0)) {
 					return 0;
 				}
 			}
@@ -6482,7 +6485,7 @@
 			}
 			|	ZVAL_DTOR_FUNC var_info, opline
 			if (in_cold || (RC_MAY_BE_N(var_info) && (var_info & (MAY_BE_ARRAY|MAY_BE_OBJECT)) != 0)) {
-				if (check_exception) {
+				if (check_exception && !(val_info & MAY_BE_UNDEF)) {
 					|	MEM_CMP_ZTS aword, executor_globals, exception, 0, r0
 					|	je >8
 					|	jmp ->exception_handler
@@ -6498,6 +6501,12 @@
 					|	jmp >8
 				}
 			}
+			if (check_exception && (val_info & MAY_BE_UNDEF)) {
+				|8:
+				|	MEM_CMP_ZTS aword, executor_globals, exception, 0, r0
+				|	je >8
+				|	jmp ->exception_handler
+			}
 			if (in_cold) {
 				|.code
 			} else {
@@ -6526,7 +6535,7 @@
 	 }
 	}
 
-	if (!done && !zend_jit_simple_assign(Dst, opline, var_addr, var_info, var_def_info, val_type, val_addr, val_info, res_addr, 0, 0)) {
+	if (!done && !zend_jit_simple_assign(Dst, opline, var_addr, var_info, var_def_info, val_type, val_addr, val_info, res_addr, 0, 0, check_exception)) {
 		return 0;
 	}
 
@@ -6624,7 +6633,7 @@
 			|	jmp >9
 			|.code
 
-			if (!zend_jit_simple_assign(Dst, opline, var_addr, var_info, -1, (opline+1)->op1_type, op3_addr, val_info, res_addr, 0, 0)) {
+			if (!zend_jit_simple_assign(Dst, opline, var_addr, var_info, -1, (opline+1)->op1_type, op3_addr, val_info, res_addr, 0, 0, 0)) {
 				return 0;
 			}
 		} else {
@@ -8300,7 +8309,6 @@
 				}
 				op1_addr = real_addr;
 			}
-			|	LOAD_ZVAL_ADDR FCARG1a, op1_addr
 		}
 		if (opline->op2_type != IS_CONST) {
 			if (Z_MODE(op2_addr) == IS_REG) {
@@ -8312,6 +8320,9 @@
 			}
 			|	LOAD_ZVAL_ADDR FCARG2a, op2_addr
 		}
+		if (opline->op1_type != IS_CONST) {
+			|	LOAD_ZVAL_ADDR FCARG1a, op1_addr
+		}
 	}
 
 	if ((op1_info & op2_info & MAY_BE_ANY) == 0) {
@@ -9045,7 +9056,7 @@
 		}
 	}
 
-	if (!zend_jit_simple_assign(Dst, opline, res_addr, res_use_info, res_info, opline->op1_type, op1_addr, op1_info, 0, 0, 0)) {
+	if (!zend_jit_simple_assign(Dst, opline, res_addr, res_use_info, res_info, opline->op1_type, op1_addr, op1_info, 0, 0, 0, 1)) {
 		return 0;
 	}
 	if (!zend_jit_store_var_if_necessary(Dst, opline->result.var, res_addr, res_info)) {
@@ -9442,8 +9453,28 @@
 		|	// if (CACHED_PTR(opline->result.num))
 		|	mov r2, EX->run_time_cache
 		|	mov r0, aword r2 + opline->result.num
-		|	test r0, r0
-		|	jz >1
+		if (JIT_G(trigger) == ZEND_JIT_ON_HOT_TRACE
+		 && func
+		 && (func->common.fn_flags & ZEND_ACC_IMMUTABLE)
+		 && opline->opcode != ZEND_INIT_FCALL) {
+			/* Called func may be changed because of recompilation. See ext/opcache/tests/jit/init_fcall_003.phpt */
+			| .if X64
+			||		if (!IS_SIGNED_32BIT(func)) {
+			|			mov64 r1, ((ptrdiff_t)func)
+			|			cmp r0, r1
+			||		} else {
+			|			cmp r0, func
+			||		}
+			|	.else
+			|		cmp r0, func
+			|	.endif
+			|	jnz >1
+			|.cold_code
+			|1:
+		} else {
+			|	test r0, r0
+			|	jz >1
+		}
 		|.cold_code
 		|1:
 		if (opline->opcode == ZEND_INIT_FCALL
@@ -10383,12 +10414,23 @@
 
 		zend_jit_reset_last_valid_opline();
 
-		|	// fbc->internal_function.handler(call, ret);
-		|	mov FCARG1a, RX
-		if (func) {
-			|	EXT_CALL func->internal_function.handler, r0
+		|	// (zend_execute_internal ? zend_execute_internal : fbc->internal_function.handler)(call, ret);
+		if (zend_execute_internal) {
+			|.if X64
+				| // CARG2 and FCARG2a are identical
+				|	mov CARG1, RX
+			|.else
+				|	mov aword A2, FCARG2a
+				|	mov aword A1, RX
+			|.endif
+			|	EXT_CALL zend_execute_internal, r0
 		} else {
-			|	call aword r0 + offsetof(zend_internal_function, handler)
+			|	mov FCARG1a, RX
+			if (func) {
+				|	EXT_CALL func->internal_function.handler, r0
+			} else {
+				|	call aword r0 + offsetof(zend_internal_function, handler)
+			}
 		}
 
 		|	// EG(current_execute_data) = execute_data;
@@ -13066,7 +13108,7 @@
 		type_loaded = 1;
 		prop_addr = ZEND_ADDR_MEM_ZVAL(ZREG_FCARG1, 0);
 		if (opline->opcode == ZEND_FETCH_OBJ_W
-		 && (!ce ||	ce_is_instanceof || (ce->ce_flags & ZEND_ACC_HAS_TYPE_HINTS))) {
+		 && (!ce ||	ce_is_instanceof || (ce->ce_flags & (ZEND_ACC_HAS_TYPE_HINTS|ZEND_ACC_TRAIT)))) {
 			uint32_t flags = opline->extended_value & ZEND_FETCH_OBJ_FLAGS;
 
 			|	mov r0, EX->run_time_cache
@@ -13562,7 +13604,7 @@
 		|	mov r2, aword r0 + opline->extended_value
 		|	cmp r2, aword FCARG1a + offsetof(zend_object, ce)
 		|	jne >7
-		if (!ce || ce_is_instanceof || (ce->ce_flags & ZEND_ACC_HAS_TYPE_HINTS)) {
+		if (!ce || ce_is_instanceof || (ce->ce_flags & (ZEND_ACC_HAS_TYPE_HINTS|ZEND_ACC_TRAIT))) {
 			|	cmp aword r0 + opline->extended_value + sizeof(void*) * 2, 0
 			|	jnz >7
 		}
@@ -14035,7 +14077,7 @@
 		|	mov r2, aword r0 + (opline+1)->extended_value
 		|	cmp r2, aword FCARG1a + offsetof(zend_object, ce)
 		|	jne >7
-		if (!ce || ce_is_instanceof || (ce->ce_flags & ZEND_ACC_HAS_TYPE_HINTS)) {
+		if (!ce || ce_is_instanceof || (ce->ce_flags & (ZEND_ACC_HAS_TYPE_HINTS|ZEND_ACC_TRAIT))) {
 			|	cmp aword r0 + (opline+1)->extended_value + sizeof(void*) * 2, 0
 			|	jnz >7
 		}
@@ -14454,7 +14496,7 @@
 		|	mov r2, aword r0 + opline->extended_value
 		|	cmp r2, aword FCARG1a + offsetof(zend_object, ce)
 		|	jne >5
-		if (!ce || ce_is_instanceof || (ce->ce_flags & ZEND_ACC_HAS_TYPE_HINTS)) {
+		if (!ce || ce_is_instanceof || (ce->ce_flags & (ZEND_ACC_HAS_TYPE_HINTS|ZEND_ACC_TRAIT))) {
 			|	mov FCARG2a, aword r0 + opline->extended_value + sizeof(void*) * 2
 		}
 		|	mov r0, aword r0 + opline->extended_value + sizeof(void*)
@@ -14463,7 +14505,7 @@
 		|	IF_TYPE byte FCARG1a + r0 + 8, IS_UNDEF, >5
 		|	add FCARG1a, r0
 		prop_addr = ZEND_ADDR_MEM_ZVAL(ZREG_FCARG1, 0);
-		if (!ce || ce_is_instanceof || (ce->ce_flags & ZEND_ACC_HAS_TYPE_HINTS)) {
+		if (!ce || ce_is_instanceof || (ce->ce_flags & (ZEND_ACC_HAS_TYPE_HINTS|ZEND_ACC_TRAIT))) {
 			|	test FCARG2a, FCARG2a
 			|	jnz >1
 			|.cold_code
@@ -15429,6 +15471,20 @@
 {
 	zend_jit_addr op1_addr = ZEND_ADDR_MEM_ZVAL(ZREG_FP, opline->op1.var);
 
+	if (!MAY_BE_HASH(op1_info) && !MAY_BE_PACKED(op1_info)) {
+		/* empty array */
+		if (exit_addr) {
+			if (exit_opcode == ZEND_JMP) {
+				|	jmp &exit_addr
+			} else {
+				|	jmp >3
+			}
+		} else {
+			|	jmp =>target_label
+		}
+		return 1;
+	}
+
 	|	// array = EX_VAR(opline->op1.var);
 	|	// fe_ht = Z_ARRVAL_P(array);
 	|	GET_ZVAL_PTR FCARG1a, op1_addr
@@ -16200,11 +16256,17 @@
 					}
 				}
 				if ((op1_info & MAY_BE_LONG) && (op2_info & MAY_BE_DOUBLE)) {
+					if (opline->op1_type == IS_CONST) {
+						ZEND_REGSET_INCL(regset, ZREG_R0);
+					}
 					if (ssa_op->result_def != current_var) {
 						ZEND_REGSET_INCL(regset, ZREG_XMM0);
 					}
 				}
 				if ((op1_info & MAY_BE_DOUBLE) && (op2_info & MAY_BE_LONG)) {
+					if (opline->op2_type == IS_CONST) {
+						ZEND_REGSET_INCL(regset, ZREG_R0);
+					}
 					if (zend_is_commutative(opline->opcode)) {
 						if (ssa_op->result_def != current_var) {
 							ZEND_REGSET_INCL(regset, ZREG_XMM0);

php-8.1.13.tar.xz/ext/opcache/tests/bug78175_2.phpt -> php-8.1.21.tar.xz/ext/opcache/tests/bug78175_2.phpt Changed

php-8.1.13.tar.xz/ext/opcache/tests/bug78376.phpt -> php-8.1.21.tar.xz/ext/opcache/tests/bug78376.phpt Changed

php-8.1.21.tar.xz/ext/opcache/tests/gh8065.phpt Added

php-8.1.21.tar.xz/ext/opcache/tests/gh9968-1.inc Added

php-8.1.21.tar.xz/ext/opcache/tests/gh9968-2.inc Added

php-8.1.21.tar.xz/ext/opcache/tests/gh9968.phpt Added

php-8.1.21.tar.xz/ext/opcache/tests/jit/assign_055.phpt Added

php-8.1.21.tar.xz/ext/opcache/tests/jit/assign_056.phpt Added

php-8.1.21.tar.xz/ext/opcache/tests/jit/assign_obj_op_003.phpt Added

php-8.1.13.tar.xz/ext/opcache/tests/jit/bug80861.phpt -> php-8.1.21.tar.xz/ext/opcache/tests/jit/bug80861.phpt Changed

php-8.1.21.tar.xz/ext/opcache/tests/jit/fetch_static_prop_001.phpt Added

php-8.1.21.tar.xz/ext/opcache/tests/jit/gh10271.phpt Added

@@ -0,0 +1,47 @@
+--TEST--
+GH-10271: Incorrect arithmetic calculations when using JIT
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=1M
+opcache.jit_hot_loop=1
+--FILE--
+<?php
+$tang'KSI'=-9.1751656444142E-5;
+$tang'ETA'=8.5076090069491E-5;
+
+$sol'X''k'=-222.45470924306;
+$sol'X''e'=-8.1787760034414;
+$sol'X'1=-0.020231298698539;
+
+$sol'Y''k'=-14.400586941152;
+$sol'Y''e'=392.95090925357;
+$sol'Y'1=-0.035664413413272;
+
+$sol'xc'=968;
+$sol'yc'=548;
+
+for( $p=0; $p<3; $p++ )
+{
+	print($p.': ');
+	Tangential2XY($tang,$sol);
+}
+
+function Tangential2XY(array $tang, array $sol) : array
+{
+	$x = $sol'X''k'*$tang'KSI' + $sol'X''e'*$tang'ETA' + $sol'X'1;
+	$y = $sol'Y''k'*$tang'KSI' + $sol'Y''e'*$tang'ETA' + $sol'Y'1;
+	printf("In;%.12f;%.12f;%.12f;%.12f;",$x,$y,$sol'xc',$sol'yc');
+	$x = $sol'xc'*($x+1);
+	$y = $sol'yc'*($y+1);
+	printf("Out;%.12f;%.12f\n",$x,$y);
+	if( $x<100 )
+		exit("Mamy to!\n");
+	return 'x'=>$x,'y'=>$y;
+}
+?>
+--EXPECT--
+0: In;-0.000516528926;-0.000912408759;968.000000000000;548.000000000000;Out;967.500000000004;547.500000000009
+1: In;-0.000516528926;-0.000912408759;968.000000000000;548.000000000000;Out;967.500000000004;547.500000000009
+2: In;-0.000516528926;-0.000912408759;968.000000000000;548.000000000000;Out;967.500000000004;547.500000000009

php-8.1.21.tar.xz/ext/opcache/tests/jit/gh10635.phpt Added

php-8.1.21.tar.xz/ext/opcache/tests/jit/identical_003.phpt Added

php-8.1.21.tar.xz/ext/opcache/tests/jit/init_fcall_003.inc Added

php-8.1.21.tar.xz/ext/opcache/tests/jit/init_fcall_003.phpt Added

php-8.1.21.tar.xz/ext/opcache/tests/jit/mod_007.phpt Added

php-8.1.21.tar.xz/ext/opcache/tests/jit/readonly_001.phpt Added

php-8.1.21.tar.xz/ext/opcache/tests/jit/readonly_002.phpt Added

php-8.1.21.tar.xz/ext/opcache/tests/jit/readonly_003.phpt Added

php-8.1.21.tar.xz/ext/opcache/tests/jit/readonly_004.phpt Added

php-8.1.21.tar.xz/ext/opcache/tests/jit/readonly_005.phpt Added

php-8.1.21.tar.xz/ext/opcache/tests/jit/readonly_006.phpt Added

php-8.1.21.tar.xz/ext/opcache/tests/jit/readonly_007.phpt Added

php-8.1.21.tar.xz/ext/opcache/tests/jit/readonly_008.phpt Added

php-8.1.21.tar.xz/ext/opcache/tests/opt/assign_op_002.phpt Added

php-8.1.21.tar.xz/ext/opcache/tests/opt/gh10801.phpt Added

php-8.1.21.tar.xz/ext/opcache/tests/opt/gh11170.phpt Added

@@ -0,0 +1,145 @@
+--TEST--
+GH-11170 (Too wide OR and AND range inferred)
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.optimization_level=-1
+opcache.opt_debug_level=0x400000
+opcache.preload=
+--EXTENSIONS--
+opcache
+--FILE--
+<?php
+function test_or() {
+ if (rand() % 10) {
+ $a = -27;
+ $b = -20;
+ } else {
+ $a = -7;
+ $b = -10;
+ }
+
+ return $a | $b;
+}
+
+function test_and() {
+ if (rand() % 10) {
+ $a = -12;
+ $b = -27;
+ } else {
+ $a = -9;
+ $b = -25;
+ }
+
+ return $a & $b;
+}
+
+test_or();
+test_and();
+?>
+--EXPECTF--
+$_main:
+ ; (lines=5, args=0, vars=0, tmps=2, ssa_vars=0, no_loops)
+ ; (after dfa pass)
+ ; %s
+ ; return long RANGE1..1
+BB0:
+ ; start exit lines=0-4
+ ; level=0
+0000 INIT_FCALL 0 %d string("test_or")
+0001 DO_UCALL
+0002 INIT_FCALL 0 %d string("test_and")
+0003 DO_UCALL
+0004 RETURN int(1)
+
+test_or:
+ ; (lines=11, args=0, vars=2, tmps=7, ssa_vars=11, no_loops)
+ ; (after dfa pass)
+ ; %s
+ ; return long RANGE-20..-1
+ ; #0.CV0($a) NOVAL undef
+ ; #1.CV1($b) NOVAL undef
+BB0:
+ ; start lines=0-3
+ ; to=(BB2, BB1)
+ ; level=0
+ ; children=(BB1, BB2, BB3)
+0000 INIT_FCALL 0 %d string("rand")
+0001 #2.V2 long = DO_ICALL
+0002 #3.T3 long RANGEMIN..MAX = MOD #2.V2 long int(10)
+0003 JMPZ #3.T3 long RANGEMIN..MAX BB2
+
+BB1:
+ ; follow lines=4-6
+ ; from=(BB0)
+ ; to=(BB3)
+ ; idom=BB0
+ ; level=1
+0004 #4.CV0($a) long RANGE-27..-27 = QM_ASSIGN int(-27)
+0005 #5.CV1($b) long RANGE-20..-20 = QM_ASSIGN int(-20)
+0006 JMP BB3
+
+BB2:
+ ; target lines=7-8
+ ; from=(BB0)
+ ; to=(BB3)
+ ; idom=BB0
+ ; level=1
+0007 #6.CV0($a) long RANGE-7..-7 = QM_ASSIGN int(-7)
+0008 #7.CV1($b) long RANGE-10..-10 = QM_ASSIGN int(-10)
+
+BB3:
+ ; follow target exit lines=9-10
+ ; from=(BB1, BB2)
+ ; idom=BB0
+ ; level=1
+ #8.CV0($a) long RANGE-27..-7 = Phi(#4.CV0($a) long RANGE-27..-27, #6.CV0($a) long RANGE-7..-7)
+ #9.CV1($b) long RANGE-20..-10 = Phi(#5.CV1($b) long RANGE-20..-20, #7.CV1($b) long RANGE-10..-10)
+0009 #10.T8 long RANGE-20..-1 = BW_OR #8.CV0($a) long RANGE-27..-7 #9.CV1($b) long RANGE-20..-10
+0010 RETURN #10.T8 long RANGE-20..-1
+
+test_and:
+ ; (lines=11, args=0, vars=2, tmps=7, ssa_vars=11, no_loops)
+ ; (after dfa pass)
+ ; %s
+ ; return long RANGE-28..-25
+ ; #0.CV0($a) NOVAL undef
+ ; #1.CV1($b) NOVAL undef
+BB0:
+ ; start lines=0-3
+ ; to=(BB2, BB1)
+ ; level=0
+ ; children=(BB1, BB2, BB3)
+0000 INIT_FCALL 0 %d string("rand")
+0001 #2.V2 long = DO_ICALL
+0002 #3.T3 long RANGEMIN..MAX = MOD #2.V2 long int(10)
+0003 JMPZ #3.T3 long RANGEMIN..MAX BB2
+
+BB1:
+ ; follow lines=4-6
+ ; from=(BB0)
+ ; to=(BB3)
+ ; idom=BB0
+ ; level=1
+0004 #4.CV0($a) long RANGE-12..-12 = QM_ASSIGN int(-12)
+0005 #5.CV1($b) long RANGE-27..-27 = QM_ASSIGN int(-27)
+0006 JMP BB3
+
+BB2:
+ ; target lines=7-8
+ ; from=(BB0)
+ ; to=(BB3)
+ ; idom=BB0
+ ; level=1
+0007 #6.CV0($a) long RANGE-9..-9 = QM_ASSIGN int(-9)
+0008 #7.CV1($b) long RANGE-25..-25 = QM_ASSIGN int(-25)
+
+BB3:
+ ; follow target exit lines=9-10
+ ; from=(BB1, BB2)
+ ; idom=BB0
+ ; level=1
+ #8.CV0($a) long RANGE-12..-9 = Phi(#4.CV0($a) long RANGE-12..-12, #6.CV0($a) long RANGE-9..-9)
+ #9.CV1($b) long RANGE-27..-25 = Phi(#5.CV1($b) long RANGE-27..-27, #7.CV1($b) long RANGE-25..-25)
+0009 #10.T8 long RANGE-28..-25 = BW_AND #8.CV0($a) long RANGE-12..-9 #9.CV1($b) long RANGE-27..-25
+0010 RETURN #10.T8 long RANGE-28..-25

php-8.1.21.tar.xz/ext/opcache/tests/opt/gh11245_1.phpt Added

php-8.1.21.tar.xz/ext/opcache/tests/opt/gh11245_2.phpt Added

php-8.1.13.tar.xz/ext/opcache/tests/preload_const_autoload.inc -> php-8.1.21.tar.xz/ext/opcache/tests/preload_const_autoload.inc Changed

php-8.1.13.tar.xz/ext/opcache/tests/preload_method_static_vars.phpt -> php-8.1.21.tar.xz/ext/opcache/tests/preload_method_static_vars.phpt Changed

php-8.1.13.tar.xz/ext/opcache/tests/preload_trait_static.phpt -> php-8.1.21.tar.xz/ext/opcache/tests/preload_trait_static.phpt Changed

php-8.1.21.tar.xz/ext/opcache/tests/preloading_no_auto_globals_jit.inc Added

php-8.1.21.tar.xz/ext/opcache/tests/preloading_no_auto_globals_jit.phpt Added

php-8.1.13.tar.xz/ext/opcache/zend_accelerator_module.c -> php-8.1.21.tar.xz/ext/opcache/zend_accelerator_module.c Changed

@@ -70,8 +70,8 @@
 		zend_accel_error(ACCEL_LOG_WARNING, "opcache.memory_consumption is set below the required 8MB.\n");
 		return FAILURE;
 	}
-	if (UNEXPECTED(memsize > ZEND_ULONG_MAX / (1024 * 1024))) {
-		*p = ZEND_ULONG_MAX;
+	if (UNEXPECTED(memsize > ZEND_LONG_MAX / (1024 * 1024))) {
+		*p = ZEND_LONG_MAX;
 	} else {
 		*p = memsize * (1024 * 1024);
 	}
@@ -108,6 +108,19 @@
 	return SUCCESS;
 }
 
+static ZEND_INI_MH(OnUpdateConsistencyChecks)
+{
+	zend_long *p = (zend_long *) ZEND_INI_GET_ADDR();
+	zend_long consistency_checks = atoi(ZSTR_VAL(new_value));
+
+	if (consistency_checks != 0) {
+		zend_accel_error(ACCEL_LOG_WARNING, "opcache.consistency_checks is reset back to 0 because it does not work properly (see GH-8065, GH-10624).\n");
+		return FAILURE;
+	}
+	*p = 0;
+	return SUCCESS;
+}
+
 static ZEND_INI_MH(OnEnable)
 {
 	if (stage == ZEND_INI_STAGE_STARTUP ||
@@ -242,7 +255,7 @@
 	STD_PHP_INI_ENTRY("opcache.interned_strings_buffer", "8"  , PHP_INI_SYSTEM, OnUpdateLong,                 accel_directives.interned_strings_buffer,   zend_accel_globals, accel_globals)
 	STD_PHP_INI_ENTRY("opcache.max_accelerated_files" , "10000", PHP_INI_SYSTEM, OnUpdateMaxAcceleratedFiles,	 accel_directives.max_accelerated_files,     zend_accel_globals, accel_globals)
 	STD_PHP_INI_ENTRY("opcache.max_wasted_percentage" , "5"   , PHP_INI_SYSTEM, OnUpdateMaxWastedPercentage,	 accel_directives.max_wasted_percentage,     zend_accel_globals, accel_globals)
-	STD_PHP_INI_ENTRY("opcache.consistency_checks"    , "0"   , PHP_INI_ALL   , OnUpdateLong,	             accel_directives.consistency_checks,        zend_accel_globals, accel_globals)
+	STD_PHP_INI_ENTRY("opcache.consistency_checks"    , "0"   , PHP_INI_ALL   , OnUpdateConsistencyChecks,	     accel_directives.consistency_checks,        zend_accel_globals, accel_globals)
 	STD_PHP_INI_ENTRY("opcache.force_restart_timeout" , "180" , PHP_INI_SYSTEM, OnUpdateLong,	             accel_directives.force_restart_timeout,     zend_accel_globals, accel_globals)
 	STD_PHP_INI_ENTRY("opcache.revalidate_freq"       , "2"   , PHP_INI_ALL   , OnUpdateLong,	             accel_directives.revalidate_freq,           zend_accel_globals, accel_globals)
 	STD_PHP_INI_ENTRY("opcache.file_update_protection", "2"   , PHP_INI_ALL   , OnUpdateLong,                accel_directives.file_update_protection,    zend_accel_globals, accel_globals)

php-8.1.13.tar.xz/ext/opcache/zend_persist.c -> php-8.1.21.tar.xz/ext/opcache/zend_persist.c Changed

php-8.1.13.tar.xz/ext/opcache/zend_shared_alloc.c -> php-8.1.21.tar.xz/ext/opcache/zend_shared_alloc.c Changed

php-8.1.13.tar.xz/ext/openssl/openssl.c -> php-8.1.21.tar.xz/ext/openssl/openssl.c Changed

@@ -1347,7 +1347,7 @@
 
 	/* Values for key types */
 	REGISTER_LONG_CONSTANT("OPENSSL_KEYTYPE_RSA", OPENSSL_KEYTYPE_RSA, CONST_CS|CONST_PERSISTENT);
-#ifndef NO_DSA
+#ifndef OPENSSL_NO_DSA
 	REGISTER_LONG_CONSTANT("OPENSSL_KEYTYPE_DSA", OPENSSL_KEYTYPE_DSA, CONST_CS|CONST_PERSISTENT);
 #endif
 	REGISTER_LONG_CONSTANT("OPENSSL_KEYTYPE_DH", OPENSSL_KEYTYPE_DH, CONST_CS|CONST_PERSISTENT);
@@ -2716,11 +2716,13 @@
 	if (p12 != NULL) {
 		bio_out = BIO_new_file(file_path, PHP_OPENSSL_BIO_MODE_W(PKCS7_BINARY));
 		if (bio_out != NULL) {
-
-			i2d_PKCS12_bio(bio_out, p12);
+			if (i2d_PKCS12_bio(bio_out, p12) == 0) {
+				php_openssl_store_errors();
+				php_error_docref(NULL, E_WARNING, "Error writing to file %s", file_path);
+			} else {
+				RETVAL_TRUE;
+			}
 			BIO_free(bio_out);
-
-			RETVAL_TRUE;
 		} else {
 			php_openssl_store_errors();
 			php_error_docref(NULL, E_WARNING, "Error opening file %s", file_path);
@@ -3759,7 +3761,7 @@
 	switch (key_type) {
 	case OPENSSL_KEYTYPE_RSA:
 		return EVP_PKEY_RSA;
-#if !defined(NO_DSA)
+#if !defined(OPENSSL_NO_DSA)
 	case OPENSSL_KEYTYPE_DSA:
 		return EVP_PKEY_DSA;
 #endif
@@ -3811,7 +3813,7 @@
 		}
 
 		switch (type) {
-#if !defined(NO_DSA)
+#if !defined(OPENSSL_NO_DSA)
 		case EVP_PKEY_DSA:
 			if (EVP_PKEY_CTX_set_dsa_paramgen_bits(ctx, req->priv_key_bits) <= 0) {
 				php_openssl_store_errors();
@@ -4830,6 +4832,7 @@
 	}
 }
 
+#ifdef HAVE_EVP_PKEY_EC
 static zend_string *php_openssl_get_utf8_param(
 		EVP_PKEY *pkey, const char *param, const char *name) {
 	char buf64;
@@ -4843,6 +4846,7 @@
 	return NULL;
 }
 #endif
+#endif
 
 /* {{{ returns an array with the key details (bits, pkey, type)*/
 PHP_FUNCTION(openssl_pkey_get_details)
@@ -4907,6 +4911,7 @@
 			php_openssl_copy_bn_param(&ary, pkey, OSSL_PKEY_PARAM_PRIV_KEY, "priv_key");
 			php_openssl_copy_bn_param(&ary, pkey, OSSL_PKEY_PARAM_PUB_KEY, "pub_key");
 			break;
+#ifdef HAVE_EVP_PKEY_EC
 		case EVP_PKEY_EC: {
 			ktype = OPENSSL_KEYTYPE_EC;
 			array_init(&ary);
@@ -4935,6 +4940,7 @@
 			php_openssl_copy_bn_param(&ary, pkey, OSSL_PKEY_PARAM_PRIV_KEY, "d");
 			break;
 		}
+#endif
 		EMPTY_SWITCH_DEFAULT_CASE();
 	}
 #else
@@ -5400,7 +5406,11 @@
 			}
 
 			if (p7bout) {
-				PEM_write_bio_PKCS7(p7bout, p7);
+				if (PEM_write_bio_PKCS7(p7bout, p7) == 0) {
+					php_error_docref(NULL, E_WARNING, "Failed to write PKCS7 to file");
+					php_openssl_store_errors();
+					RETVAL_FALSE;
+				}
 			}
 		}
 	} else {
@@ -5985,7 +5995,11 @@
 			}
 
 			if (p7bout) {
-				PEM_write_bio_CMS(p7bout, cms);
+				if (PEM_write_bio_CMS(p7bout, cms) == 0) {
+					php_error_docref(NULL, E_WARNING, "Failed to write CMS to file");
+					php_openssl_store_errors();
+					RETVAL_FALSE;
+				}
 			}
 		}
 	} else {

php-8.1.13.tar.xz/ext/openssl/tests/bug41033.phpt -> php-8.1.21.tar.xz/ext/openssl/tests/bug41033.phpt Changed

php-8.1.13.tar.xz/ext/openssl/tests/bug73711.phpt -> php-8.1.21.tar.xz/ext/openssl/tests/bug73711.phpt Changed

php-8.1.13.tar.xz/ext/openssl/tests/bug79589.phpt -> php-8.1.21.tar.xz/ext/openssl/tests/bug79589.phpt Changed

php-8.1.13.tar.xz/ext/openssl/tests/bug80747.phpt -> php-8.1.21.tar.xz/ext/openssl/tests/bug80747.phpt Changed

php-8.1.13.tar.xz/ext/openssl/tests/bug81713.phpt -> php-8.1.21.tar.xz/ext/openssl/tests/bug81713.phpt Changed

php-8.1.13.tar.xz/ext/openssl/tests/ecc.phpt -> php-8.1.21.tar.xz/ext/openssl/tests/ecc.phpt Changed

php-8.1.13.tar.xz/ext/openssl/tests/openssl_csr_export_basic.phpt -> php-8.1.21.tar.xz/ext/openssl/tests/openssl_csr_export_basic.phpt Changed

php-8.1.13.tar.xz/ext/openssl/tests/openssl_csr_export_to_file_basic.phpt -> php-8.1.21.tar.xz/ext/openssl/tests/openssl_csr_export_to_file_basic.phpt Changed

php-8.1.13.tar.xz/ext/openssl/tests/openssl_csr_get_public_key_basic.phpt -> php-8.1.21.tar.xz/ext/openssl/tests/openssl_csr_get_public_key_basic.phpt Changed

php-8.1.13.tar.xz/ext/openssl/tests/openssl_csr_get_subject_basic.phpt -> php-8.1.21.tar.xz/ext/openssl/tests/openssl_csr_get_subject_basic.phpt Changed

php-8.1.13.tar.xz/ext/openssl/tests/openssl_csr_sign_basic.phpt -> php-8.1.21.tar.xz/ext/openssl/tests/openssl_csr_sign_basic.phpt Changed

php-8.1.13.tar.xz/ext/openssl/tests/openssl_pkey_new_basic.phpt -> php-8.1.21.tar.xz/ext/openssl/tests/openssl_pkey_new_basic.phpt Changed

php-8.1.21.tar.xz/ext/openssl/tests/san_ipv6_peer_matching.phpt Added

@@ -0,0 +1,69 @@
+--TEST--
+IPv6 Peer verification matches SAN names
+--EXTENSIONS--
+openssl
+--SKIPIF--
+<?php
+if (!function_exists("proc_open")) die("skip no proc_open");
+if (getenv("CI_NO_IPV6") || !defined("AF_INET6")) {
+ die('skip no IPv6 support');
+}
+if (@stream_socket_client('udp://::1:8888') === false)
+ die('skip no IPv6 support');
+?>
+--FILE--
+<?php
+$certFile = __DIR__ . DIRECTORY_SEPARATOR . 'san_ipv6_peer_matching.pem.tmp';
+$san = 'IP:2001:db8:85a3:8d3:1319:8a2e:370:7348';
+
+$serverCode = <<<'CODE'
+ $serverUri = "ssl://::1:64324";
+ $serverFlags = STREAM_SERVER_BIND | STREAM_SERVER_LISTEN;
+ $serverCtx = stream_context_create('ssl' => 
+ 'local_cert' => '%s',
+ );
+
+ $server = stream_socket_server($serverUri, $errno, $errstr, $serverFlags, $serverCtx);
+ phpt_notify();
+
+ @stream_socket_accept($server, 1);
+ @stream_socket_accept($server, 1);
+CODE;
+$serverCode = sprintf($serverCode, $certFile);
+
+$clientCode = <<<'CODE'
+ $serverUri = "ssl://::1:64324";
+ $clientFlags = STREAM_CLIENT_CONNECT;
+ $clientCtx = stream_context_create('ssl' => 
+ 'verify_peer' => false,
+ );
+
+ phpt_wait();
+
+ stream_context_set_option($clientCtx, 'ssl', 'peer_name', '2001:db8:85a3:8d3:1319:8a2e:370:7348');
+ var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx));
+
+ stream_context_set_option($clientCtx, 'ssl', 'peer_name', '2001:db8:85a3:8d3:1319:8a2e:370:7349');
+ var_dump(stream_socket_client($serverUri, $errno, $errstr, 1, $clientFlags, $clientCtx));
+CODE;
+
+include 'CertificateGenerator.inc';
+$certificateGenerator = new CertificateGenerator();
+$certificateGenerator->saveNewCertAsFileWithKey(null, $certFile, null, $san);
+
+include 'ServerClientTestCase.inc';
+ServerClientTestCase::getInstance()->run($clientCode, $serverCode);
+?>
+--CLEAN--
+<?php
+@unlink(__DIR__ . DIRECTORY_SEPARATOR . 'san_ipv6_peer_matching.pem.tmp');
+?>
+--EXPECTF--
+resource(%d) of type (stream)
+
+Warning: stream_socket_client(): Unable to locate peer certificate CN in %s on line %d
+
+Warning: stream_socket_client(): Failed to enable crypto in %s on line %d
+
+Warning: stream_socket_client(): Unable to connect to ssl://::1:64324 (Unknown error) in %s on line %d
+bool(false)

php-8.1.13.tar.xz/ext/openssl/xp_ssl.c -> php-8.1.21.tar.xz/ext/openssl/xp_ssl.c Changed

@@ -39,6 +39,7 @@
 #ifdef PHP_WIN32
 #include "win32/winutil.h"
 #include "win32/time.h"
+#include <Ws2tcpip.h>
 #include <Wincrypt.h>
 /* These are from Wincrypt.h, they conflict with OpenSSL */
 #undef X509_NAME
@@ -46,6 +47,10 @@
 #undef X509_EXTENSIONS
 #endif
 
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
 /* Flags for determining allowed stream crypto methods */
 #define STREAM_CRYPTO_IS_CLIENT (1<<0)
 #define STREAM_CRYPTO_METHOD_SSLv2 (1<<1)
@@ -110,6 +115,24 @@
 #define PHP_X509_NAME_ENTRY_TO_UTF8(ne, i, out) \
 	ASN1_STRING_to_UTF8(&out, X509_NAME_ENTRY_get_data(X509_NAME_get_entry(ne, i)))
 
+#if defined(HAVE_IPV6) && defined(HAVE_INET_PTON)
+/* Used for IPv6 Address peer verification */
+#define EXPAND_IPV6_ADDRESS(_str, _bytes) \
+	do { \
+		snprintf(_str, 40, "%X:%X:%X:%X:%X:%X:%X:%X", \
+			_bytes0 << 8 | _bytes1, \
+			_bytes2 << 8 | _bytes3, \
+			_bytes4 << 8 | _bytes5, \
+			_bytes6 << 8 | _bytes7, \
+			_bytes8 << 8 | _bytes9, \
+			_bytes10 << 8 | _bytes11, \
+			_bytes12 << 8 | _bytes13, \
+			_bytes14 << 8 | _bytes15 \
+		); \
+	} while(0)
+#define HAVE_IPV6_SAN 1
+#endif
+
 #if PHP_OPENSSL_API_VERSION < 0x10100
 static RSA *php_openssl_tmp_rsa_cb(SSL *s, int is_export, int keylength);
 #endif
@@ -421,6 +444,19 @@
 	GENERAL_NAMES *alt_names = X509_get_ext_d2i(peer, NID_subject_alt_name, 0, 0);
 	int alt_name_count = sk_GENERAL_NAME_num(alt_names);
 
+#ifdef HAVE_IPV6_SAN
+	/* detect if subject name is an IPv6 address and expand once if required */
+	char subject_name_ipv6_expanded40;
+	unsigned char ipv616;
+	bool subject_name_is_ipv6 = false;
+	subject_name_ipv6_expanded0 = 0;
+
+	if (inet_pton(AF_INET6, subject_name, &ipv6)) {
+		EXPAND_IPV6_ADDRESS(subject_name_ipv6_expanded, ipv6);
+		subject_name_is_ipv6 = true;
+	}
+#endif
+
 	for (i = 0; i < alt_name_count; i++) {
 		GENERAL_NAME *san = sk_GENERAL_NAME_value(alt_names, i);
 
@@ -459,10 +495,17 @@
 					return 1;
 				}
 			}
-			/* No, we aren't bothering to check IPv6 addresses. Why?
-			 * Because IP SAN names are officially deprecated and are
-			 * not allowed by CAs starting in 2015. Deal with it.
-			 */
+#ifdef HAVE_IPV6_SAN
+			else if (san->d.ip->length == 16 && subject_name_is_ipv6) {
+				ipbuffer0 = 0;
+				EXPAND_IPV6_ADDRESS(ipbuffer, san->d.iPAddress->data);
+				if (strcasecmp((const char*)subject_name_ipv6_expanded, (const char*)ipbuffer) == 0) {
+					sk_GENERAL_NAME_pop_free(alt_names, GENERAL_NAME_free);
+
+					return 1;
+				}
+			}
+#endif
 		}
 	}
 
@@ -1222,7 +1265,7 @@
 		return FAILURE;
 	}
 
-	if (SSL_CTX_set0_tmp_dh_pkey(ctx, pkey) < 0) {
+	if (SSL_CTX_set0_tmp_dh_pkey(ctx, pkey) == 0) {
 		php_error_docref(NULL, E_WARNING, "Failed assigning DH params");
 		EVP_PKEY_free(pkey);
 		return FAILURE;
@@ -1236,7 +1279,7 @@
 		return FAILURE;
 	}
 
-	if (SSL_CTX_set_tmp_dh(ctx, dh) < 0) {
+	if (SSL_CTX_set_tmp_dh(ctx, dh) == 0) {
 		php_error_docref(NULL, E_WARNING, "Failed assigning DH params");
 		DH_free(dh);
 		return FAILURE;
@@ -1305,7 +1348,10 @@
 		php_error_docref(NULL, E_WARNING, "rsa_key_size context option has been removed");
 	}
 
-	php_openssl_set_server_dh_param(stream, ctx);
+	if (php_openssl_set_server_dh_param(stream, ctx) == FAILURE) {
+		return FAILURE;
+	}
+
 	zv = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "ssl", "single_dh_use");
 	if (zv == NULL || zend_is_true(zv)) {
 		ssl_ctx_options |= SSL_OP_SINGLE_DH_USE;

php-8.1.13.tar.xz/ext/pcntl/pcntl.c -> php-8.1.21.tar.xz/ext/pcntl/pcntl.c Changed

@@ -50,6 +50,8 @@
 # define NSIG 32
 #endif
 
+#include "Zend/zend_max_execution_timer.h"
+
 ZEND_DECLARE_MODULE_GLOBALS(pcntl)
 static PHP_GINIT_FUNCTION(pcntl);
 
@@ -485,10 +487,18 @@
 PHP_RSHUTDOWN_FUNCTION(pcntl)
 {
 	struct php_pcntl_pending_signal *sig;
+	zend_long signo;
+	zval *handle;
+
+	/* Reset all signals to their default disposition */
+	ZEND_HASH_FOREACH_NUM_KEY_VAL(&PCNTL_G(php_signal_table), signo, handle) {
+		if (Z_TYPE_P(handle) != IS_LONG || Z_LVAL_P(handle) != (zend_long)SIG_DFL) {
+			php_signal(signo, (Sigfunc *)(zend_long)SIG_DFL, 0);
+		}
+	} ZEND_HASH_FOREACH_END();
 
-	/* FIXME: if a signal is delivered after this point, things will go pear shaped;
-	 * need to remove signal handlers */
 	zend_hash_destroy(&PCNTL_G(php_signal_table));
+
 	while (PCNTL_G(head)) {
 		sig = PCNTL_G(head);
 		PCNTL_G(head) = sig->next;
@@ -499,6 +509,7 @@
 		PCNTL_G(spares) = sig->next;
 		efree(sig);
 	}
+
 	return SUCCESS;
 }
 
@@ -522,6 +533,8 @@
 	if (id == -1) {
 		PCNTL_G(last_error) = errno;
 		php_error_docref(NULL, E_WARNING, "Error %d", errno);
+	} else if (id == 0) {
+		zend_max_execution_timer_init();
 	}
 
 	RETURN_LONG((zend_long) id);

php-8.1.13.tar.xz/ext/pcre/php_pcre.c -> php-8.1.21.tar.xz/ext/pcre/php_pcre.c Changed

php-8.1.21.tar.xz/ext/pcre/tests/gh10968.phpt Added

php-8.1.13.tar.xz/ext/pdo/pdo_dbh.c -> php-8.1.21.tar.xz/ext/pdo/pdo_dbh.c Changed

php-8.1.13.tar.xz/ext/pdo/pdo_sql_parser.c -> php-8.1.21.tar.xz/ext/pdo/pdo_sql_parser.c Changed

php-8.1.13.tar.xz/ext/pdo/pdo_sql_parser.re -> php-8.1.21.tar.xz/ext/pdo/pdo_sql_parser.re Changed

php-8.1.13.tar.xz/ext/pdo_firebird/firebird_statement.c -> php-8.1.21.tar.xz/ext/pdo_firebird/firebird_statement.c Changed

@@ -30,6 +30,37 @@
 
 #define RECORD_ERROR(stmt) _firebird_error(NULL, stmt,  __FILE__, __LINE__)
 
+#define READ_AND_RETURN_USING_MEMCPY(type, sqldata) do { \
+		type ret; \
+		memcpy(&ret, sqldata, sizeof(ret)); \
+		return ret; \
+	} while (0);
+
+static zend_always_inline ISC_INT64 get_isc_int64_from_sqldata(const ISC_SCHAR *sqldata)
+{
+	READ_AND_RETURN_USING_MEMCPY(ISC_INT64, sqldata);
+}
+
+static zend_always_inline ISC_LONG get_isc_long_from_sqldata(const ISC_SCHAR *sqldata)
+{
+	READ_AND_RETURN_USING_MEMCPY(ISC_LONG, sqldata);
+}
+
+static zend_always_inline double get_double_from_sqldata(const ISC_SCHAR *sqldata)
+{
+	READ_AND_RETURN_USING_MEMCPY(double, sqldata);
+}
+
+static zend_always_inline ISC_TIMESTAMP get_isc_timestamp_from_sqldata(const ISC_SCHAR *sqldata)
+{
+	READ_AND_RETURN_USING_MEMCPY(ISC_TIMESTAMP, sqldata);
+}
+
+static zend_always_inline ISC_QUAD get_isc_quad_from_sqldata(const ISC_SCHAR *sqldata)
+{
+	READ_AND_RETURN_USING_MEMCPY(ISC_QUAD, sqldata);
+}
+
 /* free the allocated space for passing field values to the db and back */
 static void free_sqlda(XSQLDA const *sqlda) /* {{{ */
 {
@@ -377,16 +408,18 @@
 					n = *(short*)var->sqldata;
 					break;
 				case SQL_LONG:
-					n = *(ISC_LONG*)var->sqldata;
+					n = get_isc_long_from_sqldata(var->sqldata);
 					break;
 				case SQL_INT64:
-					n = *(ISC_INT64*)var->sqldata;
+					n = get_isc_int64_from_sqldata(var->sqldata);
+					break;
+				case SQL_DOUBLE:
 					break;
 				EMPTY_SWITCH_DEFAULT_CASE()
 			}
 
 			if ((var->sqltype & ~1) == SQL_DOUBLE) {
-				str = zend_strpprintf(0, "%.*F", -var->sqlscale, *(double*)var->sqldata);
+				str = zend_strpprintf(0, "%.*F", -var->sqlscale, get_double_from_sqldata(var->sqldata));
 			} else if (n >= 0) {
 				str = zend_strpprintf(0, "%" LL_MASK "d.%0*" LL_MASK "d",
 					n / f, -var->sqlscale, n % f);
@@ -412,13 +445,13 @@
 					ZVAL_LONG(result, *(short*)var->sqldata);
 					break;
 				case SQL_LONG:
-					ZVAL_LONG(result, *(ISC_LONG*)var->sqldata);
+					ZVAL_LONG(result, get_isc_long_from_sqldata(var->sqldata));
 					break;
 				case SQL_INT64:
 #if SIZEOF_ZEND_LONG >= 8
-					ZVAL_LONG(result, *(ISC_INT64*)var->sqldata);
+					ZVAL_LONG(result, get_isc_int64_from_sqldata(var->sqldata));
 #else
-					ZVAL_STR(result, zend_strpprintf(0, "%" LL_MASK "d", *(ISC_INT64*)var->sqldata));
+					ZVAL_STR(result, zend_strpprintf(0, "%" LL_MASK "d", get_isc_int64_from_sqldata(var->sqldata)));
 #endif
 					break;
 				case SQL_FLOAT:
@@ -427,7 +460,7 @@
 					break;
 				case SQL_DOUBLE:
 					/* TODO: Why is this not returned as the native type? */
-					ZVAL_STR(result, zend_strpprintf(0, "%F", *(double*)var->sqldata));
+					ZVAL_STR(result, zend_strpprintf(0, "%F", get_double_from_sqldata(var->sqldata)));
 					break;
 #ifdef SQL_BOOLEAN
 				case SQL_BOOLEAN:
@@ -443,7 +476,10 @@
 						fmt = S->H->time_format ? S->H->time_format : PDO_FB_DEF_TIME_FMT;
 					} else if (0) {
 				case SQL_TIMESTAMP:
-						isc_decode_timestamp((ISC_TIMESTAMP*)var->sqldata, &t);
+						{
+							ISC_TIMESTAMP timestamp = get_isc_timestamp_from_sqldata(var->sqldata);
+							isc_decode_timestamp(&timestamp, &t);
+						}
 						fmt = S->H->timestamp_format ? S->H->timestamp_format : PDO_FB_DEF_TIMESTAMP_FMT;
 					}
 					/* convert the timestamp into a string */
@@ -451,8 +487,10 @@
 					size_t len = strftime(buf, sizeof(buf), fmt, &t);
 					ZVAL_STRINGL(result, buf, len);
 					break;
-				case SQL_BLOB:
-					return firebird_fetch_blob(stmt, colno, result, (ISC_QUAD*)var->sqldata);
+				case SQL_BLOB: {
+					ISC_QUAD quad = get_isc_quad_from_sqldata(var->sqldata);
+					return firebird_fetch_blob(stmt, colno, result, &quad);
+				}
 			}
 		}
 	}
@@ -605,7 +643,12 @@
 						*var->sqlind = -1;
 						return 1;
 					}
-					return firebird_bind_blob(stmt, (ISC_QUAD*)var->sqldata, parameter);
+					ISC_QUAD quad = get_isc_quad_from_sqldata(var->sqldata);
+					if (firebird_bind_blob(stmt, &quad, parameter) != 0) {
+						memcpy(var->sqldata, &quad, sizeof(quad));
+						return 1;
+					}
+					return 0;
 				}
 			}

php-8.1.21.tar.xz/ext/pdo_firebird/tests/gh10908.phpt Added

@@ -0,0 +1,155 @@
+--TEST--
+GH-10908 (Bus error with PDO Firebird on RPI with 64 bit kernel and 32 bit userland)
+--EXTENSIONS--
+pdo_firebird
+--SKIPIF--
+<?php require('skipif.inc'); ?>
+--ENV--
+LSAN_OPTIONS=detect_leaks=0
+--FILE--
+<?php
+
+require("testdb.inc");
+
+$sql = <<<EOT
+CREATE TABLE gh10908(
+ ID BIGINT NOT NULL,
+ CODE VARCHAR(60) NOT NULL,
+ NUM NUMERIC(18, 3),
+ DBL DOUBLE PRECISION,
+ FLT FLOAT,
+ TS TIMESTAMP,
+ MYDATE DATE,
+ MYTIME TIME,
+ MYBLOB BLOB,
+ MYBINARY BINARY(2),
+ MYVARBINARY VARBINARY(2),
+ MYSMALLINT SMALLINT,
+ MYINT INT,
+ MYCHAR CHAR(10),
+ MYVARCHAR VARCHAR(5),
+ MYBOOL BOOLEAN
+);
+EOT;
+$dbh->exec($sql);
+$dbh->exec("INSERT INTO gh10908 VALUES(1, 'ABC', 12.34, 1.0, 2.0, '2023-03-24 17:39', '2023-03-24', '17:39', 'abcdefg', 'ab', 'a', 32767, 200000, 'azertyuiop', 'ab', false);");
+
+function query_and_dump($dbh, $sql) {
+ foreach ($dbh->query($sql) as $row) {
+ print_r($row);
+ print("\n");
+ }
+}
+
+query_and_dump($dbh, "SELECT CODE FROM gh10908"); // works fine
+query_and_dump($dbh, "SELECT ID FROM gh10908"); // Used to "bus error"
+query_and_dump($dbh, "SELECT NUM FROM gh10908"); // Used to "bus error"
+query_and_dump($dbh, "SELECT DBL FROM gh10908"); // Used to "bus error"
+query_and_dump($dbh, "SELECT TS FROM gh10908"); // Used to "bus error"
+query_and_dump($dbh, "SELECT MYBLOB FROM gh10908"); // Used to "bus error"
+query_and_dump($dbh, "SELECT * FROM gh10908"); // Used to "bus error"
+
+query_and_dump($dbh, "SELECT CAST(NUM AS NUMERIC(9, 3)) FROM gh10908"); // works fine
+query_and_dump($dbh, "SELECT CAST(ID AS INTEGER) FROM gh10908"); // works fine
+query_and_dump($dbh, "SELECT CAST(ID AS BIGINT) FROM gh10908"); // Used to "bus error"
+
+echo "Did not crash\n";
+
+?>
+--CLEAN--
+<?php
+require 'testdb.inc';
+$dbh->exec("DROP TABLE gh10908");
+?>
+--EXPECT--
+Array
+(
+ CODE => ABC
+ 0 => ABC
+)
+
+Array
+(
+ ID => 1
+ 0 => 1
+)
+
+Array
+(
+ NUM => 12.340
+ 0 => 12.340
+)
+
+Array
+(
+ DBL => 1.000000
+ 0 => 1.000000
+)
+
+Array
+(
+ TS => 2023-03-24 17:39:00
+ 0 => 2023-03-24 17:39:00
+)
+
+Array
+(
+ MYBLOB => abcdefg
+ 0 => abcdefg
+)
+
+Array
+(
+ ID => 1
+ 0 => 1
+ CODE => ABC
+ 1 => ABC
+ NUM => 12.340
+ 2 => 12.340
+ DBL => 1.000000
+ 3 => 1.000000
+ FLT => 2.000000
+ 4 => 2.000000
+ TS => 2023-03-24 17:39:00
+ 5 => 2023-03-24 17:39:00
+ MYDATE => 2023-03-24
+ 6 => 2023-03-24
+ MYTIME => 17:39:00
+ 7 => 17:39:00
+ MYBLOB => abcdefg
+ 8 => abcdefg
+ MYBINARY => ab
+ 9 => ab
+ MYVARBINARY => a
+ 10 => a
+ MYSMALLINT => 32767
+ 11 => 32767
+ MYINT => 200000
+ 12 => 200000
+ MYCHAR => azertyuiop
+ 13 => azertyuiop
+ MYVARCHAR => ab
+ 14 => ab
+ MYBOOL => 
+ 15 => 
+)
+
+Array
+(
+ CAST => 12.340
+ 0 => 12.340
+)
+
+Array
+(
+ CAST => 1
+ 0 => 1
+)
+
+Array
+(
+ CAST => 1
+ 0 => 1
+)
+
+Did not crash

php-8.1.13.tar.xz/ext/pdo_mysql/mysql_driver.c -> php-8.1.21.tar.xz/ext/pdo_mysql/mysql_driver.c Changed

php-8.1.13.tar.xz/ext/pdo_mysql/tests/pdo_mysql___construct.phpt -> php-8.1.21.tar.xz/ext/pdo_mysql/tests/pdo_mysql___construct.phpt Changed

php-8.1.13.tar.xz/ext/pdo_oci/config.m4 -> php-8.1.21.tar.xz/ext/pdo_oci/config.m4 Changed

php-8.1.13.tar.xz/ext/pdo_oci/oci_statement.c -> php-8.1.21.tar.xz/ext/pdo_oci/oci_statement.c Changed

@@ -616,6 +616,7 @@
 	OCILobLocator *lob;
 	oci_lob_env *E;
 	ub4 offset;
+	ub1 csfrm;
 };
 
 static ssize_t oci_blob_write(php_stream *stream, const char *buf, size_t count)
@@ -641,23 +642,34 @@
 static ssize_t oci_blob_read(php_stream *stream, char *buf, size_t count)
 {
 	struct oci_lob_self *self = (struct oci_lob_self*)stream->abstract;
-	ub4 amt;
-	sword r;
+#if HAVE_OCILOBREAD2
+	oraub8 byte_amt = (oraub8) count;
+	oraub8 char_amt = 0;
 
-	amt = (ub4) count;
-	r = OCILobRead(self->E->svc, self->E->err, self->lob,
-		&amt, self->offset, buf, (ub4) count,
+	sword r = OCILobRead2(self->E->svc, self->E->err, self->lob,
+		&byte_amt, &char_amt, (oraub8) self->offset, buf, (oraub8) count,
+ OCI_ONE_PIECE, NULL, NULL, 0, self->csfrm);
+#else
+	ub4 byte_amt = (ub4) count;
+
+	sword r = OCILobRead(self->E->svc, self->E->err, self->lob,
+		&byte_amt, self->offset, buf, (ub4) count,
 		NULL, NULL, 0, SQLCS_IMPLICIT);
+#endif
 
 	if (r != OCI_SUCCESS && r != OCI_NEED_DATA) {
-		return (size_t)-1;
+		return (ssize_t)-1;
 	}
 
-	self->offset += amt;
-	if (amt < count) {
+#if HAVE_OCILOBREAD2
+	self->offset += self->csfrm == 0 ? byte_amt : char_amt;
+#else
+	self->offset += byte_amt;
+#endif
+	if (byte_amt < count) {
 		stream->eof = 1;
 	}
-	return amt;
+	return byte_amt;
 }
 
 static int oci_blob_close(php_stream *stream, int close_handle)
@@ -724,6 +736,8 @@
 	self->E->svc = self->S->H->svc;
 	self->E->err = self->S->err;
 
+	OCILobCharSetForm(self->S->H->env, self->S->err, self->lob, &self->csfrm);
+
 	stm = php_stream_alloc(&oci_blob_stream_ops, self, 0, "r+b");
 
 	if (stm) {

php-8.1.13.tar.xz/ext/pdo_oci/tests/CONFLICTS -> php-8.1.21.tar.xz/ext/pdo_oci/tests/CONFLICTS Changed

php-8.1.13.tar.xz/ext/pdo_oci/tests/bug60994.phpt -> php-8.1.21.tar.xz/ext/pdo_oci/tests/bug60994.phpt Changed

@@ -21,18 +21,19 @@
 $dbh->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
 
 @$dbh->exec('DROP TABLE pdo_oci_bug60994');
-$dbh->exec('CREATE TABLE pdo_oci_bug60994 (id NUMBER, data CLOB)');
+$dbh->exec('CREATE TABLE pdo_oci_bug60994 (id NUMBER, data CLOB, data2 NCLOB)');
 
 $id = null;
-$insert = $dbh->prepare('INSERT INTO pdo_oci_bug60994 (id, data) VALUES (:id, :data)');
+$insert = $dbh->prepare('INSERT INTO pdo_oci_bug60994 (id, data, data2) VALUES (:id, :data, :data2)');
 $insert->bindParam(':id', $id, \PDO::PARAM_STR);
-$select = $dbh->prepare("SELECT data FROM pdo_oci_bug60994 WHERE id = :id");
+$select = $dbh->prepare("SELECT data, data2 FROM pdo_oci_bug60994 WHERE id = :id");
 
 
 echo PHP_EOL, 'Test 1:  j', PHP_EOL;
 $string1 = 'abc' . str_repeat('j', 8187) . 'xyz'; // 8193 chars total works fine here (even 1 million works fine, subject to memory_limit)
 $id = 1;
 $insert->bindParam(':data', $string1, \PDO::PARAM_STR, strlen($string1)); // length in bytes
+$insert->bindParam(':data2', $string1, \PDO::PARAM_STR, strlen($string1));
 $insert->execute();
 $select->bindParam(':id', $id, \PDO::PARAM_STR);
 $select->execute();
@@ -44,12 +45,15 @@
 echo 'size of stream1 is ', strlen($stream1), ' bytes, ', mb_strlen($stream1), ' chars.', PHP_EOL;
 echo 'beg  of stream1 is ', $start1, PHP_EOL;
 echo 'end  of stream1 is ', $ending1, PHP_EOL;
-
+if ($string1 != $stream1 || $stream1 != stream_get_contents($row'DATA2')) {
+    echo 'Expected nclob value to match clob value for stream1', PHP_EOL;
+}
 
 echo PHP_EOL, 'Test 2:  £', PHP_EOL;
 $string2 = 'abc' . str_repeat('£', 8187) . 'xyz'; // 8193 chars total is when it breaks
 $id = 2;
 $insert->bindParam(':data', $string2, \PDO::PARAM_STR, strlen($string2)); // length in bytes
+$insert->bindParam(':data2', $string2, \PDO::PARAM_STR, strlen($string2));
 $insert->execute();
 $select->bindParam(':id', $id, \PDO::PARAM_STR);
 $select->execute();
@@ -61,12 +65,15 @@
 echo 'size of stream2 is ', strlen($stream2), ' bytes, ', mb_strlen($stream2), ' chars.', PHP_EOL;
 echo 'beg  of stream2 is ', $start2, PHP_EOL;
 echo 'end  of stream2 is ', $ending2, PHP_EOL;
-
+if ($string2 != $stream2 || $stream2 != stream_get_contents($row'DATA2')) {
+    echo 'Expected nclob value to match clob value for stream2', PHP_EOL;
+}
 
 echo PHP_EOL, 'Test 3:  Җ', PHP_EOL;
 $string3 = 'abc' . str_repeat('Җ', 8187) . 'xyz'; // 8193 chars total is when it breaks
 $id = 3;
 $insert->bindParam(':data', $string3, \PDO::PARAM_STR, strlen($string3)); // length in bytes
+$insert->bindParam(':data2', $string3, \PDO::PARAM_STR, strlen($string3));
 $insert->execute();
 $select->bindParam(':id', $id, \PDO::PARAM_STR);
 $select->execute();
@@ -78,12 +85,15 @@
 echo 'size of stream3 is ', strlen($stream3), ' bytes, ', mb_strlen($stream3), ' chars.', PHP_EOL;
 echo 'beg  of stream3 is ', $start3, PHP_EOL;
 echo 'end  of stream3 is ', $ending3, PHP_EOL;
-
+if ($string3 != $stream3 || $stream3 != stream_get_contents($row'DATA2')) {
+    echo 'Expected nclob value to match clob value for stream3', PHP_EOL;
+}
 
 echo PHP_EOL, 'Test 4:  の', PHP_EOL;
 $string4 = 'abc' . str_repeat('の', 8187) . 'xyz'; // 8193 chars total is when it breaks
 $id = 4;
 $insert->bindParam(':data', $string4, \PDO::PARAM_STR, strlen($string4)); // length in bytes
+$insert->bindParam(':data2', $string4, \PDO::PARAM_STR, strlen($string4));
 $insert->execute();
 $select->bindParam(':id', $id, \PDO::PARAM_STR);
 $select->execute();
@@ -95,13 +105,14 @@
 echo 'size of stream4 is ', strlen($stream4), ' bytes, ', mb_strlen($stream4), ' chars.', PHP_EOL;
 echo 'beg  of stream4 is ', $start4, PHP_EOL;
 echo 'end  of stream4 is ', $ending4, PHP_EOL;
+if ($string4 != $stream4 || $stream4 != stream_get_contents($row'DATA2')) {
+    echo 'Expected nclob value to match clob value for stream4', PHP_EOL;
+}
 ?>
---XFAIL--
-Fails due to Bug 60994
 --EXPECT--
 Test 1:  j
-size of string1 is 1000006 bytes, 1000006 chars.
-size of stream1 is 1000006 bytes, 1000006 chars.
+size of string1 is 8193 bytes, 8193 chars.
+size of stream1 is 8193 bytes, 8193 chars.
 beg  of stream1 is abcjjjjjjj
 end  of stream1 is jjjjjjjxyz

php-8.1.13.tar.xz/ext/pdo_oci/tests/oci_success_with_info.phpt -> php-8.1.21.tar.xz/ext/pdo_oci/tests/oci_success_with_info.phpt Changed

php-8.1.13.tar.xz/ext/pdo_odbc/odbc_driver.c -> php-8.1.21.tar.xz/ext/pdo_odbc/odbc_driver.c Changed

php-8.1.13.tar.xz/ext/pdo_sqlite/sqlite_driver.c -> php-8.1.21.tar.xz/ext/pdo_sqlite/sqlite_driver.c Changed

php-8.1.21.tar.xz/ext/pdo_sqlite/tests/bug81740.phpt Added

php-8.1.13.tar.xz/ext/pgsql/pgsql.c -> php-8.1.21.tar.xz/ext/pgsql/pgsql.c Changed

@@ -172,6 +172,7 @@
 		PQclear(res);
 	}
 	if (!link->persistent) {
+		PQuntrace(link->conn);
 		PQfinish(link->conn);
 	}
 	PGG(num_links)--;
@@ -2464,7 +2465,7 @@
 		CHECK_PGSQL_LINK(link);
 	}
 	else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(),
-								 "Ols", &pgsql_link, pgsql_link_ce, &oid_long, &mode) == SUCCESS) {
+								 "OlS", &pgsql_link, pgsql_link_ce, &oid_long, &mode) == SUCCESS) {
 		if (oid_long <= (zend_long)InvalidOid) {
 			zend_value_error("Invalid OID value passed");
 			RETURN_THROWS();
@@ -2760,7 +2761,7 @@
 
 	/* allow string to handle large OID value correctly */
 	if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(),
-								 "rlP", &pgsql_link, pgsql_link_ce, &oid_long, &file_out) == SUCCESS) {
+								 "OlP", &pgsql_link, pgsql_link_ce, &oid_long, &file_out) == SUCCESS) {
 		if (oid_long <= (zend_long)InvalidOid) {
 			zend_value_error("Invalid OID value passed");
 			RETURN_THROWS();
@@ -4343,7 +4344,7 @@
 			/* pg_type.typtype */
 			add_assoc_bool_ex(&elem, "is base", sizeof("is base") - 1, !strcmp(PQgetvalue(pg_result, i, 7), "b"));
 			add_assoc_bool_ex(&elem, "is composite", sizeof("is composite") - 1, !strcmp(PQgetvalue(pg_result, i, 7), "c"));
-			add_assoc_bool_ex(&elem, "is pesudo", sizeof("is pesudo") - 1, !strcmp(PQgetvalue(pg_result, i, 7), "p"));
+			add_assoc_bool_ex(&elem, "is pseudo", sizeof("is pseudo") - 1, !strcmp(PQgetvalue(pg_result, i, 7), "p"));
 			/* pg_description.description */
 			add_assoc_string_ex(&elem, "description", sizeof("description") - 1, PQgetvalue(pg_result, i, 8));
 		}

php-8.1.21.tar.xz/ext/pgsql/tests/gh10672.phpt Added

php-8.1.13.tar.xz/ext/pgsql/tests/pg_meta_data_001.phpt -> php-8.1.21.tar.xz/ext/pgsql/tests/pg_meta_data_001.phpt Changed

php-8.1.21.tar.xz/ext/pgsql/tests/pg_trace.phpt Added

php-8.1.13.tar.xz/ext/phar/Makefile.frag -> php-8.1.21.tar.xz/ext/phar/Makefile.frag Changed

@@ -29,22 +29,38 @@
 	-@test -d $(builddir)/phar || mkdir $(builddir)/phar
 	-@test -f $(builddir)/phar/phar.inc || cp $(srcdir)/phar/phar.inc $(builddir)/phar/phar.inc
 
+
+TEST_PHP_EXECUTABLE = $(shell $(PHP_EXECUTABLE) -v 2>&1)
+TEST_PHP_EXECUTABLE_RES = $(shell echo "$(TEST_PHP_EXECUTABLE)" | grep -c 'Exec format error')
+
 $(builddir)/phar.php: $(srcdir)/build_precommand.php $(srcdir)/phar/*.inc $(srcdir)/phar/*.php $(SAPI_CLI_PATH)
-	-@echo "Generating phar.php"
-	@$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(srcdir)/build_precommand.php > $(builddir)/phar.php
+	-@(echo "Generating phar.php"; \
+	if  "$(TEST_PHP_EXECUTABLE_RES)" != 1 ; then \
+		$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(srcdir)/build_precommand.php > $(builddir)/phar.php; \
+	else \
+		echo "Skipping phar.php generating during cross compilation"; \
+	fi)
 
 $(builddir)/phar.phar: $(builddir)/phar.php $(builddir)/phar/phar.inc $(srcdir)/phar/*.inc $(srcdir)/phar/*.php $(SAPI_CLI_PATH)
-	-@echo "Generating phar.phar"
-	-@rm -f $(builddir)/phar.phar
-	-@rm -f $(srcdir)/phar.phar
-	@$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(builddir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x \\.svn -p 0 -s $(srcdir)/phar/phar.php -h sha1 -b "$(PHP_PHARCMD_BANG)"  $(srcdir)/phar/
-	-@chmod +x $(builddir)/phar.phar
+	-@(echo "Generating phar.phar"; \
+	if  "$(TEST_PHP_EXECUTABLE_RES)" != 1 ; then \
+		rm -f $(builddir)/phar.phar; \
+		rm -f $(srcdir)/phar.phar; \
+		$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(builddir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x \\.svn -p 0 -s $(srcdir)/phar/phar.php -h sha1 -b "$(PHP_PHARCMD_BANG)"  $(srcdir)/phar/; \
+		chmod +x $(builddir)/phar.phar; \
+	else \
+		echo "Skipping phar.phar generating during cross compilation"; \
+	fi)
 
 install-pharcmd: pharcmd
-	-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
-	$(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)/$(program_prefix)phar$(program_suffix).phar
-	-@rm -f $(INSTALL_ROOT)$(bindir)/$(program_prefix)phar$(program_suffix)
-	$(LN_S) -f $(program_prefix)phar$(program_suffix).phar $(INSTALL_ROOT)$(bindir)/$(program_prefix)phar$(program_suffix)
-	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
-	@$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phar$(program_suffix).1
-	@$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phar$(program_suffix).phar.1
+	@(if  "$(TEST_PHP_EXECUTABLE_RES)" != 1 ; then \
+		$(mkinstalldirs) $(INSTALL_ROOT)$(bindir); \
+		$(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)/$(program_prefix)phar$(program_suffix).phar; \
+		rm -f $(INSTALL_ROOT)$(bindir)/$(program_prefix)phar$(program_suffix); \
+		$(LN_S) -f $(program_prefix)phar$(program_suffix).phar $(INSTALL_ROOT)$(bindir)/$(program_prefix)phar$(program_suffix); \
+		$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1; \
+		$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phar$(program_suffix).1; \
+		$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phar$(program_suffix).phar.1; \
+	else \
+		echo "Skipping install-pharcmd during cross compilation"; \
+	fi)

php-8.1.13.tar.xz/ext/phar/phar_object.c -> php-8.1.21.tar.xz/ext/phar/phar_object.c Changed

php-8.1.13.tar.xz/ext/phar/phar_path_check.c -> php-8.1.21.tar.xz/ext/phar/phar_path_check.c Changed

php-8.1.13.tar.xz/ext/phar/tar.c -> php-8.1.21.tar.xz/ext/phar/tar.c Changed

@@ -478,14 +478,15 @@
 			return FAILURE;
 		}
 
+		uint32_t entry_mode = phar_tar_number(hdr->mode, sizeof(hdr->mode));
 		entry.tar_type = ((old & (hdr->typeflag == '\0')) ? TAR_FILE : hdr->typeflag);
 		entry.offset = entry.offset_abs = pos; /* header_offset unused in tar */
 		entry.fp_type = PHAR_FP;
-		entry.flags = phar_tar_number(hdr->mode, sizeof(hdr->mode)) & PHAR_ENT_PERM_MASK;
+		entry.flags = entry_mode & PHAR_ENT_PERM_MASK;
 		entry.timestamp = phar_tar_number(hdr->mtime, sizeof(hdr->mtime));
 		entry.is_persistent = myphar->is_persistent;
 
-		if (old && entry.tar_type == TAR_FILE && S_ISDIR(entry.flags)) {
+		if (old && entry.tar_type == TAR_FILE && S_ISDIR(entry_mode)) {
 			entry.tar_type = TAR_DIR;
 		}
 
@@ -1243,13 +1244,15 @@
 			return EOF;
 		}
 #ifdef WORDS_BIGENDIAN
-# define PHAR_SET_32(var, buffer) \
-	*(uint32_t *)(var) = (((((unsigned char*)&(buffer))3) << 24) \
-		| ((((unsigned char*)&(buffer))2) << 16) \
-		| ((((unsigned char*)&(buffer))1) << 8) \
-		| (((unsigned char*)&(buffer))0))
+# define PHAR_SET_32(destination, source) do { \
+ uint32_t swapped = (((((unsigned char*)&(source))3) << 24) \
+ | ((((unsigned char*)&(source))2) << 16) \
+ | ((((unsigned char*)&(source))1) << 8) \
+ | (((unsigned char*)&(source))0)); \
+ memcpy(destination, &swapped, 4); \
+ } while (0);
 #else
-# define PHAR_SET_32(var, buffer) *(uint32_t *)(var) = (uint32_t) (buffer)
+# define PHAR_SET_32(destination, source) memcpy(destination, &source, 4)
 #endif
 		PHAR_SET_32(sigbuf, phar->sig_flags);
 		PHAR_SET_32(sigbuf + 4, signature_length);

php-8.1.21.tar.xz/ext/phar/tests/zip/gh10766.phpt Added

php-8.1.13.tar.xz/ext/phar/util.c -> php-8.1.21.tar.xz/ext/phar/util.c Changed

php-8.1.13.tar.xz/ext/phar/zip.c -> php-8.1.21.tar.xz/ext/phar/zip.c Changed

php-8.1.13.tar.xz/ext/posix/posix.c -> php-8.1.21.tar.xz/ext/posix/posix.c Changed

php-8.1.13.tar.xz/ext/posix/tests/posix_getgrgid_basic.phpt -> php-8.1.21.tar.xz/ext/posix/tests/posix_getgrgid_basic.phpt Changed

php-8.1.13.tar.xz/ext/posix/tests/posix_getgrnam_basic.phpt -> php-8.1.21.tar.xz/ext/posix/tests/posix_getgrnam_basic.phpt Changed

php-8.1.13.tar.xz/ext/readline/tests/bug77812-readline.phpt -> php-8.1.21.tar.xz/ext/readline/tests/bug77812-readline.phpt Changed

php-8.1.13.tar.xz/ext/reflection/php_reflection.c -> php-8.1.21.tar.xz/ext/reflection/php_reflection.c Changed

@@ -1747,6 +1747,9 @@
 		}
 
 		zend_op *opline = ops->opcodes + ops->num_args;
+		if (ops->fn_flags & ZEND_ACC_VARIADIC) {
+			opline++;
+		}
 
 		for (; opline->opcode == ZEND_BIND_STATIC; opline++)  {
 			if (!(opline->extended_value & (ZEND_BIND_IMPLICIT|ZEND_BIND_EXPLICIT))) {
@@ -7013,7 +7016,13 @@
 		prev_execute_data = fiber->execute_data->prev_execute_data;
 	}
 
-	RETURN_LONG(prev_execute_data->opline->lineno);
+	while (prev_execute_data && (!prev_execute_data->func || !ZEND_USER_CODE(prev_execute_data->func->common.type))) {
+		prev_execute_data = prev_execute_data->prev_execute_data;
+	}
+	if (prev_execute_data && prev_execute_data->func && ZEND_USER_CODE(prev_execute_data->func->common.type)) {
+		RETURN_LONG(prev_execute_data->opline->lineno);
+	}
+	RETURN_NULL();
 }
 
 ZEND_METHOD(ReflectionFiber, getExecutingFile)
@@ -7031,7 +7040,13 @@
 		prev_execute_data = fiber->execute_data->prev_execute_data;
 	}
 
-	RETURN_STR_COPY(prev_execute_data->func->op_array.filename);
+	while (prev_execute_data && (!prev_execute_data->func || !ZEND_USER_CODE(prev_execute_data->func->common.type))) {
+		prev_execute_data = prev_execute_data->prev_execute_data;
+	}
+	if (prev_execute_data && prev_execute_data->func && ZEND_USER_CODE(prev_execute_data->func->common.type)) {
+		RETURN_STR_COPY(prev_execute_data->func->op_array.filename);
+	}
+	RETURN_NULL();
 }
 
 ZEND_METHOD(ReflectionFiber, getCallable)

php-8.1.13.tar.xz/ext/reflection/php_reflection.stub.php -> php-8.1.21.tar.xz/ext/reflection/php_reflection.stub.php Changed

php-8.1.13.tar.xz/ext/reflection/php_reflection_arginfo.h -> php-8.1.21.tar.xz/ext/reflection/php_reflection_arginfo.h Changed

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: ab0dd21b2fc7ff18c39275e1ec82211c7058c32a */
+ * Stub hash: 164878e6c43f0e4c8bb7a7ae1e5c9650c240d775 */
 
 ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_class_Reflection_getModifierNames, 0, 1, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_INFO(0, modifiers, IS_LONG, 0)
@@ -586,9 +586,11 @@
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_ReflectionFiber_getFiber, 0, 0, Fiber, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class_ReflectionFiber_getExecutingFile arginfo_class_ReflectionFunction___toString
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ReflectionFiber_getExecutingFile, 0, 0, IS_STRING, 1)
+ZEND_END_ARG_INFO()
 
-#define arginfo_class_ReflectionFiber_getExecutingLine arginfo_class_ReflectionAttribute_getTarget
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ReflectionFiber_getExecutingLine, 0, 0, IS_LONG, 1)
+ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_ReflectionFiber_getCallable, 0, 0, IS_CALLABLE, 0)
 ZEND_END_ARG_INFO()

php-8.1.21.tar.xz/ext/reflection/tests/ReflectionFiber_notrace_1.phpt Added

php-8.1.21.tar.xz/ext/reflection/tests/ReflectionFiber_notrace_2.phpt Added

@@ -0,0 +1,61 @@
+--TEST--
+ReflectionFiber should not segfault when inspecting fibers where the previous stack frame is a native function
+--FILE--
+<?php
+
+namespace test;
+
+$f = new \Fiber(fn() => call_user_func("Fiber", "suspend"));
+$f->start();
+
+$reflection = new \ReflectionFiber($f);
+
+var_dump($reflection->getExecutingFile());
+var_dump($reflection->getExecutingLine());
+var_dump($reflection->getTrace());
+
+?>
+--EXPECTF--
+string(%d) "%sReflectionFiber_notrace_2.php"
+int(5)
+array(3) {
+ 0=>
+ array(4) {
+ "function"=>
+ string(7) "suspend"
+ "class"=>
+ string(5) "Fiber"
+ "type"=>
+ string(2) "::"
+ "args"=>
+ array(0) {
+ }
+ }
+ 1=>
+ array(4) {
+ "file"=>
+ string(%d) "%sReflectionFiber_notrace_2.php"
+ "line"=>
+ int(5)
+ "function"=>
+ string(14) "call_user_func"
+ "args"=>
+ array(1) {
+ 0=>
+ array(2) {
+ 0=>
+ string(5) "Fiber"
+ 1=>
+ string(7) "suspend"
+ }
+ }
+ }
+ 2=>
+ array(2) {
+ "function"=>
+ string(14) "test\{closure}"
+ "args"=>
+ array(0) {
+ }
+ }
+}

php-8.1.21.tar.xz/ext/reflection/tests/gh10623.phpt Added

@@ -0,0 +1,64 @@
+--TEST--
+GH-10623 (ReflectionFunction::getClosureUsedVariables() returns empty array in presence of variadic arguments)
+--FILE--
+<?php
+
+$data1 = 1;
+$data2 = 2;
+$data3 = 3;
+
+$closure = function($var) use($data1) {};
+var_dump((new ReflectionFunction($closure))->getClosureUsedVariables());
+
+$closure = function($var, ...$variadic) {};
+var_dump((new ReflectionFunction($closure))->getClosureUsedVariables());
+
+$closure = function($var, ...$variadic) use($data1) {};
+var_dump((new ReflectionFunction($closure))->getClosureUsedVariables());
+
+$closure = function($var, ...$variadic) use($data1, $data2, $data3) {};
+var_dump((new ReflectionFunction($closure))->getClosureUsedVariables());
+
+$closure = function(...$variadic) use($data1) {};
+var_dump((new ReflectionFunction($closure))->getClosureUsedVariables());
+
+$closure = function($var, $var2, ...$variadic) {};
+var_dump((new ReflectionFunction($closure))->getClosureUsedVariables());
+
+$closure = function($var, $var2, $var3, ...$variadic) use($data1, $data2, $data3) {};
+var_dump((new ReflectionFunction($closure))->getClosureUsedVariables());
+
+?>
+--EXPECT--
+array(1) {
+ "data1"=>
+ int(1)
+}
+array(0) {
+}
+array(1) {
+ "data1"=>
+ int(1)
+}
+array(3) {
+ "data1"=>
+ int(1)
+ "data2"=>
+ int(2)
+ "data3"=>
+ int(3)
+}
+array(1) {
+ "data1"=>
+ int(1)
+}
+array(0) {
+}
+array(3) {
+ "data1"=>
+ int(1)
+ "data2"=>
+ int(2)
+ "data3"=>
+ int(3)
+}

php-8.1.13.tar.xz/ext/session/mod_files.c -> php-8.1.21.tar.xz/ext/session/mod_files.c Changed

php-8.1.13.tar.xz/ext/session/session.c -> php-8.1.21.tar.xz/ext/session/session.c Changed

@@ -94,6 +94,8 @@
 		return FAILURE;													\
 	}
 
+#define SESSION_FORBIDDEN_CHARS "=,;. \t\r\n\013\014"
+
 #define APPLY_TRANS_SID (PS(use_trans_sid) && !PS(use_only_cookies))
 
 static int php_session_send_cookie(void);
@@ -1268,7 +1270,7 @@
 	size_t session_cookie_len;
 	size_t len = sizeof("Set-Cookie")-1;
 
-	ZEND_ASSERT(strpbrk(PS(session_name), "=,; \t\r\n\013\014") == NULL);
+	ZEND_ASSERT(strpbrk(PS(session_name), SESSION_FORBIDDEN_CHARS) == NULL);
 	spprintf(&session_cookie, 0, "Set-Cookie: %s=", PS(session_name));
 
 	session_cookie_len = strlen(session_cookie);
@@ -1316,8 +1318,8 @@
 	}
 
 	/* Prevent broken Set-Cookie header, because the session_name might be user supplied */
-	if (strpbrk(PS(session_name), "=,; \t\r\n\013\014") != NULL) {   /* man isspace for \013 and \014 */
-		php_error_docref(NULL, E_WARNING, "session.name cannot contain any of the following '=,; \\t\\r\\n\\013\\014'");
+	if (strpbrk(PS(session_name), SESSION_FORBIDDEN_CHARS) != NULL) {   /* man isspace for \013 and \014 */
+		php_error_docref(NULL, E_WARNING, "session.name cannot contain any of the following '=,;. \\t\\r\\n\\013\\014'");
 		return FAILURE;
 	}

php-8.1.13.tar.xz/ext/session/tests/session_name_variation1.phpt -> php-8.1.21.tar.xz/ext/session/tests/session_name_variation1.phpt Changed

php-8.1.13.tar.xz/ext/soap/php_http.c -> php-8.1.21.tar.xz/ext/soap/php_http.c Changed

@@ -20,6 +20,7 @@
 #include "ext/standard/base64.h"
 #include "ext/standard/md5.h"
 #include "ext/standard/php_random.h"
+#include "ext/hash/php_hash.h"
 
 static char *get_http_header_value_nodup(char *headers, char *type, size_t *len);
 static char *get_http_header_value(char *headers, char *type);
@@ -657,18 +658,23 @@
 			has_authorization = 1;
 			if (Z_TYPE_P(digest) == IS_ARRAY) {
 				char          HA133, HA233, response33, cnonce33, nc9;
-				zend_long     nonce;
+				unsigned char nonce16;
 				PHP_MD5_CTX   md5ctx;
 				unsigned char hash16;
 
-				php_random_bytes_throw(&nonce, sizeof(nonce));
-				nonce &= 0x7fffffff;
+				if (UNEXPECTED(php_random_bytes_throw(&nonce, sizeof(nonce)) != SUCCESS)) {
+					ZEND_ASSERT(EG(exception));
+					php_stream_close(stream);
+					convert_to_null(Z_CLIENT_HTTPURL_P(this_ptr));
+					convert_to_null(Z_CLIENT_HTTPSOCKET_P(this_ptr));
+					convert_to_null(Z_CLIENT_USE_PROXY_P(this_ptr));
+					smart_str_free(&soap_headers_z);
+					smart_str_free(&soap_headers);
+					return FALSE;
+				}
 
-				PHP_MD5Init(&md5ctx);
-				snprintf(cnonce, sizeof(cnonce), ZEND_LONG_FMT, nonce);
-				PHP_MD5Update(&md5ctx, (unsigned char*)cnonce, strlen(cnonce));
-				PHP_MD5Final(hash, &md5ctx);
-				make_digest(cnonce, hash);
+				php_hash_bin2hex(cnonce, nonce, sizeof(nonce));
+				cnonce32 = 0;
 
 				if ((tmp = zend_hash_str_find(Z_ARRVAL_P(digest), "nc", sizeof("nc")-1)) != NULL &&
 					Z_TYPE_P(tmp) == IS_LONG) {

php-8.1.13.tar.xz/ext/soap/tests/bug73037.phpt -> php-8.1.21.tar.xz/ext/soap/tests/bug73037.phpt Changed

php-8.1.13.tar.xz/ext/soap/tests/custom_content_type.phpt -> php-8.1.21.tar.xz/ext/soap/tests/custom_content_type.phpt Changed

php-8.1.13.tar.xz/ext/sockets/conversions.c -> php-8.1.21.tar.xz/ext/sockets/conversions.c Changed

php-8.1.13.tar.xz/ext/spl/php_spl.c -> php-8.1.21.tar.xz/ext/spl/php_spl.c Changed

@@ -402,6 +402,16 @@
 
 static bool autoload_func_info_equals(
 		const autoload_func_info *alfi1, const autoload_func_info *alfi2) {
+	if (UNEXPECTED(
+		(alfi1->func_ptr->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) &&
+		(alfi2->func_ptr->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE)
+	)) {
+		return alfi1->obj == alfi2->obj
+			&& alfi1->ce == alfi2->ce
+			&& alfi1->closure == alfi2->closure
+			&& zend_string_equals(alfi1->func_ptr->common.function_name, alfi2->func_ptr->common.function_name)
+		;
+	}
 	return alfi1->func_ptr == alfi2->func_ptr
 		&& alfi1->obj == alfi2->obj
 		&& alfi1->ce == alfi2->ce
@@ -580,6 +590,13 @@
 		RETURN_TRUE;
 	}
 
+	if (!fcc.function_handler) {
+		/* Call trampoline has been cleared by zpp. Refetch it, because we want to deal
+		 * with it outselves. It is important that it is not refetched on every call,
+		 * because calls may occur from different scopes. */
+		zend_is_callable_ex(&fci.function_name, NULL, 0, NULL, &fcc, NULL);
+	}
+
 	autoload_func_info *alfi = autoload_func_info_from_fci(&fci, &fcc);
 	Bucket *p = spl_find_registered_function(alfi);
 	autoload_func_info_destroy(alfi);

php-8.1.13.tar.xz/ext/spl/spl_array.c -> php-8.1.21.tar.xz/ext/spl/spl_array.c Changed

@@ -29,7 +29,6 @@
 #include "php_spl.h"
 #include "spl_array_arginfo.h"
 #include "spl_functions.h"
-#include "spl_engine.h"
 #include "spl_iterators.h"
 #include "spl_array.h"
 #include "spl_exceptions.h"
@@ -63,6 +62,8 @@
 	uint32_t          ht_iter;
 	int               ar_flags;
 	unsigned char	  nApplyCount;
+	bool			  is_child;
+	Bucket			  *bucket;
 	zend_function     *fptr_offset_get;
 	zend_function     *fptr_offset_set;
 	zend_function     *fptr_offset_has;
@@ -72,6 +73,13 @@
 	zend_object       std;
 } spl_array_object;
 
+typedef struct _spl_array_iterator {
+	zend_object_iterator it;
+	zend_class_entry *ce;
+	zval value;
+	bool by_ref;
+} spl_array_iterator;
+
 static inline spl_array_object *spl_array_from_obj(zend_object *obj) /* {{{ */ {
 	return (spl_array_object*)((char*)(obj) - XtOffsetOf(spl_array_object, std));
 }
@@ -167,6 +175,8 @@
 	object_properties_init(&intern->std, class_type);
 
 	intern->ar_flags = 0;
+	intern->is_child = false;
+	intern->bucket = NULL;
 	intern->ce_get_iterator = spl_ce_ArrayIterator;
 	if (orig) {
 		spl_array_object *other = spl_array_from_obj(orig);
@@ -477,6 +487,22 @@
 	return spl_array_read_dimension_ex(1, object, offset, type, rv);
 } /* }}} */
 
+/*
+ * The assertion(HT_ASSERT_RC1(ht)) failed because the refcount was increased manually when intern->is_child is true.
+ * We have to set the refcount to 1 to make assertion success and restore the refcount to the original value after
+ * modifying the array when intern->is_child is true.
+ */
+static uint32_t spl_array_set_refcount(bool is_child, HashTable *ht, uint32_t refcount) /* {{{ */
+{
+	uint32_t old_refcount = 0;
+	if (is_child) {
+		old_refcount = GC_REFCOUNT(ht);
+		GC_SET_REFCOUNT(ht, refcount);
+	}
+
+	return old_refcount;
+} /* }}} */
+
 static void spl_array_write_dimension_ex(int check_inherited, zend_object *object, zval *offset, zval *value) /* {{{ */
 {
 	spl_array_object *intern = spl_array_from_obj(object);
@@ -500,9 +526,16 @@
 	}
 
 	Z_TRY_ADDREF_P(value);
+
+	uint32_t refcount = 0;
 	if (!offset || Z_TYPE_P(offset) == IS_NULL) {
 		ht = spl_array_get_hash_table(intern);
+		refcount = spl_array_set_refcount(intern->is_child, ht, 1);
 		zend_hash_next_index_insert(ht, value);
+
+		if (refcount) {
+			spl_array_set_refcount(intern->is_child, ht, refcount);
+		}
 		return;
 	}
 
@@ -513,12 +546,17 @@
 	}
 
 	ht = spl_array_get_hash_table(intern);
+	refcount = spl_array_set_refcount(intern->is_child, ht, 1);
 	if (key.key) {
 		zend_hash_update_ind(ht, key.key, value);
 		spl_hash_key_release(&key);
 	} else {
 		zend_hash_index_update(ht, key.h, value);
 	}
+
+	if (refcount) {
+		spl_array_set_refcount(intern->is_child, ht, refcount);
+	}
 } /* }}} */
 
 static void spl_array_write_dimension(zend_object *object, zval *offset, zval *value) /* {{{ */
@@ -548,6 +586,8 @@
 	}
 
 	ht = spl_array_get_hash_table(intern);
+	uint32_t refcount = spl_array_set_refcount(intern->is_child, ht, 1);
+
 	if (key.key) {
 		zval *data = zend_hash_find(ht, key.key);
 		if (data) {
@@ -570,6 +610,10 @@
 	} else {
 		zend_hash_index_del(ht, key.h);
 	}
+
+	if (refcount) {
+		spl_array_set_refcount(intern->is_child, ht, refcount);
+	}
 } /* }}} */
 
 static void spl_array_unset_dimension(zend_object *object, zval *offset) /* {{{ */
@@ -970,18 +1014,42 @@
 
 static zval *spl_array_it_get_current_data(zend_object_iterator *iter) /* {{{ */
 {
+	spl_array_iterator *array_iter = (spl_array_iterator*)iter;
 	spl_array_object *object = Z_SPLARRAY_P(&iter->data);
 	HashTable *aht = spl_array_get_hash_table(object);
 
+	zval *data;
 	if (object->ar_flags & SPL_ARRAY_OVERLOADED_CURRENT) {
-		return zend_user_it_get_current_data(iter);
+		data = zend_user_it_get_current_data(iter);
 	} else {
-		zval *data = zend_hash_get_current_data_ex(aht, spl_array_get_pos_ptr(aht, object));
+		data = zend_hash_get_current_data_ex(aht, spl_array_get_pos_ptr(aht, object));
 		if (data && Z_TYPE_P(data) == IS_INDIRECT) {
 			data = Z_INDIRECT_P(data);
 		}
-		return data;
 	}
+	// ZEND_FE_FETCH_RW converts the value to a reference but doesn't know the source is a property.
+	// Typed properties must add a type source to the reference, and readonly properties must fail.
+	if (array_iter->by_ref
+	 && Z_TYPE_P(data) != IS_REFERENCE
+	 && Z_TYPE(object->array) == IS_OBJECT
+	 && !(object->ar_flags & (SPL_ARRAY_IS_SELF|SPL_ARRAY_USE_OTHER))) {
+		zend_string *key;
+		zend_hash_get_current_key_ex(aht, &key, NULL, spl_array_get_pos_ptr(aht, object));
+		zend_class_entry *ce = Z_OBJCE(object->array);
+		zend_property_info *prop_info = zend_get_property_info(ce, key, true);
+		ZEND_ASSERT(prop_info != ZEND_WRONG_PROPERTY_INFO);
+		if (EXPECTED(prop_info != NULL) && ZEND_TYPE_IS_SET(prop_info->type)) {
+			if (prop_info->flags & ZEND_ACC_READONLY) {
+				zend_throw_error(NULL,
+					"Cannot acquire reference to readonly property %s::$%s",
+					ZSTR_VAL(prop_info->ce->name), ZSTR_VAL(key));
+				return NULL;
+			}
+			ZVAL_NEW_REF(data, data);
+			ZEND_REF_ADD_TYPE_SOURCE(Z_REF_P(data), prop_info);
+		}
+	}
+	return data;
 }
 /* }}} */
 
@@ -1058,6 +1126,16 @@
 		} else {
 			//??? TODO: try to avoid array duplication
 			ZVAL_ARR(&intern->array, zend_array_dup(Z_ARR_P(array)));
+
+			if (intern->is_child) {
+				Z_TRY_DELREF_P(&intern->bucket->val);
+				/*
+				 * replace bucket->val with copied array, so the changes between
+				 * parent and child object can affect each other.
+				 */
+				intern->bucket->val = intern->array;
+				Z_TRY_ADDREF_P(&intern->array);
+			}
 		}
 	} else {
 		if (Z_OBJ_HT_P(array) == &spl_handler_ArrayObject || Z_OBJ_HT_P(array) == &spl_handler_ArrayIterator) {
@@ -1109,7 +1187,7 @@
 
 zend_object_iterator *spl_array_get_iterator(zend_class_entry *ce, zval *object, int by_ref) /* {{{ */
 {
-	zend_user_iterator *iterator;
+	spl_array_iterator *iterator;
 	spl_array_object *array_object = Z_SPLARRAY_P(object);
 
 	if (by_ref && (array_object->ar_flags & SPL_ARRAY_OVERLOADED_CURRENT)) {
@@ -1117,7 +1195,7 @@
 		return NULL;
 	}
 
-	iterator = emalloc(sizeof(zend_user_iterator));
+	iterator = emalloc(sizeof(*iterator));
 
 	zend_iterator_init(&iterator->it);
 
@@ -1125,6 +1203,7 @@
 	iterator->it.funcs = &spl_array_it_funcs;
 	iterator->ce = ce;
 	ZVAL_UNDEF(&iterator->value);
+	iterator->by_ref = by_ref;
 
 	return &iterator->it;
 }
@@ -1544,6 +1623,22 @@
 }
 /* }}} */
 
+static void spl_instantiate_child_arg(zend_class_entry *pce, zval *retval, zval *arg1, zval *arg2) /* {{{ */
+{
+	object_init_ex(retval, pce);
+	spl_array_object *new_intern = Z_SPLARRAY_P(retval);
+	/*
+	 * set new_intern->is_child is true to indicate that the object was created by
+	 * RecursiveArrayIterator::getChildren() method.
+	 */
+	new_intern->is_child = true;
+
+	/* find the bucket of parent object. */
+	new_intern->bucket = (Bucket *)((char *)(arg1) - XtOffsetOf(Bucket, val));;
+	zend_call_known_instance_method_with_2_params(pce->constructor, Z_OBJ_P(retval), NULL, arg1, arg2);
+}
+/* }}} */
+
 /* {{{ Create a sub iterator for the current element (same class as $this) */
 PHP_METHOD(RecursiveArrayIterator, getChildren)
 {
@@ -1574,7 +1669,7 @@
 	}
 
 	ZVAL_LONG(&flags, intern->ar_flags);
-	spl_instantiate_arg_ex2(Z_OBJCE_P(ZEND_THIS), return_value, entry, &flags);
+	spl_instantiate_child_arg(Z_OBJCE_P(ZEND_THIS), return_value, entry, &flags);
 }
 /* }}} */

php-8.1.13.tar.xz/ext/spl/spl_directory.c -> php-8.1.21.tar.xz/ext/spl/spl_directory.c Changed

@@ -432,7 +432,9 @@
 
 	path_len = ZSTR_LEN(path);
 	if (path_len > 1 && IS_SLASH_AT(ZSTR_VAL(path), path_len-1)) {
-		path_len--;
+		do {
+			path_len--;
+		} while (path_len > 1 && IS_SLASH_AT(ZSTR_VAL(path), path_len - 1));
 		intern->file_name = zend_string_init(ZSTR_VAL(path), path_len, 0);
 	} else {
 		intern->file_name = zend_string_copy(path);
@@ -1836,34 +1838,6 @@
 }
 /* }}} */
 
-/* {{{ spl_filesystem_object_cast */
-static int spl_filesystem_object_cast(zend_object *readobj, zval *writeobj, int type)
-{
-	spl_filesystem_object *intern = spl_filesystem_from_obj(readobj);
-
-	if (type == IS_STRING) {
-		if (readobj->ce->__tostring) {
-			return zend_std_cast_object_tostring(readobj, writeobj, type);
-		}
-
-		switch (intern->type) {
-		case SPL_FS_INFO:
-		case SPL_FS_FILE:
-			ZVAL_STR_COPY(writeobj, intern->file_name);
-			return SUCCESS;
-		case SPL_FS_DIR:
-			ZVAL_STRING(writeobj, intern->u.dir.entry.d_name);
-			return SUCCESS;
-		}
-	} else if (type == _IS_BOOL) {
-		ZVAL_TRUE(writeobj);
-		return SUCCESS;
-	}
-	ZVAL_NULL(writeobj);
-	return FAILURE;
-}
-/* }}} */
-
 static zend_result spl_filesystem_file_read_ex(spl_filesystem_object *intern, bool silent, zend_long line_add) /* {{{ */
 {
 	char *buf;
@@ -2744,6 +2718,23 @@
 	}
 } /* }}} */
 
+PHP_METHOD(SplFileObject, __toString)
+{
+	if (zend_parse_parameters_none() == FAILURE) {
+		RETURN_THROWS();
+	}
+
+	spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS);
+
+	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED(intern);
+
+	if (!intern->u.file.current_line && Z_ISUNDEF(intern->u.file.current_zval)) {
+		spl_filesystem_file_read_line(ZEND_THIS, intern, 1);
+	}
+
+	RETURN_STRINGL(intern->u.file.current_line, intern->u.file.current_line_len);
+}
+
 /* {{{ PHP_MINIT_FUNCTION(spl_directory) */
 PHP_MINIT_FUNCTION(spl_directory)
 {
@@ -2753,7 +2744,6 @@
 	memcpy(&spl_filesystem_object_handlers, &std_object_handlers, sizeof(zend_object_handlers));
 	spl_filesystem_object_handlers.offset = XtOffsetOf(spl_filesystem_object, std);
 	spl_filesystem_object_handlers.clone_obj = spl_filesystem_object_clone;
-	spl_filesystem_object_handlers.cast_object = spl_filesystem_object_cast;
 	spl_filesystem_object_handlers.dtor_obj = spl_filesystem_object_destroy_object;
 	spl_filesystem_object_handlers.free_obj = spl_filesystem_object_free_storage;

php-8.1.13.tar.xz/ext/spl/spl_directory.stub.php -> php-8.1.21.tar.xz/ext/spl/spl_directory.stub.php Changed

php-8.1.13.tar.xz/ext/spl/spl_directory_arginfo.h -> php-8.1.21.tar.xz/ext/spl/spl_directory_arginfo.h Changed

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 3f2caf1c46760d8ef629ccb2e94ab0dba09f713b */
+ * Stub hash: c8e8093692f8a4642ea7c840e301f1afed599ee1 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_SplFileInfo___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
@@ -360,6 +360,7 @@
 ZEND_METHOD(SplFileObject, hasChildren);
 ZEND_METHOD(SplFileObject, getChildren);
 ZEND_METHOD(SplFileObject, seek);
+ZEND_METHOD(SplFileObject, __toString);
 ZEND_METHOD(SplTempFileObject, __construct);
 
 
@@ -480,7 +481,7 @@
 	ZEND_ME(SplFileObject, getChildren, arginfo_class_SplFileObject_getChildren, ZEND_ACC_PUBLIC)
 	ZEND_ME(SplFileObject, seek, arginfo_class_SplFileObject_seek, ZEND_ACC_PUBLIC)
 	ZEND_MALIAS(SplFileObject, getCurrentLine, fgets, arginfo_class_SplFileObject_getCurrentLine, ZEND_ACC_PUBLIC)
-	ZEND_MALIAS(SplFileObject, __toString, fgets, arginfo_class_SplFileObject___toString, ZEND_ACC_PUBLIC)
+	ZEND_ME(SplFileObject, __toString, arginfo_class_SplFileObject___toString, ZEND_ACC_PUBLIC)
 	ZEND_FE_END
 };

php-8.1.13.tar.xz/ext/spl/spl_iterators.c -> php-8.1.21.tar.xz/ext/spl/spl_iterators.c Changed

php-8.1.13.tar.xz/ext/spl/tests/bug42654.phpt -> php-8.1.21.tar.xz/ext/spl/tests/bug42654.phpt Changed

php-8.1.21.tar.xz/ext/spl/tests/bug42654_2.phpt Added

php-8.1.21.tar.xz/ext/spl/tests/gh10011.phpt Added

@@ -0,0 +1,59 @@
+--TEST--
+Bug GH-10011 (Trampoline autoloader will get reregistered and cannot be unregistered)
+--FILE--
+<?php
+
+class TrampolineTest {
+ public function __call(string $name, array $arguments) {
+ echo 'Trampoline for ', $name, PHP_EOL;
+ }
+}
+$o = new TrampolineTest();
+$callback1 = $o, 'trampoline1';
+$callback2 = $o, 'trampoline2';
+
+spl_autoload_register($callback1);
+spl_autoload_register($callback2);
+spl_autoload_register($callback1); // 2nd call ignored
+
+var_dump(spl_autoload_functions());
+
+var_dump(class_exists("TestClass", true));
+
+echo "Unregister trampoline:\n";
+var_dump(spl_autoload_unregister($callback1));
+var_dump(spl_autoload_unregister($callback1));
+var_dump(spl_autoload_unregister($callback2));
+
+var_dump(spl_autoload_functions());
+var_dump(class_exists("TestClass", true));
+?>
+--EXPECT--
+array(2) {
+ 0=>
+ array(2) {
+ 0=>
+ object(TrampolineTest)#1 (0) {
+ }
+ 1=>
+ string(11) "trampoline1"
+ }
+ 1=>
+ array(2) {
+ 0=>
+ object(TrampolineTest)#1 (0) {
+ }
+ 1=>
+ string(11) "trampoline2"
+ }
+}
+Trampoline for trampoline1
+Trampoline for trampoline2
+bool(false)
+Unregister trampoline:
+bool(true)
+bool(false)
+bool(true)
+array(0) {
+}
+bool(false)

php-8.1.21.tar.xz/ext/spl/tests/gh10248.phpt Added

php-8.1.21.tar.xz/ext/spl/tests/gh10519.phpt Added

@@ -0,0 +1,69 @@
+--TEST--
+Bug GH-10519 (Array Data Address Reference Issue)
+--FILE--
+<?php
+interface DataInterface extends JsonSerializable, RecursiveIterator, Iterator
+{
+ public static function init(Traversable $data): DataInterface;
+}
+
+class A extends RecursiveArrayIterator implements DataInterface
+{
+ public function __construct($data)
+ {
+ parent::__construct($data);
+ }
+
+ public static function init($data): DataInterface
+ {
+ return new static($data);
+ }
+
+ public function getCols(string $colname): array
+ {
+ return array_column($this->getArrayCopy(), $colname);
+ }
+
+ public function bugySetMethod($key, $value)
+ {
+ $data = &$this;
+
+ while ($data->hasChildren()) {
+ $data = $data->getChildren();
+ }
+	 $data->offsetSet($key, $value);
+ }
+
+ public function jsonSerialize(): mixed
+ {
+ return $this;
+ }
+}
+
+$a = 
+ 'test' => 
+ 'a' => (object) 2 => '',3 => '',4 => '',
+ 
+;
+
+$example = A::init($a);
+$example->bugySetMethod(5, 'in here');
+var_dump(json_encode($example));
+var_dump(json_encode($a));
+
+$b = 
+ 'test' => 
+ 'b' => 2 => '',3 => '',4 => '',
+ 
+;
+$example = A::init($b);
+
+$example->bugySetMethod(5, 'must be here');
+var_dump(json_encode($example));
+var_dump(json_encode($b));
+?>
+--EXPECT--
+string(51) "{"test":{"a":{"2":"","3":"","4":"","5":"in here"}}}"
+string(51) "{"test":{"a":{"2":"","3":"","4":"","5":"in here"}}}"
+string(56) "{"test":{"b":{"2":"","3":"","4":"","5":"must be here"}}}"
+string(37) "{"test":{"b":{"2":"","3":"","4":""}}}"

php-8.1.21.tar.xz/ext/spl/tests/gh11178.phpt Added

php-8.1.21.tar.xz/ext/spl/tests/gh11338.phpt Added

php-8.1.21.tar.xz/ext/spl/tests/gh9883-extra.phpt Added

php-8.1.21.tar.xz/ext/spl/tests/gh9883.phpt Added

php-8.1.13.tar.xz/ext/sqlite3/sqlite3.c -> php-8.1.21.tar.xz/ext/sqlite3/sqlite3.c Changed

php-8.1.21.tar.xz/ext/sqlite3/tests/bug81742.phpt Added

php-8.1.13.tar.xz/ext/standard/array.c -> php-8.1.21.tar.xz/ext/standard/array.c Changed

@@ -345,7 +345,27 @@
 
 static zend_always_inline int php_array_data_compare_unstable_i(Bucket *f, Bucket *s) /* {{{ */
 {
-	return zend_compare(&f->val, &s->val);
+	int result = zend_compare(&f->val, &s->val);
+	/* Special enums handling for array_unique. We don't want to add this logic to zend_compare as
+	 * that would be observable via comparison operators. */
+	zval *rhs = &s->val;
+	ZVAL_DEREF(rhs);
+	if (UNEXPECTED(Z_TYPE_P(rhs) == IS_OBJECT)
+	 && result == ZEND_UNCOMPARABLE
+	 && (Z_OBJCE_P(rhs)->ce_flags & ZEND_ACC_ENUM)) {
+		zval *lhs = &f->val;
+		ZVAL_DEREF(lhs);
+		if (Z_TYPE_P(lhs) == IS_OBJECT && (Z_OBJCE_P(lhs)->ce_flags & ZEND_ACC_ENUM)) {
+			// Order doesn't matter, we just need to group the same enum values
+			uintptr_t lhs_uintptr = (uintptr_t)Z_OBJ_P(lhs);
+			uintptr_t rhs_uintptr = (uintptr_t)Z_OBJ_P(rhs);
+			return lhs_uintptr == rhs_uintptr ? 0 : (lhs_uintptr < rhs_uintptr ? -1 : 1);
+		} else {
+			// Shift enums to the end of the array
+			return -1;
+		}
+	}
+	return result;
 }
 /* }}} */
 
@@ -1073,6 +1093,10 @@
 	ZEND_PARSE_PARAMETERS_END();
 
 	HashTable *array = get_ht_for_iap(array_zv, /* separate */ true);
+	if (zend_hash_num_elements(array) == 0) {
+		/* array->nInternalPointer is already 0 if the array is empty, even after removing elements */
+		RETURN_FALSE;
+	}
 	zend_hash_internal_pointer_end(array);
 
 	if (USED_RET()) {
@@ -1100,6 +1124,10 @@
 	ZEND_PARSE_PARAMETERS_END();
 
 	HashTable *array = get_ht_for_iap(array_zv, /* separate */ true);
+	if (zend_hash_num_elements(array) == 0) {
+		/* array->nInternalPointer is already 0 if the array is empty, even after removing elements */
+		RETURN_FALSE;
+	}
 	zend_hash_move_backwards(array);
 
 	if (USED_RET()) {
@@ -1127,6 +1155,10 @@
 	ZEND_PARSE_PARAMETERS_END();
 
 	HashTable *array = get_ht_for_iap(array_zv, /* separate */ true);
+	if (zend_hash_num_elements(array) == 0) {
+		/* array->nInternalPointer is already 0 if the array is empty, even after removing elements */
+		RETURN_FALSE;
+	}
 	zend_hash_move_forward(array);
 
 	if (USED_RET()) {
@@ -1154,6 +1186,10 @@
 	ZEND_PARSE_PARAMETERS_END();
 
 	HashTable *array = get_ht_for_iap(array_zv, /* separate */ true);
+	if (zend_hash_num_elements(array) == 0) {
+		/* array->nInternalPointer is already 0 if the array is empty, even after removing elements */
+		RETURN_FALSE;
+	}
 	zend_hash_internal_pointer_reset(array);
 
 	if (USED_RET()) {
@@ -3559,7 +3595,12 @@
 					}
 				} else {
 					Z_TRY_ADDREF_P(src_zval);
-					zend_hash_next_index_insert(Z_ARRVAL_P(dest_zval), src_zval);
+					zval *zv = zend_hash_next_index_insert(Z_ARRVAL_P(dest_zval), src_zval);
+					if (EXPECTED(!zv)) {
+						Z_TRY_DELREF_P(src_zval);
+						zend_cannot_add_element();
+						return 0;
+					}
 				}
 				zval_ptr_dtor(&tmp);
 			} else {
@@ -3568,6 +3609,10 @@
 			}
 		} else {
 			zval *zv = zend_hash_next_index_insert(dest, src_entry);
+			if (UNEXPECTED(!zv)) {
+				zend_cannot_add_element();
+				return 0;
+			}
 			zval_add_ref(zv);
 		}
 	} ZEND_HASH_FOREACH_END();
@@ -5553,6 +5598,9 @@
 
 	/* Do the actual sort magic - bada-bim, bada-boom. */
 	zend_sort(indirect, array_size, sizeof(Bucket *), php_multisort_compare, (swap_func_t)array_bucket_p_sawp);
+	if (EG(exception)) {
+		goto clean_up;
+	}
 
 	/* Restructure the arrays based on sorted indirect - this is mostly taken from zend_hash_sort() function. */
 	for (i = 0; i < num_arrays; i++) {
@@ -5578,15 +5626,15 @@
 			zend_hash_rehash(hash);
 		}
 	}
+	RETVAL_TRUE;
 
-	/* Clean up. */
+clean_up:
 	for (i = 0; i < array_size; i++) {
 		efree(indirecti);
 	}
 	efree(indirect);
 	efree(func);
 	efree(arrays);
-	RETURN_TRUE;
 }
 /* }}} */

php-8.1.13.tar.xz/ext/standard/basic_functions.c -> php-8.1.21.tar.xz/ext/standard/basic_functions.c Changed

php-8.1.13.tar.xz/ext/standard/basic_functions.stub.php -> php-8.1.21.tar.xz/ext/standard/basic_functions.stub.php Changed

php-8.1.13.tar.xz/ext/standard/basic_functions_arginfo.h -> php-8.1.21.tar.xz/ext/standard/basic_functions_arginfo.h Changed

php-8.1.13.tar.xz/ext/standard/browscap.c -> php-8.1.21.tar.xz/ext/standard/browscap.c Changed

php-8.1.13.tar.xz/ext/standard/crc32_x86.c -> php-8.1.21.tar.xz/ext/standard/crc32_x86.c Changed

php-8.1.13.tar.xz/ext/standard/crypt.c -> php-8.1.21.tar.xz/ext/standard/crypt.c Changed

php-8.1.13.tar.xz/ext/standard/crypt_blowfish.c -> php-8.1.21.tar.xz/ext/standard/crypt_blowfish.c Changed

php-8.1.13.tar.xz/ext/standard/file.c -> php-8.1.21.tar.xz/ext/standard/file.c Changed

php-8.1.13.tar.xz/ext/standard/html.c -> php-8.1.21.tar.xz/ext/standard/html.c Changed

php-8.1.13.tar.xz/ext/standard/http_fopen_wrapper.c -> php-8.1.21.tar.xz/ext/standard/http_fopen_wrapper.c Changed

@@ -79,6 +79,7 @@
 
 #define HTTP_WRAPPER_HEADER_INIT    1
 #define HTTP_WRAPPER_REDIRECTED     2
+#define HTTP_WRAPPER_KEEP_METHOD    4
 
 static inline void strip_header(char *header_bag, char *lc_header_bag,
 		const char *lc_header_name)
@@ -140,6 +141,7 @@
 	char *user_headers = NULL;
 	int header_init = ((flags & HTTP_WRAPPER_HEADER_INIT) != 0);
 	int redirected = ((flags & HTTP_WRAPPER_REDIRECTED) != 0);
+	int redirect_keep_method = ((flags & HTTP_WRAPPER_KEEP_METHOD) != 0);
 	bool follow_location = 1;
 	php_stream_filter *transfer_encoding = NULL;
 	int response_code;
@@ -363,8 +365,8 @@
 	if (context && (tmpzval = php_stream_context_get_option(context, "http", "method")) != NULL) {
 		if (Z_TYPE_P(tmpzval) == IS_STRING && Z_STRLEN_P(tmpzval) > 0) {
 			/* As per the RFC, automatically redirected requests MUST NOT use other methods than
-			 * GET and HEAD unless it can be confirmed by the user */
-			if (!redirected
+			 * GET and HEAD unless it can be confirmed by the user. */
+			if (!redirected || redirect_keep_method
 				|| zend_string_equals_literal(Z_STR_P(tmpzval), "GET")
 				|| zend_string_equals_literal(Z_STR_P(tmpzval), "HEAD")
 			) {
@@ -458,7 +460,7 @@
 			zend_str_tolower(ZSTR_VAL(tmp), ZSTR_LEN(tmp));
 			t = ZSTR_VAL(tmp);
 
-			if (!header_init) {
+			if (!header_init && !redirect_keep_method) {
 				/* strip POST headers on redirect */
 				strip_header(user_headers, t, "content-length:");
 				strip_header(user_headers, t, "content-type:");
@@ -606,7 +608,7 @@
 		 * see bug #44603 for details. Since Content-Type maybe part of user's headers we need to do this check first.
 		 */
 		if (
-				header_init &&
+				(header_init || redirect_keep_method) &&
 				context &&
 				!(have_header & HTTP_HEADER_CONTENT_LENGTH) &&
 				(tmpzval = php_stream_context_get_option(context, "http", "content")) != NULL &&
@@ -624,7 +626,7 @@
 	}
 
 	/* Request content, such as for POST requests */
-	if (header_init && context &&
+	if ((header_init || redirect_keep_method) && context &&
 		(tmpzval = php_stream_context_get_option(context, "http", "content")) != NULL &&
 		Z_TYPE_P(tmpzval) == IS_STRING && Z_STRLEN_P(tmpzval) > 0) {
 		if (!(have_header & HTTP_HEADER_CONTENT_LENGTH)) {
@@ -913,9 +915,16 @@
 				CHECK_FOR_CNTRL_CHARS(resource->pass);
 				CHECK_FOR_CNTRL_CHARS(resource->path);
 			}
+			int new_flags = HTTP_WRAPPER_REDIRECTED;
+			if (response_code == 307 || response_code == 308) {
+				/* RFC 7538 specifies that status code 308 does not allow changing the request method from POST to GET.
+				 * RFC 7231 does the same for status code 307.
+				 * To keep consistency between POST and PATCH requests, we'll also not change the request method from PATCH to GET, even though it's allowed it's not mandated by the RFC. */
+				new_flags |= HTTP_WRAPPER_KEEP_METHOD;
+			}
 			stream = php_stream_url_wrap_http_ex(
 				wrapper, new_path, mode, options, opened_path, context,
-				--redirect_max, HTTP_WRAPPER_REDIRECTED, response_header STREAMS_CC);
+				--redirect_max, new_flags, response_header STREAMS_CC);
 		} else {
 			php_stream_wrapper_log_error(wrapper, options, "HTTP request failed! %s", tmp_line);
 		}
@@ -955,6 +964,13 @@
 		if (transfer_encoding) {
 			php_stream_filter_append(&stream->readfilters, transfer_encoding);
 		}
+
+		/* It's possible that the server already sent in more data than just the headers.
+		 * We account for this by adjusting the progress counter by the difference of
+		 * already read header data and the body. */
+		if (stream->writepos > stream->readpos) {
+			php_stream_notify_progress_increment(context, stream->writepos - stream->readpos, 0);
+		}
 	}
 
 	return stream;

php-8.1.13.tar.xz/ext/standard/info.c -> php-8.1.21.tar.xz/ext/standard/info.c Changed

php-8.1.13.tar.xz/ext/standard/mail.c -> php-8.1.21.tar.xz/ext/standard/mail.c Changed

php-8.1.13.tar.xz/ext/standard/pack.c -> php-8.1.21.tar.xz/ext/standard/pack.c Changed

@@ -750,7 +750,16 @@
 			c = *format;
 
 			if (c >= '0' && c <= '9') {
-				repetitions = atoi(format);
+				errno = 0;
+				long tmp = strtol(format, NULL, 10);
+				/* There is not strtoi. We have to check the range ourselves.
+				 * With 32-bit long the INT_{MIN,MAX} are useless because long == int, but with 64-bit they do limit us to 32-bit. */
+				if (errno || tmp < INT_MIN || tmp > INT_MAX) {
+					php_error_docref(NULL, E_WARNING, "Type %c: integer overflow", type);
+					zend_array_destroy(Z_ARR_P(return_value));
+					RETURN_FALSE;
+				}
+				repetitions = tmp;
 
 				while (formatlen > 0 && *format >= '0' && *format <= '9') {
 					format++;
@@ -800,7 +809,7 @@
 
 			case 'h':
 			case 'H':
-				size = (repetitions > 0) ? (repetitions + (repetitions % 2)) / 2 : repetitions;
+				size = (repetitions > 0) ? ((unsigned int) repetitions + 1) / 2 : repetitions;
 				repetitions = 1;
 				break;
 
@@ -865,12 +874,6 @@
 				RETURN_THROWS();
 		}
 
-		if (size != 0 && size != -1 && size < 0) {
-			php_error_docref(NULL, E_WARNING, "Type %c: integer overflow", type);
-			zend_array_destroy(Z_ARR_P(return_value));
-			RETURN_FALSE;
-		}
-
 
 		/* Do actual unpacking */
 		for (i = 0; i != repetitions; i++ ) {

php-8.1.13.tar.xz/ext/standard/php_rand.h -> php-8.1.21.tar.xz/ext/standard/php_rand.h Changed

php-8.1.13.tar.xz/ext/standard/streamsfuncs.c -> php-8.1.21.tar.xz/ext/standard/streamsfuncs.c Changed

@@ -33,11 +33,13 @@
 #ifndef PHP_WIN32
 #define php_select(m, r, w, e, t)	select(m, r, w, e, t)
 typedef unsigned long long php_timeout_ull;
+#define PHP_TIMEOUT_ULL_MAX ULLONG_MAX
 #else
 #include "win32/select.h"
 #include "win32/sockets.h"
 #include "win32/console.h"
 typedef unsigned __int64 php_timeout_ull;
+#define PHP_TIMEOUT_ULL_MAX UINT64_MAX
 #endif
 
 #define GET_CTX_OPT(stream, wrapper, name, val) (PHP_STREAM_CONTEXT(stream) && NULL != (val = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), wrapper, name)))
@@ -134,14 +136,21 @@
 	}
 
 	/* prepare the timeout value for use */
-	conv = (php_timeout_ull) (timeout * 1000000.0);
+	struct timeval *tv_pointer;
+	if (timeout < 0.0 || timeout >= (double) PHP_TIMEOUT_ULL_MAX / 1000000.0) {
+		tv_pointer = NULL;
+	} else {
+		conv = (php_timeout_ull) (timeout * 1000000.0);
 #ifdef PHP_WIN32
-	tv.tv_sec = (long)(conv / 1000000);
-	tv.tv_usec =(long)(conv % 1000000);
+		tv.tv_sec = (long)(conv / 1000000);
+		tv.tv_usec = (long)(conv % 1000000);
 #else
-	tv.tv_sec = conv / 1000000;
-	tv.tv_usec = conv % 1000000;
+		tv.tv_sec = conv / 1000000;
+		tv.tv_usec = conv % 1000000;
 #endif
+		tv_pointer = &tv;
+	}
+
 	if (zerrno) {
 		ZEND_TRY_ASSIGN_REF_LONG(zerrno, 0);
 	}
@@ -152,7 +161,7 @@
 	stream = php_stream_xport_create(ZSTR_VAL(host), ZSTR_LEN(host), REPORT_ERRORS,
 			STREAM_XPORT_CLIENT | (flags & PHP_STREAM_CLIENT_CONNECT ? STREAM_XPORT_CONNECT : 0) |
 			(flags & PHP_STREAM_CLIENT_ASYNC_CONNECT ? STREAM_XPORT_CONNECT_ASYNC : 0),
-			hashkey, &tv, context, &errstr, &err);
+			hashkey, tv_pointer, context, &errstr, &err);
 
 
 	if (stream == NULL) {
@@ -213,10 +222,6 @@
 
 	context = php_stream_context_from_zval(zcontext, flags & PHP_FILE_NO_DEFAULT_CONTEXT);
 
-	if (context) {
-		GC_ADDREF(context->res);
-	}
-
 	if (zerrno) {
 		ZEND_TRY_ASSIGN_REF_LONG(zerrno, 0);
 	}
@@ -279,19 +284,25 @@
 	php_stream_from_zval(stream, zstream);
 
 	/* prepare the timeout value for use */
-	conv = (php_timeout_ull) (timeout * 1000000.0);
+	struct timeval *tv_pointer;
+	if (timeout < 0.0 || timeout >= (double) PHP_TIMEOUT_ULL_MAX / 1000000.0) {
+		tv_pointer = NULL;
+	} else {
+		conv = (php_timeout_ull) (timeout * 1000000.0);
 #ifdef PHP_WIN32
-	tv.tv_sec = (long)(conv / 1000000);
-	tv.tv_usec = (long)(conv % 1000000);
+		tv.tv_sec = (long)(conv / 1000000);
+		tv.tv_usec = (long)(conv % 1000000);
 #else
-	tv.tv_sec = conv / 1000000;
-	tv.tv_usec = conv % 1000000;
+		tv.tv_sec = conv / 1000000;
+		tv.tv_usec = conv % 1000000;
 #endif
+		tv_pointer = &tv;
+	}
 
 	if (0 == php_stream_xport_accept(stream, &clistream,
 				zpeername ? &peername : NULL,
 				NULL, NULL,
-				&tv, &errstr
+				tv_pointer, &errstr
 				) && clistream) {
 
 		if (peername) {

php-8.1.13.tar.xz/ext/standard/string.c -> php-8.1.21.tar.xz/ext/standard/string.c Changed

@@ -1373,7 +1373,7 @@
 			if (c != (unsigned char*)ZSTR_VAL(s)) {
 				memcpy(ZSTR_VAL(res), ZSTR_VAL(s), c - (unsigned char*)ZSTR_VAL(s));
 			}
-			r = c + (ZSTR_VAL(res) - ZSTR_VAL(s));
+			r = (unsigned char*) ZSTR_VAL(res) + (c - (unsigned char*) ZSTR_VAL(s));
 			while (c < e) {
 				*r = toupper(*c);
 				r++;
@@ -1438,7 +1438,7 @@
 				if (c != (unsigned char*)ZSTR_VAL(s)) {
 					memcpy(ZSTR_VAL(res), ZSTR_VAL(s), c - (unsigned char*)ZSTR_VAL(s));
 				}
-				r = c + (ZSTR_VAL(res) - ZSTR_VAL(s));
+				r = (unsigned char*) ZSTR_VAL(res) + (c - (unsigned char*) ZSTR_VAL(s));
 				while (c < e) {
 					*r = tolower(*c);
 					r++;
@@ -2472,7 +2472,7 @@
 			if (repl_ht) {
 				while (repl_idx < repl_ht->nNumUsed) {
 					tmp_repl = &repl_ht->arDatarepl_idx.val;
-					if (repl_ht != IS_UNDEF) {
+					if (Z_TYPE_P(tmp_repl) != IS_UNDEF) {
 						break;
 					}
 					repl_idx++;
@@ -3988,19 +3988,23 @@
 		quad_word q;
 		vst1q_u8(q.mem, vceqq_u8(x, vdupq_n_u8('\\')));
 		if (q.dw0 | q.dw1) {
-			int i = 0;
-			for (; i < 16; i++) {
+			unsigned int i = 0;
+			while (i < 16) {
 				if (q.memi == 0) {
 					*out++ = stri;
+					i++;
 					continue;
 				}
 
 				i++;			/* skip the slash */
-				char s = stri;
-				if (s == '0')
-					*out++ = '\0';
-				else
-					*out++ = s;	/* preserve the next character */
+				if (i < len) {
+					char s = stri;
+					if (s == '0')
+						*out++ = '\0';
+					else
+						*out++ = s;	/* preserve the next character */
+					i++;
+				}
 			}
 			str += i;
 			len -= i;
@@ -5288,7 +5292,7 @@
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (mymode < 0 || mymode > 4) {
-		zend_argument_value_error(2, "must be between 1 and 4 (inclusive)");
+		zend_argument_value_error(2, "must be between 0 and 4 (inclusive)");
 		RETURN_THROWS();
 	}
 
@@ -5956,7 +5960,7 @@
 	}
 
 	if ((size_t)offset > ZSTR_LEN(s1)) {
-		zend_argument_value_error(3, "must be contained in argument #1 ($main_str)");
+		zend_argument_value_error(3, "must be contained in argument #1 ($haystack)");
 		RETURN_THROWS();
 	}

php-8.1.21.tar.xz/ext/standard/tests/crypt/bcrypt_salt_dollar.phpt Added

@@ -0,0 +1,82 @@
+--TEST--
+bcrypt correctly rejects salts containing $
+--FILE--
+<?php
+for ($i = 0; $i < 23; $i++) {
+	$salt = '$2y$04$' . str_repeat('0', $i) . '$';
+	$result = crypt("foo", $salt);
+	var_dump($salt);
+	var_dump($result);
+	var_dump($result === $salt);
+}
+?>
+--EXPECT--
+string(8) "$2y$04$$"
+string(2) "*0"
+bool(false)
+string(9) "$2y$04$0$"
+string(2) "*0"
+bool(false)
+string(10) "$2y$04$00$"
+string(2) "*0"
+bool(false)
+string(11) "$2y$04$000$"
+string(2) "*0"
+bool(false)
+string(12) "$2y$04$0000$"
+string(2) "*0"
+bool(false)
+string(13) "$2y$04$00000$"
+string(2) "*0"
+bool(false)
+string(14) "$2y$04$000000$"
+string(2) "*0"
+bool(false)
+string(15) "$2y$04$0000000$"
+string(2) "*0"
+bool(false)
+string(16) "$2y$04$00000000$"
+string(2) "*0"
+bool(false)
+string(17) "$2y$04$000000000$"
+string(2) "*0"
+bool(false)
+string(18) "$2y$04$0000000000$"
+string(2) "*0"
+bool(false)
+string(19) "$2y$04$00000000000$"
+string(2) "*0"
+bool(false)
+string(20) "$2y$04$000000000000$"
+string(2) "*0"
+bool(false)
+string(21) "$2y$04$0000000000000$"
+string(2) "*0"
+bool(false)
+string(22) "$2y$04$00000000000000$"
+string(2) "*0"
+bool(false)
+string(23) "$2y$04$000000000000000$"
+string(2) "*0"
+bool(false)
+string(24) "$2y$04$0000000000000000$"
+string(2) "*0"
+bool(false)
+string(25) "$2y$04$00000000000000000$"
+string(2) "*0"
+bool(false)
+string(26) "$2y$04$000000000000000000$"
+string(2) "*0"
+bool(false)
+string(27) "$2y$04$0000000000000000000$"
+string(2) "*0"
+bool(false)
+string(28) "$2y$04$00000000000000000000$"
+string(2) "*0"
+bool(false)
+string(29) "$2y$04$000000000000000000000$"
+string(2) "*0"
+bool(false)
+string(30) "$2y$04$0000000000000000000000$"
+string(60) "$2y$04$000000000000000000000u2a2UpVexIt9k3FMJeAVr3c04F5tcI8K"
+bool(false)

php-8.1.13.tar.xz/ext/standard/tests/file/bug52820.phpt -> php-8.1.21.tar.xz/ext/standard/tests/file/bug52820.phpt Changed

php-8.1.13.tar.xz/ext/standard/tests/file/bug60120.phpt -> php-8.1.21.tar.xz/ext/standard/tests/file/bug60120.phpt Changed

@@ -6,6 +6,7 @@
 if (!$php) {
 die("skip No php executable defined\n");
 }
+if (PHP_OS_FAMILY === 'Windows') die('skip not for Windows');
 ?>
 --FILE--
 <?php
@@ -16,7 +17,7 @@
 if (!$php) {
 die("No php executable defined\n");
 }
-$cmd = 'php -r "fwrite(STDOUT, $in = file_get_contents(\'php://stdin\')); fwrite(STDERR, $in);"';
+$cmd = $php . ' -r "\$in = file_get_contents(\'php://stdin\'); fwrite(STDOUT, \$in); fwrite(STDERR, \$in);"';
 $descriptors = array(array('pipe', 'r'), array('pipe', 'w'), array('pipe', 'w'));
 $stdin = str_repeat('*', 2049 );
 
@@ -32,6 +33,7 @@
 
 unset($pipes0);
 
+$procOutput = ;
 while ($pipes || $writePipes) {
 $r = $pipes;
 $w = $writePipes;
@@ -48,6 +50,8 @@
 $written = fwrite($writePipes0, substr($stdin, $stdinOffset), 8192);
 if (false !== $written) {
 $stdinOffset += $written;
+ } else {
+ die('Failed to write to pipe');
 }
 if ($stdinOffset >= $stdinLen) {
 fclose($writePipes0);
@@ -58,12 +62,21 @@
 foreach ($r as $pipe) {
 $type = array_search($pipe, $pipes);
 $data = fread($pipe, 8192);
- if (false === $data || feof($pipe)) {
+ if (feof($pipe)) {
 fclose($pipe);
 unset($pipes$type);
+ } elseif (false === $data) {
+ die('Failed to read from pipe');
+ } else {
+ $procOutput$type = ($procOutput$type ?? '') . $data;
 }
 }
 }
+foreach ($procOutput as $output) {
+ if ($output !== $stdin) {
+ die('Output does not match input: ' . $output);
+ }
+}
 echo "OK.";
 ?>
 --EXPECT--

php-8.1.13.tar.xz/ext/standard/tests/file/bug81145.phpt -> php-8.1.21.tar.xz/ext/standard/tests/file/bug81145.phpt Changed

php-8.1.13.tar.xz/ext/standard/tests/file/disk_free_space_basic.phpt -> php-8.1.21.tar.xz/ext/standard/tests/file/disk_free_space_basic.phpt Changed

php-8.1.21.tar.xz/ext/standard/tests/general_functions/gh9905.phpt Added

php-8.1.13.tar.xz/ext/standard/tests/general_functions/phpinfo.phpt -> php-8.1.21.tar.xz/ext/standard/tests/general_functions/phpinfo.phpt Changed

php-8.1.13.tar.xz/ext/standard/tests/general_functions/rand.phpt -> php-8.1.21.tar.xz/ext/standard/tests/general_functions/rand.phpt Changed

php-8.1.21.tar.xz/ext/standard/tests/gh10885.phpt Added

php-8.1.13.tar.xz/ext/standard/tests/http/bug67430.phpt -> php-8.1.21.tar.xz/ext/standard/tests/http/bug67430.phpt Changed

php-8.1.21.tar.xz/ext/standard/tests/http/gh11274.phpt Added

@@ -0,0 +1,62 @@
+--TEST--
+GH-11274 (POST/PATCH request via file_get_contents + stream_context_create switches to GET after a HTTP 308 redirect)
+--INI--
+allow_url_fopen=1
+--CONFLICTS--
+server
+--FILE--
+<?php
+$serverCode = <<<'CODE'
+$uri = $_SERVER'REQUEST_URI';
+if (isset($_GET"desired_status") && $uristrlen($uri) - 1 !== '/') {
+ $desired_status = (int) $_GET"desired_status";
+ http_response_code($desired_status);
+ header("Location: $uri/");
+ exit;
+}
+
+echo "method: ", $_SERVER'REQUEST_METHOD', "; body: ", file_get_contents('php://input'), "\n";
+CODE;
+
+include __DIR__."/../../../../sapi/cli/tests/php_cli_server.inc";
+php_cli_server_start($serverCode, null, );
+
+foreach (null, 301, 302, 307, 308 as $status) {
+ if (is_null($status)) {
+ echo "-- Testing unredirected request --\n";
+ } else {
+ echo "-- Testing redirect status code $status --\n";
+ }
+ $suffix = $status ? "?desired_status=$status" : "";
+ echo file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS . "/test$suffix", false, stream_context_create('http' => 'method' => 'POST', 'header' => 'Content-type: application/x-www-form-urlencoded', 'content' => http_build_query('hello' => 'world')));
+ echo file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS . "/test$suffix", false, stream_context_create('http' => 'method' => 'PATCH', 'header' => 'Content-type: application/x-www-form-urlencoded', 'content' => http_build_query('hello' => 'world')));
+ echo file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS . "/test/$suffix", false, stream_context_create('http' => 'method' => 'POST', 'header' => 'Content-type: application/x-www-form-urlencoded', 'content' => http_build_query('hello' => 'world')));
+ echo file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS . "/test/$suffix", false, stream_context_create('http' => 'method' => 'PATCH', 'header' => 'Content-type: application/x-www-form-urlencoded', 'content' => http_build_query('hello' => 'world')));
+}
+?>
+--EXPECT--
+-- Testing unredirected request --
+method: POST; body: hello=world
+method: PATCH; body: hello=world
+method: POST; body: hello=world
+method: PATCH; body: hello=world
+-- Testing redirect status code 301 --
+method: GET; body: 
+method: GET; body: 
+method: GET; body: 
+method: GET; body: 
+-- Testing redirect status code 302 --
+method: GET; body: 
+method: GET; body: 
+method: GET; body: 
+method: GET; body: 
+-- Testing redirect status code 307 --
+method: POST; body: hello=world
+method: PATCH; body: hello=world
+method: POST; body: hello=world
+method: PATCH; body: hello=world
+-- Testing redirect status code 308 --
+method: POST; body: hello=world
+method: PATCH; body: hello=world
+method: POST; body: hello=world
+method: PATCH; body: hello=world

php-8.1.21.tar.xz/ext/standard/tests/mail/gh10990.phpt Added

php-8.1.21.tar.xz/ext/standard/tests/oss_fuzz_57392.phpt Added

php-8.1.21.tar.xz/ext/standard/tests/password/password_bcrypt_short.phpt Added

php-8.1.21.tar.xz/ext/standard/tests/streams/gh10031.phpt Added

@@ -0,0 +1,52 @@
+--TEST--
+GH-10031 (Stream STREAM_NOTIFY_PROGRESS over HTTP emitted irregularly for last chunk of data)
+--SKIPIF--
+<?php
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
+?>
+--INI--
+allow_url_fopen=1
+--CONFLICTS--
+server
+--FILE--
+<?php
+
+$serverCode = <<<'CODE'
+$fsize = 1000;
+$chunksize = 99;
+$chunks = floor($fsize / $chunksize); // 10 chunks * 99 bytes
+$lastchunksize = $fsize - $chunksize * $chunks; // 1 chunk * 10 bytes
+
+header("Content-Length: " . $fsize);
+flush();
+for ($chunk = 1; $chunk <= $chunks; $chunk++) {
+ echo str_repeat('x', $chunksize);
+ @ob_flush();
+ usleep(50 * 1000);
+}
+
+echo str_repeat('x', $lastchunksize);
+CODE;
+
+include __DIR__."/../../../../sapi/cli/tests/php_cli_server.inc";
+php_cli_server_start($serverCode, null, );
+
+$context = stream_context_create('http' => 'ignore_errors' => true,);
+$lastBytesTransferred = 0;
+stream_context_set_params($context, 'notification' => function ($code, $s, $m, $mc, $bytes_transferred, $bytes_max)
+use (&$lastBytesTransferred) {
+ if ($code === STREAM_NOTIFY_FILE_SIZE_IS) echo "expected filesize=$bytes_max".PHP_EOL;
+ $lastBytesTransferred = $bytes_transferred;
+ @ob_flush();
+});
+
+$get = file_get_contents("http://".PHP_CLI_SERVER_ADDRESS, false, $context);
+
+echo "got filesize=" . strlen($get) . PHP_EOL;
+var_dump($lastBytesTransferred);
+
+?>
+--EXPECT--
+expected filesize=1000
+got filesize=1000
+int(1000)

php-8.1.13.tar.xz/ext/standard/tests/streams/proc_open_bug69900.phpt -> php-8.1.21.tar.xz/ext/standard/tests/streams/proc_open_bug69900.phpt Changed

php-8.1.13.tar.xz/ext/standard/tests/strings/bug40754.phpt -> php-8.1.21.tar.xz/ext/standard/tests/strings/bug40754.phpt Changed

php-8.1.13.tar.xz/ext/standard/tests/strings/count_chars_basic.phpt -> php-8.1.21.tar.xz/ext/standard/tests/strings/count_chars_basic.phpt Changed

php-8.1.21.tar.xz/ext/standard/tests/strings/gh10187.phpt Added

php-8.1.21.tar.xz/ext/standard/tests/strings/gh10940.phpt Added

php-8.1.13.tar.xz/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt -> php-8.1.21.tar.xz/ext/standard/tests/strings/html_entity_decode_iso8859-5.phpt Changed

@@ -358,47 +358,47 @@
 NUMERO SIGN: &#x2116; => f0
 &#xF0; => &#xF0;
 
-CYRILLIC SMALL LETTER IO: &#x451; => 2623783435313b
+CYRILLIC SMALL LETTER IO: &#x451; => f1
 &#xF1; => &#xF1;
 
-CYRILLIC SMALL LETTER DJE: &#x452; => 2623783435323b
+CYRILLIC SMALL LETTER DJE: &#x452; => f2
 &#xF2; => &#xF2;
 
-CYRILLIC SMALL LETTER GJE: &#x453; => 2623783435333b
+CYRILLIC SMALL LETTER GJE: &#x453; => f3
 &#xF3; => &#xF3;
 
-CYRILLIC SMALL LETTER UKRAINIAN IE: &#x454; => 2623783435343b
+CYRILLIC SMALL LETTER UKRAINIAN IE: &#x454; => f4
 &#xF4; => &#xF4;
 
-CYRILLIC SMALL LETTER DZE: &#x455; => 2623783435353b
+CYRILLIC SMALL LETTER DZE: &#x455; => f5
 &#xF5; => &#xF5;
 
-CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I: &#x456; => 2623783435363b
+CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I: &#x456; => f6
 &#xF6; => &#xF6;
 
-CYRILLIC SMALL LETTER YI: &#x457; => 2623783435373b
+CYRILLIC SMALL LETTER YI: &#x457; => f7
 &#xF7; => &#xF7;
 
-CYRILLIC SMALL LETTER JE: &#x458; => 2623783435383b
+CYRILLIC SMALL LETTER JE: &#x458; => f8
 &#xF8; => &#xF8;
 
-CYRILLIC SMALL LETTER LJE: &#x459; => 2623783435393b
+CYRILLIC SMALL LETTER LJE: &#x459; => f9
 &#xF9; => &#xF9;
 
-CYRILLIC SMALL LETTER NJE: &#x45A; => 2623783435413b
+CYRILLIC SMALL LETTER NJE: &#x45A; => fa
 &#xFA; => &#xFA;
 
-CYRILLIC SMALL LETTER TSHE: &#x45B; => 2623783435423b
+CYRILLIC SMALL LETTER TSHE: &#x45B; => fb
 &#xFB; => &#xFB;
 
-CYRILLIC SMALL LETTER KJE: &#x45C; => 2623783435433b
+CYRILLIC SMALL LETTER KJE: &#x45C; => fc
 &#xFC; => &#xFC;
 
 SECTION SIGN: &#xA7; => fd
 &#xFD; => &#xFD;
 
-CYRILLIC SMALL LETTER SHORT U: &#x45E; => 2623783435453b
+CYRILLIC SMALL LETTER SHORT U: &#x45E; => fe
 &#xFE; => &#xFE;
 
-CYRILLIC SMALL LETTER DZHE: &#x45F; => 2623783435463b
+CYRILLIC SMALL LETTER DZHE: &#x45F; => ff
 &#xFF; => &#xFF;

php-8.1.21.tar.xz/ext/standard/tests/strings/substr_replace_array_unset.phpt Added

php-8.1.13.tar.xz/ext/standard/url_scanner_ex.c -> php-8.1.21.tar.xz/ext/standard/url_scanner_ex.c Changed

php-8.1.13.tar.xz/ext/standard/var_unserializer.c -> php-8.1.21.tar.xz/ext/standard/var_unserializer.c Changed

php-8.1.13.tar.xz/ext/sysvshm/tests/bug72858.phpt -> php-8.1.21.tar.xz/ext/sysvshm/tests/bug72858.phpt Changed

php-8.1.13.tar.xz/ext/tidy/tests/006.phpt -> php-8.1.21.tar.xz/ext/tidy/tests/006.phpt Changed

php-8.1.13.tar.xz/ext/tidy/tests/008.phpt -> php-8.1.21.tar.xz/ext/tidy/tests/008.phpt Changed

php-8.1.13.tar.xz/ext/tidy/tests/019.phpt -> php-8.1.21.tar.xz/ext/tidy/tests/019.phpt Changed

php-8.1.21.tar.xz/ext/tidy/tests/gh10636.phpt Added

php-8.1.21.tar.xz/ext/tidy/tests/gh10636_config Added

php-8.1.21.tar.xz/ext/tidy/tests/parsing_file_too_large.phpt Added

@@ -0,0 +1,59 @@
+--TEST--
+Trying to parse a file that is too large (over 4GB)
+--EXTENSIONS--
+tidy
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
+if (getenv("SKIP_ASAN")) die("skip too big for asan");
+?>
+--CONFLICTS--
+all
+--INI--
+memory_limit="5G"
+--FILE--
+<?php
+
+$path = __DIR__ . '/too_large_test.html';
+$file = fopen($path, 'w+');
+
+// Write over 4GB
+const MIN_FILE_SIZE = 4_294_967_295;
+
+var_dump(fseek($file, MIN_FILE_SIZE+10));
+$s = str_repeat("a", 10);
+$bytes_written = fwrite($file, $s);
+if ($bytes_written === false) {
+ echo "Didn't write bytes\n";
+}
+
+$tidy = new tidy;
+try {
+ var_dump($tidy->parseFile($path));
+} catch (\Throwable $e) {
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+ var_dump(tidy_parse_file($path));
+} catch (\Throwable $e) {
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+
+try {
+ $tidy = new tidy($path);
+} catch (\Throwable $e) {
+ echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+}
+?>
+--CLEAN--
+<?php
+$path = __DIR__ . '/too_large_test.html';
+unlink($path);
+?>
+--EXPECT--
+int(0)
+ValueError: Input string is too long
+ValueError: Input string is too long
+ValueError: Input string is too long

php-8.1.21.tar.xz/ext/tidy/tests/parsing_inexistent_file.phpt Added

php-8.1.13.tar.xz/ext/tidy/tidy.c -> php-8.1.21.tar.xz/ext/tidy/tidy.c Changed

@@ -79,14 +79,7 @@
 		_php_tidy_apply_config_array(_doc, _val_ht); \
 	} else if (_val_str) { \
 		TIDY_OPEN_BASE_DIR_CHECK(ZSTR_VAL(_val_str)); \
-		switch (tidyLoadConfig(_doc, ZSTR_VAL(_val_str))) { \
-			case -1: \
-				php_error_docref(NULL, E_WARNING, "Could not load configuration file \"%s\"", ZSTR_VAL(_val_str)); \
-				break; \
-			case 1: \
-				php_error_docref(NULL, E_NOTICE, "There were errors while parsing the configuration file \"%s\"", ZSTR_VAL(_val_str)); \
-				break; \
-		} \
+		php_tidy_load_config(_doc, ZSTR_VAL(_val_str)); \
 	}
 
 
@@ -143,9 +136,7 @@
 
 #define TIDY_SET_DEFAULT_CONFIG(_doc) \
 	if (TG(default_config) && TG(default_config)0) { \
-		if (tidyLoadConfig(_doc, TG(default_config)) < 0) { \
-			php_error_docref(NULL, E_WARNING, "Unable to load Tidy configuration file at \"%s\"", TG(default_config)); \
-		} \
+		php_tidy_load_config(_doc, TG(default_config)); \
 	}
 /* }}} */
 
@@ -269,6 +260,16 @@
 	php_error_docref(NULL, E_ERROR, "Could not allocate memory for tidy! (Reason: %s)", (char *)msg);
 }
 
+static void php_tidy_load_config(TidyDoc doc, const char *path)
+{
+	int ret = tidyLoadConfig(doc, path);
+	if (ret < 0) {
+		php_error_docref(NULL, E_WARNING, "Could not load the Tidy configuration file \"%s\"", path);
+	} else if (ret > 0) {
+		php_error_docref(NULL, E_NOTICE, "There were errors while parsing the Tidy configuration file \"%s\"", path);
+	}
+}
+
 static int _php_tidy_set_tidy_opt(TidyDoc doc, char *optname, zval *value)
 {
 	TidyOption opt = tidyGetOptionByName(doc, optname);
@@ -1059,19 +1060,20 @@
 		Z_PARAM_BOOL(use_include_path)
 	ZEND_PARSE_PARAMETERS_END();
 
-	tidy_instanciate(tidy_ce_doc, return_value);
-	obj = Z_TIDY_P(return_value);
-
 	if (!(contents = php_tidy_file_to_mem(ZSTR_VAL(inputfile), use_include_path))) {
 		php_error_docref(NULL, E_WARNING, "Cannot load \"%s\" into memory%s", ZSTR_VAL(inputfile), (use_include_path) ? " (using include path)" : "");
 		RETURN_FALSE;
 	}
 
 	if (ZEND_SIZE_T_UINT_OVFL(ZSTR_LEN(contents))) {
+		zend_string_release_ex(contents, 0);
 		zend_value_error("Input string is too long");
 		RETURN_THROWS();
 	}
 
+	tidy_instanciate(tidy_ce_doc, return_value);
+	obj = Z_TIDY_P(return_value);
+
 	TIDY_APPLY_CONFIG(obj->ptdoc->doc, options_str, options_ht);
 
 	if (php_tidy_parse_string(obj, ZSTR_VAL(contents), (uint32_t)ZSTR_LEN(contents), enc) == FAILURE) {
@@ -1362,6 +1364,7 @@
 		}
 
 		if (ZEND_SIZE_T_UINT_OVFL(ZSTR_LEN(contents))) {
+			zend_string_release_ex(contents, 0);
 			zend_value_error("Input string is too long");
 			RETURN_THROWS();
 		}
@@ -1400,6 +1403,7 @@
 	}
 
 	if (ZEND_SIZE_T_UINT_OVFL(ZSTR_LEN(contents))) {
+		zend_string_release_ex(contents, 0);
 		zend_value_error("Input string is too long");
 		RETURN_THROWS();
 	}

php-8.1.21.tar.xz/ext/xml/tests/bug26614_libxml_gte2_11.phpt Added

@@ -0,0 +1,95 @@
+--TEST--
+Bug #26614 (CDATA sections skipped on line count)
+--EXTENSIONS--
+xml
+--SKIPIF--
+<?php
+if (!defined("LIBXML_VERSION")) die('skip libxml2 test');
+if (LIBXML_VERSION < 21100) die('skip libxml2 test variant for version >= 2.11');
+?>
+--FILE--
+<?php
+/*
+this test works fine with Expat but fails with libxml
+which we now use as default
+
+further investigation has shown that not only line count
+is skipped on CDATA sections but that libxml does also
+show different column numbers and byte positions depending
+on context and in opposition to what one would expect to
+see and what good old Expat reported just fine ...
+*/
+
+$xmls = array();
+
+// Case 1: CDATA Sections
+$xmls"CDATA" ='<?xml version="1.0" encoding="iso-8859-1" ?>
+<data>
+<!CDATA
+multi
+line
+CDATA
+block
+>
+</data>';
+
+// Case 2: replace some characters so that we get comments instead
+$xmls"Comment" ='<?xml version="1.0" encoding="iso-8859-1" ?>
+<data>
+
+</data>';
+
+// Case 3: replace even more characters so that only textual data is left
+$xmls"Text" ='<?xml version="1.0" encoding="iso-8859-1" ?>
+<data>
+-!-- ATA
+multi
+line
+CDATA
+block
+---
+</data>';
+
+function startElement($parser, $name, $attrs) {
+ printf("<$name> at line %d, col %d (byte %d)\n",
+ xml_get_current_line_number($parser),
+ xml_get_current_column_number($parser),
+ xml_get_current_byte_index($parser));
+}
+
+function endElement($parser, $name) {
+ printf("</$name> at line %d, col %d (byte %d)\n",
+ xml_get_current_line_number($parser),
+ xml_get_current_column_number($parser),
+ xml_get_current_byte_index($parser));
+}
+
+function characterData($parser, $data) {
+ // dummy
+}
+
+foreach ($xmls as $desc => $xml) {
+ echo "$desc\n";
+ $xml_parser = xml_parser_create();
+ xml_set_element_handler($xml_parser, "startElement", "endElement");
+ xml_set_character_data_handler($xml_parser, "characterData");
+ if (!xml_parse($xml_parser, $xml, true))
+ echo "Error: ".xml_error_string(xml_get_error_code($xml_parser))."\n";
+ xml_parser_free($xml_parser);
+}
+?>
+--EXPECTF--
+CDATA
+<DATA> at line 2, col %d (byte 50)
+</DATA> at line 9, col %d (byte 96)
+Comment
+<DATA> at line 2, col %d (byte 50)
+</DATA> at line 9, col %d (byte 96)
+Text
+<DATA> at line 2, col %d (byte 50)
+</DATA> at line 9, col %d (byte 96)

php-8.1.21.tar.xz/ext/xml/tests/bug26614_libxml_pre2_11.phpt Added

@@ -0,0 +1,95 @@
+--TEST--
+Bug #26614 (CDATA sections skipped on line count)
+--EXTENSIONS--
+xml
+--SKIPIF--
+<?php
+if (!defined("LIBXML_VERSION")) die('skip libxml2 test');
+if (LIBXML_VERSION >= 21100) die('skip libxml2 test variant for version < 2.11');
+?>
+--FILE--
+<?php
+/*
+this test works fine with Expat but fails with libxml
+which we now use as default
+
+further investigation has shown that not only line count
+is skipped on CDATA sections but that libxml does also
+show different column numbers and byte positions depending
+on context and in opposition to what one would expect to
+see and what good old Expat reported just fine ...
+*/
+
+$xmls = array();
+
+// Case 1: CDATA Sections
+$xmls"CDATA" ='<?xml version="1.0" encoding="iso-8859-1" ?>
+<data>
+<!CDATA
+multi
+line
+CDATA
+block
+>
+</data>';
+
+// Case 2: replace some characters so that we get comments instead
+$xmls"Comment" ='<?xml version="1.0" encoding="iso-8859-1" ?>
+<data>
+
+</data>';
+
+// Case 3: replace even more characters so that only textual data is left
+$xmls"Text" ='<?xml version="1.0" encoding="iso-8859-1" ?>
+<data>
+-!-- ATA
+multi
+line
+CDATA
+block
+---
+</data>';
+
+function startElement($parser, $name, $attrs) {
+ printf("<$name> at line %d, col %d (byte %d)\n",
+ xml_get_current_line_number($parser),
+ xml_get_current_column_number($parser),
+ xml_get_current_byte_index($parser));
+}
+
+function endElement($parser, $name) {
+ printf("</$name> at line %d, col %d (byte %d)\n",
+ xml_get_current_line_number($parser),
+ xml_get_current_column_number($parser),
+ xml_get_current_byte_index($parser));
+}
+
+function characterData($parser, $data) {
+ // dummy
+}
+
+foreach ($xmls as $desc => $xml) {
+ echo "$desc\n";
+ $xml_parser = xml_parser_create();
+ xml_set_element_handler($xml_parser, "startElement", "endElement");
+ xml_set_character_data_handler($xml_parser, "characterData");
+ if (!xml_parse($xml_parser, $xml, true))
+ echo "Error: ".xml_error_string(xml_get_error_code($xml_parser))."\n";
+ xml_parser_free($xml_parser);
+}
+?>
+--EXPECTF--
+CDATA
+<DATA> at line 2, col %d (byte 9)
+</DATA> at line 9, col %d (byte 55)
+Comment
+<DATA> at line 2, col %d (byte 9)
+</DATA> at line 9, col %d (byte 55)
+Text
+<DATA> at line 2, col %d (byte 9)
+</DATA> at line 9, col %d (byte 55)

php-8.1.13.tar.xz/ext/xml/tests/xml_parser_get_option_variation4.phpt -> php-8.1.21.tar.xz/ext/xml/tests/xml_parser_get_option_variation4.phpt Changed

php-8.1.13.tar.xz/ext/xml/tests/xml_parser_set_option_variation5.phpt -> php-8.1.21.tar.xz/ext/xml/tests/xml_parser_set_option_variation5.phpt Changed

php-8.1.13.tar.xz/ext/xml/xml.c -> php-8.1.21.tar.xz/ext/xml/xml.c Changed

php-8.1.13.tar.xz/ext/xmlreader/php_xmlreader.c -> php-8.1.21.tar.xz/ext/xmlreader/php_xmlreader.c Changed

php-8.1.13.tar.xz/ext/xmlwriter/php_xmlwriter.c -> php-8.1.21.tar.xz/ext/xmlwriter/php_xmlwriter.c Changed

php-8.1.13.tar.xz/ext/zend_test/observer.c -> php-8.1.21.tar.xz/ext/zend_test/observer.c Changed

@@ -256,6 +256,27 @@
 	}
 }
 
+static void (*zend_test_prev_execute_internal)(zend_execute_data *execute_data, zval *return_value);
+static void zend_test_execute_internal(zend_execute_data *execute_data, zval *return_value) {
+	zend_function *fbc = execute_data->func;
+
+	if (fbc->common.function_name) {
+		if (fbc->common.scope) {
+			php_printf("%*s\n", 2 * ZT_G(observer_nesting_depth), "", ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name));
+		} else {
+			php_printf("%*s\n", 2 * ZT_G(observer_nesting_depth), "", ZSTR_VAL(fbc->common.function_name));
+		}
+	} else {
+		php_printf("%*s\n", 2 * ZT_G(observer_nesting_depth), "", ZSTR_VAL(fbc->op_array.filename));
+	}
+
+	if (zend_test_prev_execute_internal) {
+		zend_test_prev_execute_internal(execute_data, return_value);
+	} else {
+		fbc->internal_function.handler(execute_data, return_value);
+	}
+}
+
 static ZEND_INI_MH(zend_test_observer_OnUpdateCommaList)
 {
 	zend_array **p = (zend_array **) ZEND_INI_GET_ADDR();
@@ -291,6 +312,7 @@
 	STD_PHP_INI_BOOLEAN("zend_test.observer.fiber_init", "0", PHP_INI_SYSTEM, OnUpdateBool, observer_fiber_init, zend_zend_test_globals, zend_test_globals)
 	STD_PHP_INI_BOOLEAN("zend_test.observer.fiber_switch", "0", PHP_INI_SYSTEM, OnUpdateBool, observer_fiber_switch, zend_zend_test_globals, zend_test_globals)
 	STD_PHP_INI_BOOLEAN("zend_test.observer.fiber_destroy", "0", PHP_INI_SYSTEM, OnUpdateBool, observer_fiber_destroy, zend_zend_test_globals, zend_test_globals)
+	STD_PHP_INI_BOOLEAN("zend_test.observer.execute_internal", "0", PHP_INI_SYSTEM, OnUpdateBool, observer_execute_internal, zend_zend_test_globals, zend_test_globals)
 PHP_INI_END()
 
 void zend_test_observer_init(INIT_FUNC_ARGS)
@@ -316,6 +338,11 @@
 		zend_observer_fiber_switch_register(fiber_suspend_observer);
 		zend_observer_fiber_destroy_register(fiber_destroy_observer);
 	}
+
+	if (ZT_G(observer_execute_internal)) {
+		zend_test_prev_execute_internal = zend_execute_internal;
+		zend_execute_internal = zend_test_execute_internal;
+	}
 }
 
 void zend_test_observer_shutdown(SHUTDOWN_FUNC_ARGS)

php-8.1.13.tar.xz/ext/zend_test/php_test.h -> php-8.1.21.tar.xz/ext/zend_test/php_test.h Changed

php-8.1.13.tar.xz/ext/zend_test/test.c -> php-8.1.21.tar.xz/ext/zend_test/test.c Changed

@@ -321,6 +321,29 @@
 	RETURN_LONG(1);
 }
 
+static ZEND_FUNCTION(zend_get_map_ptr_last)
+{
+	ZEND_PARSE_PARAMETERS_NONE();
+	RETURN_LONG(CG(map_ptr_last));
+}
+
+static ZEND_FUNCTION(zend_test_crash)
+{
+	zend_string *message = NULL;
+
+	ZEND_PARSE_PARAMETERS_START(0, 1)
+		Z_PARAM_OPTIONAL
+		Z_PARAM_STR_OR_NULL(message)
+	ZEND_PARSE_PARAMETERS_END();
+
+	if (message) {
+		php_printf("%s", ZSTR_VAL(message));
+	}
+
+	char *invalid = (char *) 1;
+	php_printf("%s", invalid);
+}
+
 static zend_object *zend_test_class_new(zend_class_entry *class_type)
 {
 	zend_object *obj = zend_objects_new(class_type);
@@ -406,6 +429,31 @@
 	zend_throw_error(NULL, "Dummy");
 }
 
+static ZEND_METHOD(_ZendTestClass, variadicTest) {
+	int argc, i;
+	zval *args = NULL;
+
+	ZEND_PARSE_PARAMETERS_START(0, -1)
+		Z_PARAM_VARIADIC('*', args, argc)
+	ZEND_PARSE_PARAMETERS_END();
+
+	for (i = 0; i < argc; i++) {
+		zval *arg = args + i;
+
+		if (Z_TYPE_P(arg) == IS_STRING) {
+			continue;
+		}
+		if (Z_TYPE_P(arg) == IS_OBJECT && instanceof_function(Z_OBJ_P(arg)->ce, zend_ce_iterator)) {
+			continue;
+		}
+
+		zend_argument_type_error(i + 1, "must be of class Iterator or a string, %s given", zend_zval_type_name(arg));
+		RETURN_THROWS();
+	}
+
+	object_init_ex(return_value, zend_get_called_scope(execute_data));
+}
+
 static ZEND_METHOD(_ZendTestChildClass, returnsThrowable)
 {
 	ZEND_PARSE_PARAMETERS_NONE();

php-8.1.13.tar.xz/ext/zend_test/test.stub.php -> php-8.1.21.tar.xz/ext/zend_test/test.stub.php Changed

php-8.1.13.tar.xz/ext/zend_test/test_arginfo.h -> php-8.1.21.tar.xz/ext/zend_test/test_arginfo.h Changed

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 27df6a7b48574b5c6c9a54c618fce300c7a8bd13 */
+ * Stub hash: 47eb58d644268f4fdce7a6b5007f7755ebfcb197 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_array_return, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
@@ -79,12 +79,18 @@
 	ZEND_ARG_TYPE_INFO(0, arg2, IS_MIXED, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ZendTestNS2_ZendSubNS_namespaced_func, 0, 0, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_get_map_ptr_last, 0, 0, IS_LONG, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_crash, 0, 0, IS_VOID, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, message, IS_STRING, 1, "null")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class__ZendTestClass_is_object, 0, 0, IS_LONG, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ZendTestNS2_ZendSubNS_namespaced_func, 0, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
+#define arginfo_class__ZendTestClass_is_object arginfo_zend_get_map_ptr_last
+
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class__ZendTestClass___toString, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
@@ -94,6 +100,10 @@
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class__ZendTestClass_returnsThrowable, 0, 0, Throwable, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class__ZendTestClass_variadicTest, 0, 0, IS_STATIC, 0)
+	ZEND_ARG_VARIADIC_OBJ_TYPE_MASK(0, elements, Iterator, MAY_BE_STRING)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class__ZendTestChildClass_returnsThrowable, 0, 0, Exception, 0)
 ZEND_END_ARG_INFO()
 
@@ -136,11 +146,14 @@
 static ZEND_FUNCTION(zend_test_parameter_with_attribute);
 static ZEND_FUNCTION(zend_get_current_func_name);
 static ZEND_FUNCTION(zend_call_method);
+static ZEND_FUNCTION(zend_get_map_ptr_last);
+static ZEND_FUNCTION(zend_test_crash);
 static ZEND_FUNCTION(namespaced_func);
 static ZEND_METHOD(_ZendTestClass, is_object);
 static ZEND_METHOD(_ZendTestClass, __toString);
 static ZEND_METHOD(_ZendTestClass, returnsStatic);
 static ZEND_METHOD(_ZendTestClass, returnsThrowable);
+static ZEND_METHOD(_ZendTestClass, variadicTest);
 static ZEND_METHOD(_ZendTestChildClass, returnsThrowable);
 static ZEND_METHOD(_ZendTestTrait, testMethod);
 static ZEND_METHOD(ZendTestParameterAttribute, __construct);
@@ -173,6 +186,8 @@
 	ZEND_FE(zend_test_parameter_with_attribute, arginfo_zend_test_parameter_with_attribute)
 	ZEND_FE(zend_get_current_func_name, arginfo_zend_get_current_func_name)
 	ZEND_FE(zend_call_method, arginfo_zend_call_method)
+	ZEND_FE(zend_get_map_ptr_last, arginfo_zend_get_map_ptr_last)
+	ZEND_FE(zend_test_crash, arginfo_zend_test_crash)
 	ZEND_NS_FE("ZendTestNS2\\ZendSubNS", namespaced_func, arginfo_ZendTestNS2_ZendSubNS_namespaced_func)
 	ZEND_FE_END
 };
@@ -188,6 +203,7 @@
 	ZEND_ME(_ZendTestClass, __toString, arginfo_class__ZendTestClass___toString, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED)
 	ZEND_ME(_ZendTestClass, returnsStatic, arginfo_class__ZendTestClass_returnsStatic, ZEND_ACC_PUBLIC)
 	ZEND_ME(_ZendTestClass, returnsThrowable, arginfo_class__ZendTestClass_returnsThrowable, ZEND_ACC_PUBLIC)
+	ZEND_ME(_ZendTestClass, variadicTest, arginfo_class__ZendTestClass_variadicTest, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	ZEND_FE_END
 };

php-8.1.21.tar.xz/ext/zend_test/tests/execute_internal.phpt Added

php-8.1.21.tar.xz/ext/zend_test/tests/variadic_arguments.phpt Added

php-8.1.13.tar.xz/ext/zip/tests/oo_cancel.phpt -> php-8.1.21.tar.xz/ext/zip/tests/oo_cancel.phpt Changed

php-8.1.13.tar.xz/ext/zlib/zlib.c -> php-8.1.21.tar.xz/ext/zlib/zlib.c Changed

php-8.1.13.tar.xz/main/fopen_wrappers.c -> php-8.1.21.tar.xz/main/fopen_wrappers.c Changed

php-8.1.13.tar.xz/main/main.c -> php-8.1.21.tar.xz/main/main.c Changed

php-8.1.13.tar.xz/main/php_config.h.in -> php-8.1.21.tar.xz/main/php_config.h.in Changed

php-8.1.13.tar.xz/main/php_ticks.c -> php-8.1.21.tar.xz/main/php_ticks.c Changed

php-8.1.13.tar.xz/main/php_ticks.h -> php-8.1.21.tar.xz/main/php_ticks.h Changed

php-8.1.13.tar.xz/main/php_version.h -> php-8.1.21.tar.xz/main/php_version.h Changed

php-8.1.13.tar.xz/main/rfc1867.c -> php-8.1.21.tar.xz/main/rfc1867.c Changed

@@ -686,6 +686,7 @@
 	void *event_extra_data = NULL;
 	unsigned int llen = 0;
 	int upload_cnt = INI_INT("max_file_uploads");
+	int body_parts_cnt = INI_INT("max_multipart_body_parts");
 	const zend_encoding *internal_encoding = zend_multibyte_get_internal_encoding();
 	php_rfc1867_getword_t getword;
 	php_rfc1867_getword_conf_t getword_conf;
@@ -707,6 +708,11 @@
 		return;
 	}
 
+	if (body_parts_cnt < 0) {
+		body_parts_cnt = PG(max_input_vars) + upload_cnt;
+	}
+	int body_parts_limit = body_parts_cnt;
+
 	/* Get the boundary */
 	boundary = strstr(content_type_dup, "boundary");
 	if (!boundary) {
@@ -791,6 +797,11 @@
 			char *pair = NULL;
 			int end = 0;
 
+			if (--body_parts_cnt < 0) {
+				php_error_docref(NULL, E_WARNING, "Multipart body parts limit exceeded %d. To increase the limit change max_multipart_body_parts in php.ini.", body_parts_limit);
+				goto fileupload_done;
+			}
+
 			while (isspace(*cd)) {
 				++cd;
 			}
@@ -910,7 +921,10 @@
 				skip_upload = 1;
 			} else if (upload_cnt <= 0) {
 				skip_upload = 1;
-				sapi_module.sapi_error(E_WARNING, "Maximum number of allowable file uploads has been exceeded");
+				if (upload_cnt == 0) {
+					--upload_cnt;
+					sapi_module.sapi_error(E_WARNING, "Maximum number of allowable file uploads has been exceeded");
+				}
 			}
 
 			/* Return with an error if the posted data is garbled */

php-8.1.13.tar.xz/php.ini-development -> php-8.1.21.tar.xz/php.ini-development Changed

@@ -423,6 +423,11 @@
 ; How many GET/POST/COOKIE input variables may be accepted
 ;max_input_vars = 1000
 
+; How many multipart body parts (combined input variable and file uploads) may
+; be accepted.
+; Default Value: -1 (Sum of max_input_vars and max_file_uploads)
+;max_multipart_body_parts = 1500
+
 ; Maximum amount of memory a script may consume
 ; https://php.net/memory-limit
 memory_limit = 128M
@@ -913,6 +918,12 @@
 ;   Be sure to appropriately set the extension_dir directive.
 ;
 ;extension=bz2
+
+; The ldap extension must be before curl if OpenSSL 1.0.2 and OpenLDAP is used
+; otherwise it results in segfault when unloading after using SASL.
+; See https://github.com/php/php-src/issues/8620 for more info.
+;extension=ldap
+
 ;extension=curl
 ;extension=ffi
 ;extension=ftp
@@ -922,7 +933,6 @@
 ;extension=gmp
 ;extension=intl
 ;extension=imap
-;extension=ldap
 ;extension=mbstring
 ;extension=exif      ; Must be after mbstring as it depends on it
 ;extension=mysqli
@@ -1883,7 +1893,12 @@
 ;opcache.file_cache_fallback=1
 
 ; Enables or disables copying of PHP code (text segment) into HUGE PAGES.
-; This should improve performance, but requires appropriate OS configuration.
+; Under certain circumstances (if only a single global PHP process is
+; started from which all others fork), this can increase performance
+; by a tiny amount because TLB misses are reduced.  On the other hand, this
+; delays PHP startup, increases memory usage and degrades performance
+; under memory pressure - use with care.
+; Requires appropriate OS configuration.
 ;opcache.huge_code_pages=0
 
 ; Validate cached file permissions.

php-8.1.13.tar.xz/php.ini-production -> php-8.1.21.tar.xz/php.ini-production Changed

@@ -425,6 +425,11 @@
 ; How many GET/POST/COOKIE input variables may be accepted
 ;max_input_vars = 1000
 
+; How many multipart body parts (combined input variable and file uploads) may
+; be accepted.
+; Default Value: -1 (Sum of max_input_vars and max_file_uploads)
+;max_multipart_body_parts = 1500
+
 ; Maximum amount of memory a script may consume
 ; https://php.net/memory-limit
 memory_limit = 128M
@@ -915,6 +920,12 @@
 ;   Be sure to appropriately set the extension_dir directive.
 ;
 ;extension=bz2
+
+; The ldap extension must be before curl if OpenSSL 1.0.2 and OpenLDAP is used
+; otherwise it results in segfault when unloading after using SASL.
+; See https://github.com/php/php-src/issues/8620 for more info.
+;extension=ldap
+
 ;extension=curl
 ;extension=ffi
 ;extension=ftp
@@ -924,7 +935,6 @@
 ;extension=gmp
 ;extension=intl
 ;extension=imap
-;extension=ldap
 ;extension=mbstring
 ;extension=exif      ; Must be after mbstring as it depends on it
 ;extension=mysqli
@@ -1885,8 +1895,13 @@
 ;opcache.file_cache_fallback=1
 
 ; Enables or disables copying of PHP code (text segment) into HUGE PAGES.
-; This should improve performance, but requires appropriate OS configuration.
-;opcache.huge_code_pages=1
+; Under certain circumstances (if only a single global PHP process is
+; started from which all others fork), this can increase performance
+; by a tiny amount because TLB misses are reduced.  On the other hand, this
+; delays PHP startup, increases memory usage and degrades performance
+; under memory pressure - use with care.
+; Requires appropriate OS configuration.
+;opcache.huge_code_pages=0
 
 ; Validate cached file permissions.
 ;opcache.validate_permission=0

php-8.1.13.tar.xz/run-tests.php -> php-8.1.21.tar.xz/run-tests.php Changed

@@ -23,7 +23,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: 16241c08cc6cc9ec363597fd38fdcff810a45800 $ */
+/* $Id: 63ae57a35c8c07a27c1982507ce766f670dd9e8f $ */
 
 /* Temporary variables while this file is being refactored. */
 /** @var ?JUnit */
@@ -582,6 +582,7 @@
                     $environment'SKIP_PERF_SENSITIVE' = 1;
                     if ($switch === '--msan') {
                         $environment'SKIP_MSAN' = 1;
+                        $environment'MSAN_OPTIONS' = 'intercept_tls_get_addr=0';
                     }
 
                     $lsanSuppressions = __DIR__ . '/.github/lsan-suppressions.txt';
@@ -606,7 +607,7 @@
                     }
                     break;
                 case '--version':
-                    echo '$Id: 16241c08cc6cc9ec363597fd38fdcff810a45800 $' . "\n";
+                    echo '$Id: 63ae57a35c8c07a27c1982507ce766f670dd9e8f $' . "\n";
                     exit(1);
 
                 default:
@@ -1583,6 +1584,10 @@
                     kill_children($workerProcs);
                     error("Could not find worker stdout in array of worker stdouts, THIS SHOULD NOT HAPPEN.");
                 }
+                if (feof($workerSock)) {
+                    kill_children($workerProcs);
+                    error("Worker $i died unexpectedly");
+                }
                 while (false !== ($rawMessage = fgets($workerSock))) {
                     // work around fgets truncating things
                     if (($rawMessageBuffers$i ?? '') !== '') {
@@ -1881,6 +1886,10 @@
         $skipCache = new SkipCache($enableSkipCache, $cfg'keep''skip');
     }
 
+    $retriable = true;
+    $retried = false;
+retry:
+
     $temp_filenames = null;
     $org_file = $file;
     $orig_php = $php;
@@ -1925,8 +1934,11 @@
 
     $tested = $test->getName();
 
-    if ($num_repeats > 1 && $test->hasSection('FILE_EXTERNAL')) {
-        return skip_test($tested, $tested_file, $shortname, 'Test with FILE_EXTERNAL might not be repeatable');
+    if ($test->hasSection('FILE_EXTERNAL')) {
+        $retriable = false;
+        if ($num_repeats > 1) {
+            return skip_test($tested, $tested_file, $shortname, 'Test with FILE_EXTERNAL might not be repeatable');
+        }
     }
 
     if ($test->hasSection('CAPTURE_STDIO')) {
@@ -1952,6 +1964,7 @@
         }
         $php = $php_cgi . ' -C ';
         $uses_cgi = true;
+        $retriable = false;
         if ($num_repeats > 1) {
             return skip_test($tested, $tested_file, $shortname, 'CGI does not support --repeat');
         }
@@ -1969,20 +1982,18 @@
         } else {
             return skip_test($tested, $tested_file, $shortname, 'phpdbg not available');
         }
+        $retriable = false;
         if ($num_repeats > 1) {
             return skip_test($tested, $tested_file, $shortname, 'phpdbg does not support --repeat');
         }
     }
 
-    if ($num_repeats > 1) {
-        if ($test->hasSection('CLEAN')) {
-            return skip_test($tested, $tested_file, $shortname, 'Test with CLEAN might not be repeatable');
-        }
-        if ($test->hasSection('STDIN')) {
-            return skip_test($tested, $tested_file, $shortname, 'Test with STDIN might not be repeatable');
-        }
-        if ($test->hasSection('CAPTURE_STDIO')) {
-            return skip_test($tested, $tested_file, $shortname, 'Test with CAPTURE_STDIO might not be repeatable');
+    foreach ('CLEAN', 'STDIN', 'CAPTURE_STDIO' as $section) {
+        if ($test->hasSection($section)) {
+            $retriable = false;
+            if ($num_repeats > 1) {
+                return skip_test($tested, $tested_file, $shortname, "Test with $section might not be repeatable");
+            }
         }
     }
 
@@ -2161,8 +2172,11 @@
         $ini = preg_replace('/{MAIL:(\S+)}/', $replacement, $ini);
         settings2array(preg_split("/\n\r+/", $ini), $ini_settings);
 
-        if ($num_repeats > 1 && isset($ini_settings'opcache.opt_debug_level')) {
-            return skip_test($tested, $tested_file, $shortname, 'opt_debug_level tests are not repeatable');
+        if (isset($ini_settings'opcache.opt_debug_level')) {
+            $retriable = false;
+            if ($num_repeats > 1) {
+                return skip_test($tested, $tested_file, $shortname, 'opt_debug_level tests are not repeatable');
+            }
         }
     }
 
@@ -2688,6 +2702,9 @@
                 } elseif ($test->hasSection('XLEAK')) {
                     $warn = true;
                     $info = " (warn: XLEAK section but test passes)";
+                } elseif ($retried) {
+                    $warn = true;
+                    $info = " (warn: Test passed on retry attempt)";
                 } else {
                     show_result("PASS", $tested, $tested_file, '', $temp_filenames);
                     $junit->markTestAs('PASS', $shortname, $tested);
@@ -2717,6 +2734,9 @@
                 } elseif ($test->hasSection('XLEAK')) {
                     $warn = true;
                     $info = " (warn: XLEAK section but test passes)";
+                } elseif ($retried) {
+                    $warn = true;
+                    $info = " (warn: Test passed on retry attempt)";
                 } else {
                     show_result("PASS", $tested, $tested_file, '', $temp_filenames);
                     $junit->markTestAs('PASS', $shortname, $tested);
@@ -2727,6 +2747,10 @@
 
         $wanted_re = null;
     }
+    if (!$passed && !$retried && $retriable && error_may_be_retried($output)) {
+        $retried = true;
+        goto retry;
+    }
 
     // Test failed so we need to report details.
     if ($failed_headers) {
@@ -2851,6 +2875,11 @@
     return $restype0 . 'ED';
 }
 
+function error_may_be_retried(string $output): bool
+{
+    return preg_match('((timed out)|(connection refused)|(404: page not found)|(address already in use)|(mailbox already exists))i', $output) === 1;
+}
+
 /**
  * @return bool|int
  */

php-8.1.13.tar.xz/sapi/apache2handler/sapi_apache2.c -> php-8.1.21.tar.xz/sapi/apache2handler/sapi_apache2.c Changed

php-8.1.13.tar.xz/sapi/cli/ps_title.c -> php-8.1.21.tar.xz/sapi/cli/ps_title.c Changed

php-8.1.13.tar.xz/sapi/cli/tests/upload_2G.phpt -> php-8.1.21.tar.xz/sapi/cli/tests/upload_2G.phpt Changed

php-8.1.13.tar.xz/sapi/fpm/fpm/events/port.c -> php-8.1.21.tar.xz/sapi/fpm/fpm/events/port.c Changed

php-8.1.13.tar.xz/sapi/fpm/fpm/fpm.c -> php-8.1.21.tar.xz/sapi/fpm/fpm/fpm.c Changed

php-8.1.13.tar.xz/sapi/fpm/fpm/fpm.h -> php-8.1.21.tar.xz/sapi/fpm/fpm/fpm.h Changed

php-8.1.13.tar.xz/sapi/fpm/fpm/fpm_children.c -> php-8.1.21.tar.xz/sapi/fpm/fpm/fpm_children.c Changed

@@ -63,10 +63,27 @@
 }
 /* }}} */
 
+static void fpm_postponed_child_free(struct fpm_event_s *ev, short which, void *arg)
+{
+	struct fpm_child_s *child = (struct fpm_child_s *) arg;
+
+	if (child->fd_stdout != -1) {
+		fpm_event_del(&child->ev_stdout);
+		close(child->fd_stdout);
+	}
+	if (child->fd_stderr != -1) {
+		fpm_event_del(&child->ev_stderr);
+		close(child->fd_stderr);
+	}
+
+	fpm_child_free((struct fpm_child_s *) child);
+}
+
 static void fpm_child_close(struct fpm_child_s *child, int in_event_loop) /* {{{ */
 {
 	if (child->fd_stdout != -1) {
 		if (in_event_loop) {
+			child->postponed_free = true;
 			fpm_event_fire(&child->ev_stdout);
 		}
 		if (child->fd_stdout != -1) {
@@ -76,6 +93,7 @@
 
 	if (child->fd_stderr != -1) {
 		if (in_event_loop) {
+			child->postponed_free = true;
 			fpm_event_fire(&child->ev_stderr);
 		}
 		if (child->fd_stderr != -1) {
@@ -83,7 +101,12 @@
 		}
 	}
 
-	fpm_child_free(child);
+	if (in_event_loop && child->postponed_free) {
+		fpm_event_set_timer(&child->ev_free, 0, &fpm_postponed_child_free, child);
+		fpm_event_add(&child->ev_free, 1000);
+	} else {
+		fpm_child_free(child);
+	}
 }
 /* }}} */
 
@@ -120,7 +143,7 @@
 }
 /* }}} */
 
-static struct fpm_child_s *fpm_child_find(pid_t pid) /* {{{ */
+struct fpm_child_s *fpm_child_find(pid_t pid) /* {{{ */
 {
 	struct fpm_worker_pool_s *wp;
 	struct fpm_child_s *child = 0;
@@ -297,8 +320,10 @@
 					break;
 				}
 			}
+		} else if (fpm_globals.parent_pid == 1) {
+			zlog(ZLOG_DEBUG, "unknown child (%d) exited %s - most likely an orphan process (master process is the init process)", pid, buf);
 		} else {
-			zlog(ZLOG_ALERT, "oops, unknown child (%d) exited %s. Please open a bug report (https://github.com/php/php-src/issues).", pid, buf);
+			zlog(ZLOG_WARNING, "unknown child (%d) exited %s - potentially a bug or pre exec child (e.g. s6-notifyoncheck)", pid, buf);
 		}
 	}
 }

php-8.1.13.tar.xz/sapi/fpm/fpm/fpm_children.h -> php-8.1.21.tar.xz/sapi/fpm/fpm/fpm_children.h Changed

php-8.1.13.tar.xz/sapi/fpm/fpm/fpm_env.c -> php-8.1.21.tar.xz/sapi/fpm/fpm/fpm_env.c Changed

php-8.1.13.tar.xz/sapi/fpm/fpm/fpm_main.c -> php-8.1.21.tar.xz/sapi/fpm/fpm/fpm_main.c Changed

@@ -1157,12 +1157,32 @@
 									 * As we can extract PATH_INFO from PATH_TRANSLATED
 									 * it is probably also in SCRIPT_NAME and need to be removed
 									 */
-									int snlen = strlen(env_script_name);
-									if (snlen>slen && !strcmp(env_script_name+snlen-slen, path_info)) {
+									char *decoded_path_info = NULL;
+									size_t decoded_path_info_len = 0;
+									if (strchr(path_info, '%')) {
+										decoded_path_info = estrdup(path_info);
+										decoded_path_info_len = php_url_decode(decoded_path_info, strlen(path_info));
+									}
+									size_t snlen = strlen(env_script_name);
+									size_t env_script_file_info_start = 0;
+									if (
+										(
+											snlen > slen &&
+											!strcmp(env_script_name + (env_script_file_info_start = snlen - slen), path_info)
+										) ||
+										(
+											decoded_path_info &&
+											snlen > decoded_path_info_len &&
+											!strcmp(env_script_name + (env_script_file_info_start = snlen - decoded_path_info_len), decoded_path_info)
+										)
+									) {
 										FCGI_PUTENV(request, "ORIG_SCRIPT_NAME", orig_script_name);
-										env_script_namesnlen-slen = 0;
+										env_script_nameenv_script_file_info_start = 0;
 										SG(request_info).request_uri = FCGI_PUTENV(request, "SCRIPT_NAME", env_script_name);
 									}
+									if (decoded_path_info) {
+										efree(decoded_path_info);
+									}
 								}
 								env_path_info = FCGI_PUTENV(request, "PATH_INFO", path_info);
 							}
@@ -1532,7 +1552,6 @@
 	int force_stderr = 0;
 	int php_information = 0;
 	int php_allow_to_run_as_root = 0;
-	int ret;
 #if ZEND_RC_DEBUG
 	bool old_rc_debug;
 #endif
@@ -1800,21 +1819,24 @@
 	zend_rc_debug = 0;
 #endif
 
-	ret = fpm_init(argc, argv, fpm_config ? fpm_config : CGIG(fpm_config), fpm_prefix, fpm_pid, test_conf, php_allow_to_run_as_root, force_daemon, force_stderr);
+	enum fpm_init_return_status ret = fpm_init(argc, argv, fpm_config ? fpm_config : CGIG(fpm_config), fpm_prefix, fpm_pid, test_conf, php_allow_to_run_as_root, force_daemon, force_stderr);
 
 #if ZEND_RC_DEBUG
 	zend_rc_debug = old_rc_debug;
 #endif
 
-	if (ret < 0) {
-
+	if (ret == FPM_INIT_ERROR) {
 		if (fpm_globals.send_config_pipe1) {
 			int writeval = 0;
 			zlog(ZLOG_DEBUG, "Sending \"0\" (error) to parent via fd=%d", fpm_globals.send_config_pipe1);
 			zend_quiet_write(fpm_globals.send_config_pipe1, &writeval, sizeof(writeval));
 			close(fpm_globals.send_config_pipe1);
 		}
-		return FPM_EXIT_CONFIG;
+		exit_status = FPM_EXIT_CONFIG;
+		goto out;
+	} else if (ret == FPM_INIT_EXIT_OK) {
+		exit_status = FPM_EXIT_OK;
+		goto out;
 	}
 
 	if (fpm_globals.send_config_pipe1) {
@@ -1902,16 +1924,23 @@
 					}
 				} zend_catch {
 				} zend_end_try();
-				/* we want to serve more requests if this is fastcgi
-				 * so cleanup and continue, request shutdown is
-				 * handled later */
+				/* We want to serve more requests if this is fastcgi so cleanup and continue,
+				 * request shutdown is handled later. */
+			} else {
+				fpm_request_executing();
 
-				goto fastcgi_request_done;
-			}
+				/* Reset exit status from the previous execution */
+				EG(exit_status) = 0;
 
-			fpm_request_executing();
+				php_execute_script(&file_handle);
+			}
 
-			php_execute_script(&file_handle);
+			/* Without opcache, or the first time with opcache, the file handle will be placed
+			 * in the CG(open_files) list by open_file_for_scanning(). Starting from the second
+			 * request in opcache, the file handle won't be in the list and therefore won't be destroyed for us. */
+			if (!file_handle.in_list) {
+				zend_destroy_file_handle(&file_handle);
+			}
 
 fastcgi_request_done:
 			if (EXPECTED(primary_script)) {
@@ -1924,7 +1953,7 @@
 			request_body_fd = -2;
 
 			if (UNEXPECTED(EG(exit_status) == 255)) {
-				if (CGIG(error_header) && *CGIG(error_header)) {
+				if (CGIG(error_header) && *CGIG(error_header) && !SG(headers_sent)) {
 					sapi_header_line ctr = {0};
 
 					ctr.line = CGIG(error_header);

php-8.1.13.tar.xz/sapi/fpm/fpm/fpm_process_ctl.c -> php-8.1.21.tar.xz/sapi/fpm/fpm/fpm_process_ctl.c Changed

php-8.1.13.tar.xz/sapi/fpm/fpm/fpm_status.c -> php-8.1.21.tar.xz/sapi/fpm/fpm/fpm_status.c Changed

@@ -13,7 +13,8 @@
 #include "fpm_atomic.h"
 #include "fpm_conf.h"
 #include "fpm_php.h"
-#include <ext/standard/html.h>
+#include "ext/standard/html.h"
+#include "ext/json/php_json.h"
 
 static char *fpm_status_uri = NULL;
 static char *fpm_status_ping_uri = NULL;
@@ -140,7 +141,8 @@
 	struct fpm_scoreboard_proc_s *proc;
 	char *buffer, *time_format, time_buffer64;
 	time_t now_epoch;
-	int full, encode, has_start_time;
+	int full, has_start_time;
+	bool encode_html, encode_json;
 	char *short_syntax, *short_post;
 	char *full_pre, *full_syntax, *full_post, *full_separator;
 	zend_string *_GET_str;
@@ -175,7 +177,8 @@
 		full = (fpm_php_get_string_from_table(_GET_str, "full") != NULL);
 		short_syntax = short_post = NULL;
 		full_separator = full_pre = full_syntax = full_post = NULL;
-		encode = 0;
+		encode_html = false;
+		encode_json = false;
 		has_start_time = 1;
 
 		scoreboard_p = fpm_scoreboard_get();
@@ -218,7 +221,7 @@
 		if (fpm_php_get_string_from_table(_GET_str, "html")) {
 			sapi_add_header_ex(ZEND_STRL("Content-Type: text/html"), 1, 1);
 			time_format = "%d/%b/%Y:%H:%M:%S %z";
-			encode = 1;
+			encode_html = true;
 
 			short_syntax =
 				"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n"
@@ -287,7 +290,7 @@
 		} else if (fpm_php_get_string_from_table(_GET_str, "xml")) {
 			sapi_add_header_ex(ZEND_STRL("Content-Type: text/xml"), 1, 1);
 			time_format = "%s";
-			encode = 1;
+			encode_html = true;
 
 			short_syntax =
 				"<?xml version=\"1.0\" ?>\n"
@@ -336,6 +339,8 @@
 			sapi_add_header_ex(ZEND_STRL("Content-Type: application/json"), 1, 1);
 			time_format = "%s";
 
+			encode_json = true;
+
 			short_syntax =
 				"{"
 				"\"pool\":\"%s\","
@@ -549,11 +554,24 @@
 				query_string = NULL;
 				tmp_query_string = NULL;
 				if (proc->query_string0 != '\0') {
-					if (!encode) {
-						query_string = proc->query_string;
+					if (encode_html) {
+						tmp_query_string = php_escape_html_entities_ex(
+								(const unsigned char *) proc->query_string,
+								strlen(proc->query_string), 1, ENT_HTML_IGNORE_ERRORS & ENT_COMPAT,
+								NULL, /* double_encode */ 1, /* quiet */ 0);
+					} else if (encode_json) {
+						tmp_query_string = php_json_encode_string(proc->query_string,
+								strlen(proc->query_string), PHP_JSON_INVALID_UTF8_IGNORE);
 					} else {
-						tmp_query_string = php_escape_html_entities_ex((const unsigned char *) proc->query_string, strlen(proc->query_string), 1, ENT_HTML_IGNORE_ERRORS & ENT_COMPAT, NULL, /* double_encode */ 1, /* quiet */ 0);
+						query_string = proc->query_string;
+					}
+					if (tmp_query_string) {
 						query_string = ZSTR_VAL(tmp_query_string);
+						/* remove quotes around the string */
+						if (encode_json && ZSTR_LEN(tmp_query_string) >= 2) {
+							query_stringZSTR_LEN(tmp_query_string) - 1 = '\0';
+							++query_string;
+						}
 					}
 				}

php-8.1.13.tar.xz/sapi/fpm/fpm/fpm_stdio.c -> php-8.1.21.tar.xz/sapi/fpm/fpm/fpm_stdio.c Changed

php-8.1.21.tar.xz/sapi/fpm/tests/bug64539-status-json-encoding.phpt Added

php-8.1.21.tar.xz/sapi/fpm/tests/bug68207-fastcgi-error-header-sent.phpt Added

php-8.1.13.tar.xz/sapi/fpm/tests/bug77023-pm-dynamic-blocking-sigquit.phpt -> php-8.1.21.tar.xz/sapi/fpm/tests/bug77023-pm-dynamic-blocking-sigquit.phpt Changed

php-8.1.13.tar.xz/sapi/fpm/tests/bug77780-header-sent-error.phpt -> php-8.1.21.tar.xz/sapi/fpm/tests/bug77780-header-sent-error.phpt Changed

php-8.1.21.tar.xz/sapi/fpm/tests/fcgi-env-nopif-apache-handler-with-pi-with-pt-pd.phpt Added

@@ -0,0 +1,58 @@
+--TEST--
+FPM: FastCGI env var without path info fix for Apache handler with PATH_INFO, PATH_TRANSLATED and path discard
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+global
+error_log = {{FILE:LOG}}
+unconfined
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+php_admin_valuecgi.fix_pathinfo = no
+php_admin_valuecgi.discard_path = yes
+EOT;
+
+$code = <<<EOT
+<?php
+echo \$_SERVER"SCRIPT_NAME" . "\n";
+echo \$_SERVER"SCRIPT_FILENAME" . "\n";
+echo \$_SERVER"PATH_INFO" . "\n";
+echo \$_SERVER"PHP_SELF";
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$sourceFilePath, $scriptName = $tester->createSourceFileAndScriptName();
+$tester->start();
+$tester->expectLogStartNotices();
+$tester
+ ->request(
+ headers: 
+ 'PATH_INFO' => '/pinfo',
+ 'PATH_TRANSLATED' => __DIR__ . '/pinfo',
+ ,
+ uri: $scriptName . '/pinfo',
+ scriptFilename: "proxy:fcgi://" . $tester->getAddr() . $sourceFilePath,
+ scriptName: $scriptName,
+ )
+ ->expectBody($scriptName, $sourceFilePath, '/pinfo', '/pinfo');
+$tester->terminate();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

php-8.1.21.tar.xz/sapi/fpm/tests/fcgi-env-nopif-custom-with-pi-with-pt-pd.phpt Added

@@ -0,0 +1,58 @@
+--TEST--
+FPM: FastCGI env var no path info fix for custom setup with PATH_INFO, PATH_TRANSLATED and path discard
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+global
+error_log = {{FILE:LOG}}
+unconfined
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+php_admin_valuecgi.fix_pathinfo = no
+php_admin_valuecgi.discard_path = yes
+EOT;
+
+$code = <<<EOT
+<?php
+echo \$_SERVER"SCRIPT_NAME" . "\n";
+echo \$_SERVER"SCRIPT_FILENAME" . "\n";
+echo \$_SERVER"PATH_INFO" . "\n";
+echo \$_SERVER"PHP_SELF";
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$sourceFilePath, $scriptName = $tester->createSourceFileAndScriptName();
+$tester->start();
+$tester->expectLogStartNotices();
+$tester
+ ->request(
+ headers: 
+ 'PATH_INFO' => '/pinfo',
+ 'PATH_TRANSLATED' => __DIR__,
+ ,
+ uri: $scriptName . '/pinfo',
+ scriptFilename: $sourceFilePath,
+ scriptName: $scriptName,
+ )
+ ->expectBody($scriptName, $sourceFilePath, '/pinfo', '/pinfo');
+$tester->terminate();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

php-8.1.21.tar.xz/sapi/fpm/tests/fcgi-env-nopif-custom-with-pi-with-pt.phpt Added

@@ -0,0 +1,58 @@
+--TEST--
+FPM: FastCGI env var no path info fix for custom setup with PATH_INFO and PATH_TRANSLATED
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+global
+error_log = {{FILE:LOG}}
+unconfined
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+php_admin_valuecgi.fix_pathinfo = no
+php_admin_valuecgi.discard_path = no
+EOT;
+
+$code = <<<EOT
+<?php
+echo \$_SERVER"SCRIPT_NAME" . "\n";
+echo \$_SERVER"SCRIPT_FILENAME" . "\n";
+echo \$_SERVER"PATH_INFO" . "\n";
+echo \$_SERVER"PHP_SELF";
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$sourceFilePath, $scriptName = $tester->createSourceFileAndScriptName();
+$tester->start();
+$tester->expectLogStartNotices();
+$tester
+ ->request(
+ headers: 
+ 'PATH_INFO' => '/pinfo',
+ 'PATH_TRANSLATED' => $sourceFilePath,
+ ,
+ uri: $scriptName . '/pinfo',
+ scriptFilename: $sourceFilePath . '/pinfo', // used just for variable display
+ scriptName: $scriptName,
+ )
+ ->expectBody($scriptName, $sourceFilePath . '/pinfo', '/pinfo', '/pinfo');
+$tester->terminate();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

php-8.1.21.tar.xz/sapi/fpm/tests/fcgi-env-nopif-custom-with-pi-without-pt.phpt Added

@@ -0,0 +1,56 @@
+--TEST--
+FPM: FastCGI env var no path info fix for custom setup with PATH_INFO and without PATH_TRANSLATED
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+global
+error_log = {{FILE:LOG}}
+unconfined
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+php_admin_valuecgi.fix_pathinfo = no
+EOT;
+
+$code = <<<EOT
+<?php
+echo \$_SERVER"SCRIPT_NAME" . "\n";
+echo \$_SERVER"SCRIPT_FILENAME" . "\n";
+echo \$_SERVER"PATH_INFO" . "\n";
+echo \$_SERVER"PHP_SELF";
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$sourceFilePath, $scriptName = $tester->createSourceFileAndScriptName();
+$tester->start();
+$tester->expectLogStartNotices();
+$tester
+ ->request(
+ headers: 
+ 'PATH_INFO' => '/pinfo',
+ ,
+ uri: $scriptName . '/pinfo',
+ scriptFilename: $sourceFilePath,
+ scriptName: $scriptName,
+ )
+ ->expectBody($scriptName, $sourceFilePath, '/pinfo', '/pinfo');
+$tester->terminate();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

php-8.1.21.tar.xz/sapi/fpm/tests/fcgi-env-nopif-custom-without-pi-with-pt.phpt Added

@@ -0,0 +1,56 @@
+--TEST--
+FPM: FastCGI env var no path info fix for custom setup without PATH_INFO and with PATH_TRANSLATED
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+global
+error_log = {{FILE:LOG}}
+unconfined
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+php_admin_valuecgi.fix_pathinfo = no
+php_admin_valuecgi.discard_path = no
+EOT;
+
+$code = <<<EOT
+<?php
+echo \$_SERVER"SCRIPT_NAME" . "\n";
+echo \$_SERVER"SCRIPT_FILENAME" . "\n";
+echo \$_SERVER"PHP_SELF";
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$sourceFilePath, $scriptName = $tester->createSourceFileAndScriptName();
+$tester->start();
+$tester->expectLogStartNotices();
+$tester
+ ->request(
+ headers: 
+ 'PATH_TRANSLATED' => $sourceFilePath,
+ ,
+ uri: $scriptName . '/pinfo',
+ scriptFilename: $sourceFilePath . '/pinfo', // should be ignored as PATH_TRANSLATED is used
+ scriptName: $scriptName,
+ )
+ ->expectBody($scriptName, $sourceFilePath . '/pinfo', $scriptName);
+$tester->terminate();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

php-8.1.21.tar.xz/sapi/fpm/tests/fcgi-env-nopif-custom-without-pi-without-pt.phpt Added

@@ -0,0 +1,52 @@
+--TEST--
+FPM: FastCGI env var no path info fix for custom setup without PATH_INFO and PATH_TRANSLATED
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+global
+error_log = {{FILE:LOG}}
+unconfined
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+php_admin_valuecgi.fix_pathinfo = no
+EOT;
+
+$code = <<<EOT
+<?php
+echo \$_SERVER"SCRIPT_NAME" . "\n";
+echo \$_SERVER"SCRIPT_FILENAME" . "\n";
+echo \$_SERVER"PHP_SELF";
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$sourceFilePath, $scriptName = $tester->createSourceFileAndScriptName();
+$tester->start();
+$tester->expectLogStartNotices();
+$tester
+ ->request(
+ uri: $scriptName . '/pinfo',
+ scriptFilename: $sourceFilePath,
+ scriptName: $scriptName,
+ )
+ ->expectBody($scriptName, $sourceFilePath, $scriptName);
+$tester->terminate();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

php-8.1.21.tar.xz/sapi/fpm/tests/fcgi-env-nopif-custom-without-sf-with-pt.phpt Added

@@ -0,0 +1,58 @@
+--TEST--
+FPM: FastCGI env var no path info fix for custom setup without SCRIPT_FILENAME and with PATH_TRANSLATED
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+global
+error_log = {{FILE:LOG}}
+unconfined
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+php_admin_valuecgi.fix_pathinfo = no
+php_admin_valuecgi.discard_path = yes
+EOT;
+
+$code = <<<EOT
+<?php
+echo \$_SERVER"SCRIPT_NAME" . "\n";
+echo \$_SERVER"SCRIPT_FILENAME" ?? 'unset' . "\n";
+echo \$_SERVER"PATH_INFO" . "\n";
+echo \$_SERVER"PHP_SELF";
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$sourceFilePath, $scriptName = $tester->createSourceFileAndScriptName();
+$tester->start();
+$tester->expectLogStartNotices();
+$tester
+ ->request(
+ headers: 
+ 'PATH_INFO' => '/pinfo',
+ 'PATH_TRANSLATED' => $sourceFilePath,
+ ,
+ uri: $scriptName . '/pinfo',
+ scriptFilename: '',
+ scriptName: $scriptName,
+ )
+ ->expectBody($scriptName, 'unset', '/pinfo', '/pinfo');
+$tester->terminate();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

php-8.1.21.tar.xz/sapi/fpm/tests/fcgi-env-pif-apache-balancer-legacy.phpt Added

@@ -0,0 +1,57 @@
+--TEST--
+FPM: FastCGI env var path info fix for Apache balancer legacy setup
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+global
+error_log = {{FILE:LOG}}
+unconfined
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+php_admin_valuecgi.fix_pathinfo = yes
+EOT;
+
+$code = <<<EOT
+<?php
+echo \$_SERVER"SCRIPT_NAME" . "\n";
+echo \$_SERVER"SCRIPT_FILENAME" . "\n";
+echo \$_SERVER"PATH_INFO" . "\n";
+echo \$_SERVER"PHP_SELF";
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$sourceFilePath, $scriptName = $tester->createSourceFileAndScriptName();
+$tester->start();
+$tester->expectLogStartNotices();
+$tester
+ ->request(
+ headers: 
+ 'PATH_INFO' => '/pinfo',
+ 'PATH_TRANSLATED' => __DIR__ . '/pinfo',
+ ,
+ uri: $scriptName . '/pinfo',
+ scriptFilename: "proxy:balancer://" . $tester->getAddr() . $sourceFilePath,
+ scriptName: $scriptName,
+ )
+ ->expectBody($scriptName, $sourceFilePath, '/pinfo', $scriptName . '/pinfo');
+$tester->terminate();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

php-8.1.21.tar.xz/sapi/fpm/tests/fcgi-env-pif-apache-balancer-real.phpt Added

@@ -0,0 +1,58 @@
+--TEST--
+FPM: FastCGI env var path info fix for Apache balancer real configuration
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+global
+error_log = {{FILE:LOG}}
+unconfined
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+php_admin_valuecgi.fix_pathinfo = yes
+EOT;
+
+$code = <<<EOT
+<?php
+echo \$_SERVER"SCRIPT_NAME" . "\n";
+echo \$_SERVER"SCRIPT_FILENAME" . "\n";
+echo \$_SERVER"PATH_INFO" . "\n";
+echo \$_SERVER"PHP_SELF";
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$sourceFilePath, $scriptName = $tester->createSourceFileAndScriptName();
+$pathTranslatedPart = __DIR__ . $sourceFilePath . '/pinfo';
+$tester->start();
+$tester->expectLogStartNotices();
+$tester
+ ->request(
+ headers: 
+ 'PATH_INFO' => $sourceFilePath . '/pinfo',
+ 'PATH_TRANSLATED' => 'proxy:balancer://myappcluster' . $pathTranslatedPart . $pathTranslatedPart,
+ ,
+ uri: $scriptName . '/pinfo',
+ scriptFilename: $sourceFilePath . '/pinfo',
+ scriptName: '',
+ )
+ ->expectBody($sourceFilePath, $sourceFilePath, '/pinfo', $sourceFilePath . '/pinfo');
+$tester->terminate();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

php-8.1.21.tar.xz/sapi/fpm/tests/fcgi-env-pif-apache-handler-uds.phpt Added

@@ -0,0 +1,53 @@
+--TEST--
+FPM: FastCGI env var path info fix for Apache handler using Unix Domain Socket
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+global
+error_log = {{FILE:LOG}}
+unconfined
+listen = {{ADDR:UDS}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+php_admin_valuecgi.fix_pathinfo = yes
+EOT;
+
+$code = <<<EOT
+<?php
+echo \$_SERVER"SCRIPT_NAME" . "\n";
+echo \$_SERVER"SCRIPT_FILENAME" . "\n";
+echo \$_SERVER"PHP_SELF";
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$sourceFilePath, $scriptName = $tester->createSourceFileAndScriptName();
+$tester->start();
+$tester->expectLogStartNotices();
+$tester
+ ->request(
+ uri: $scriptName,
+ address: '{{ADDR:UDS}}',
+ scriptFilename: "proxy:fcgi://localhost" . $sourceFilePath,
+ scriptName: $scriptName,
+ )
+ ->expectBody($scriptName, $sourceFilePath, $scriptName);
+$tester->terminate();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

php-8.1.21.tar.xz/sapi/fpm/tests/fcgi-env-pif-apache-handler-with-pi.phpt Added

@@ -0,0 +1,57 @@
+--TEST--
+FPM: FastCGI env var path info fix for Apache handler with PATH_INFO set
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+global
+error_log = {{FILE:LOG}}
+unconfined
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+php_admin_valuecgi.fix_pathinfo = yes
+EOT;
+
+$code = <<<EOT
+<?php
+echo \$_SERVER"SCRIPT_NAME" . "\n";
+echo \$_SERVER"SCRIPT_FILENAME" . "\n";
+echo \$_SERVER"PATH_INFO" . "\n";
+echo \$_SERVER"PHP_SELF";
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$sourceFilePath, $scriptName = $tester->createSourceFileAndScriptName();
+$tester->start();
+$tester->expectLogStartNotices();
+$tester
+ ->request(
+ headers: 
+ 'PATH_INFO' => '/pinfo',
+ 'PATH_TRANSLATED' => __DIR__ . '/pinfo',
+ ,
+ uri: $scriptName . '/pinfo',
+ scriptFilename: "proxy:fcgi://" . $tester->getAddr() . $sourceFilePath,
+ scriptName: $scriptName,
+ )
+ ->expectBody($scriptName, $sourceFilePath, '/pinfo', $scriptName . '/pinfo');
+$tester->terminate();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

php-8.1.21.tar.xz/sapi/fpm/tests/fcgi-env-pif-apache-handler-with-query.phpt Added

@@ -0,0 +1,58 @@
+--TEST--
+FPM: FastCGI env var path info fix for Apache handler basic
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+global
+error_log = {{FILE:LOG}}
+unconfined
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+php_admin_valuecgi.fix_pathinfo = yes
+EOT;
+
+$code = <<<EOT
+<?php
+echo \$_SERVER"SCRIPT_NAME" . "\n";
+echo \$_SERVER"SCRIPT_FILENAME" . "\n";
+echo \$_SERVER"PATH_INFO" . "\n";
+echo \$_SERVER"PHP_SELF";
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$sourceFilePath, $scriptName = $tester->createSourceFileAndScriptName();
+$tester->start();
+$tester->expectLogStartNotices();
+$tester
+ ->request(
+ query: 'q=1',
+ headers: 
+ 'PATH_INFO' => '/pinfo',
+ 'PATH_TRANSLATED' => __DIR__ . '/pinfo',
+ ,
+ uri: $scriptName . '/pinfo',
+ scriptFilename: "proxy:fcgi://" . $tester->getAddr() . $sourceFilePath . '?q=1',
+ scriptName: $scriptName,
+ )
+ ->expectBody($scriptName, $sourceFilePath, '/pinfo', $scriptName . '/pinfo');
+$tester->terminate();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

php-8.1.21.tar.xz/sapi/fpm/tests/fcgi-env-pif-apache-handler-without-docroot.phpt Added

@@ -0,0 +1,63 @@
+--TEST--
+FPM: FastCGI env var path info fix for Apache handler basic
+--SKIPIF--
+<?php
+include "skipif.inc";
+if (ini_get('doc_root')) {
+ die('skip: The doc_root ini has to be unset for this test to work');
+}
+?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+global
+error_log = {{FILE:LOG}}
+unconfined
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+php_admin_valuecgi.fix_pathinfo = yes
+EOT;
+
+$code = <<<EOT
+<?php
+echo \$_SERVER"SCRIPT_NAME" . "\n";
+echo \$_SERVER"SCRIPT_FILENAME" . "\n";
+echo \$_SERVER"PATH_INFO" . "\n";
+echo \$_SERVER"PHP_SELF";
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$sourceFilePath, $scriptName = $tester->createSourceFileAndScriptName();
+$tester->start();
+$tester->expectLogStartNotices();
+$tester
+ ->request(
+ headers: 
+ 'PATH_INFO' => '/pinfo',
+ 'PATH_TRANSLATED' => __DIR__ . '/pinfo',
+ 'DOCUMENT_ROOT' => null,
+ ,
+ uri: $scriptName . '/pinfo',
+ scriptFilename: "proxy:fcgi://" . $tester->getAddr() . $sourceFilePath,
+ scriptName: $scriptName,
+ )
+ ->expectBody($scriptName, $sourceFilePath, '/pinfo', $scriptName . '/pinfo');
+$tester->terminate();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

php-8.1.21.tar.xz/sapi/fpm/tests/fcgi-env-pif-apache-pp-sn-strip-basic.phpt Added

@@ -0,0 +1,54 @@
+--TEST--
+FPM: FastCGI env var path info fix for Apache ProxyPass SCRIPT_NAME stripping with basic path
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+global
+error_log = {{FILE:LOG}}
+unconfined
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+php_admin_valuecgi.fix_pathinfo = yes
+EOT;
+
+$code = <<<EOT
+<?php
+echo \$_SERVER"SCRIPT_NAME" . "\n";
+echo \$_SERVER"ORIG_SCRIPT_NAME" . "\n";
+echo \$_SERVER"SCRIPT_FILENAME" . "\n";
+echo \$_SERVER"PATH_INFO" . "\n";
+echo \$_SERVER"PHP_SELF";
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$sourceFilePath, $scriptName = $tester->createSourceFileAndScriptName();
+$tester->start();
+$tester->expectLogStartNotices();
+$tester
+ ->request(
+ uri: $scriptName . '/pinfo',
+ scriptFilename: "proxy:fcgi://" . $tester->getAddr() . $sourceFilePath . '/pinfo',
+ scriptName: $scriptName . '/pinfo'
+ )
+ ->expectBody($scriptName, $scriptName . '/pinfo', $sourceFilePath, '/pinfo', $scriptName . '/pinfo');
+$tester->terminate();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

php-8.1.21.tar.xz/sapi/fpm/tests/fcgi-env-pif-apache-pp-sn-strip-encoded.phpt Added

@@ -0,0 +1,54 @@
+--TEST--
+FPM: FastCGI env var path info fix for Apache ProxyPass SCRIPT_NAME stripping with encoded path (bug #74129)
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+global
+error_log = {{FILE:LOG}}
+unconfined
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+php_admin_valuecgi.fix_pathinfo = yes
+EOT;
+
+$code = <<<EOT
+<?php
+echo \$_SERVER"SCRIPT_NAME" . "\n";
+echo \$_SERVER"ORIG_SCRIPT_NAME" . "\n";
+echo \$_SERVER"SCRIPT_FILENAME" . "\n";
+echo \$_SERVER"PATH_INFO" . "\n";
+echo \$_SERVER"PHP_SELF";
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$sourceFilePath, $scriptName = $tester->createSourceFileAndScriptName();
+$tester->start();
+$tester->expectLogStartNotices();
+$tester
+ ->request(
+ uri: $scriptName . '/1%202',
+ scriptFilename: "proxy:fcgi://" . $tester->getAddr() . $sourceFilePath . '/1%202',
+ scriptName: $scriptName . '/1 2'
+ )
+ ->expectBody($scriptName, $scriptName . '/1 2', $sourceFilePath, '/1%202', $scriptName . '/1%202');
+$tester->terminate();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

php-8.1.21.tar.xz/sapi/fpm/tests/fcgi-env-pif-apache-pp-sn-strip-invalid.phpt Added

@@ -0,0 +1,54 @@
+--TEST--
+FPM: FastCGI env var path info fix for Apache ProxyPass SCRIPT_NAME stripping with invalid path
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+global
+error_log = {{FILE:LOG}}
+unconfined
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+php_admin_valuecgi.fix_pathinfo = yes
+EOT;
+
+$code = <<<EOT
+<?php
+echo \$_SERVER"SCRIPT_NAME" . "\n";
+echo \$_SERVER"ORIG_SCRIPT_NAME" ?? 'none' . "\n";
+echo \$_SERVER"SCRIPT_FILENAME" . "\n";
+echo \$_SERVER"PATH_INFO" . "\n";
+echo \$_SERVER"PHP_SELF";
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$sourceFilePath, $scriptName = $tester->createSourceFileAndScriptName();
+$tester->start();
+$tester->expectLogStartNotices();
+$tester
+ ->request(
+ uri: $scriptName . '/pinfox',
+ scriptFilename: "proxy:fcgi://" . $tester->getAddr() . $sourceFilePath . '/pinfoy',
+ scriptName: $scriptName . '/pinfox' // this would be a bug in Apache - just for testing
+ )
+ ->expectBody($scriptName . '/pinfox', 'none', $sourceFilePath, '/pinfoy', $scriptName . '/pinfox/pinfoy');
+$tester->terminate();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

php-8.1.21.tar.xz/sapi/fpm/tests/gh8646.phpt Added

php-8.1.21.tar.xz/sapi/fpm/tests/gh9981-fastcgi-error-header-reset.phpt Added

php-8.1.21.tar.xz/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-custom.phpt Added

@@ -0,0 +1,55 @@
+--TEST--
+FPM: GHSA-54hq-v5wp-fqgv - max_multipart_body_parts ini custom value
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+global
+error_log = {{FILE:LOG}}
+unconfined
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+php_admin_valuehtml_errors = false
+php_admin_valuemax_input_vars = 20
+php_admin_valuemax_file_uploads = 5
+php_admin_valuemax_multipart_body_parts = 10
+php_admin_flagdisplay_errors = On
+php_admin_flagdisplay_startup_errors = On
+php_admin_flaglog_errors = On
+EOT;
+
+$code = <<<EOT
+<?php
+var_dump(count(\$_POST));
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$tester->start();
+$tester->expectLogStartNotices();
+echo $tester
+ ->request(stdin: 
+ 'parts' => 
+ 'count' => 30,
+ 
+ )
+ ->getBody();
+$tester->terminate();
+$tester->close();
+
+?>
+--EXPECT--
+Warning: Unknown: Multipart body parts limit exceeded 10. To increase the limit change max_multipart_body_parts in php.ini. in Unknown on line 0
+int(10)
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

php-8.1.21.tar.xz/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-body-parts-default.phpt Added

@@ -0,0 +1,56 @@
+--TEST--
+FPM: GHSA-54hq-v5wp-fqgv - max_multipart_body_parts ini default
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+global
+error_log = {{FILE:LOG}}
+unconfined
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+php_admin_valuehtml_errors = false
+php_admin_valuemax_input_vars = 20
+php_admin_valuemax_file_uploads = 5
+php_admin_flagdisplay_errors = On
+php_admin_flagdisplay_startup_errors = On
+php_admin_flaglog_errors = On
+EOT;
+
+$code = <<<EOT
+<?php
+var_dump(count(\$_POST));
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$tester->start();
+$tester->expectLogStartNotices();
+echo $tester
+ ->request(stdin: 
+ 'parts' => 
+ 'count' => 30,
+ 
+ )
+ ->getBody();
+$tester->terminate();
+$tester->close();
+
+?>
+--EXPECT--
+Warning: Unknown: Input variables exceeded 20. To increase the limit change max_input_vars in php.ini. in Unknown on line 0
+
+Warning: Unknown: Multipart body parts limit exceeded 25. To increase the limit change max_multipart_body_parts in php.ini. in Unknown on line 0
+int(20)
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

php-8.1.21.tar.xz/sapi/fpm/tests/ghsa-54hq-v5wp-fqgv-max-file-uploads.phpt Added

@@ -0,0 +1,54 @@
+--TEST--
+FPM: GHSA-54hq-v5wp-fqgv - exceeding max_file_uploads
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+global
+error_log = {{FILE:LOG}}
+unconfined
+listen = {{ADDR}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+php_admin_valuehtml_errors = false
+php_admin_valuemax_file_uploads = 5
+php_admin_flagdisplay_errors = On
+php_admin_flagdisplay_startup_errors = On
+php_admin_flaglog_errors = On
+EOT;
+
+$code = <<<EOT
+<?php
+var_dump(count(\$_FILES));
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+$tester->start();
+$tester->expectLogStartNotices();
+echo $tester
+ ->request(stdin: 
+ 'parts' => 
+ 'count' => 10,
+ 'param' => 'filename'
+ 
+ )
+ ->getBody();
+$tester->terminate();
+$tester->close();
+
+?>
+--EXPECT--
+Warning: Maximum number of allowable file uploads has been exceeded in Unknown on line 0
+int(5)
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

php-8.1.13.tar.xz/sapi/fpm/tests/logreader.inc -> php-8.1.21.tar.xz/sapi/fpm/tests/logreader.inc Changed

@@ -137,7 +137,7 @@
      *
      * @return false
      */
-    private function printError(?string $errorMessage): bool
+    public function printError(?string $errorMessage): bool
     {
         if (is_null($errorMessage)) {
             return false;
@@ -155,8 +155,8 @@
      * @param callable    $matcher             Callback to identify a match
      * @param string|null $notFoundMessage     Error message if matcher does not succeed.
      * @param bool        $checkAllLogs        Whether to also check past logs.
-     * @param int         $timeoutSeconds      Timeout in seconds for reading of all messages.
-     * @param int         $timeoutMicroseconds Additional timeout in microseconds for reading of all messages.
+     * @param int|null    $timeoutSeconds      Timeout in seconds for reading of all messages.
+     * @param int|null    $timeoutMicroseconds Additional timeout in microseconds for reading of all messages.
      *
      * @return bool
      * @throws \Exception
@@ -165,9 +165,18 @@
         callable $matcher,
         string $notFoundMessage = null,
         bool $checkAllLogs = false,
-        int $timeoutSeconds = 3,
-        int $timeoutMicroseconds = 0
+        int $timeoutSeconds = null,
+        int $timeoutMicroseconds = null
     ): bool {
+        if (is_null($timeoutSeconds) && is_null($timeoutMicroseconds)) {
+            $timeoutSeconds      = 3;
+            $timeoutMicroseconds = 0;
+        } elseif (is_null($timeoutSeconds)) {
+            $timeoutSeconds = 0;
+        } elseif (is_null($timeoutMicroseconds)) {
+            $timeoutMicroseconds = 0;
+        }
+
         $startTime = microtime(true);
         $endTime   = $startTime + $timeoutSeconds + ($timeoutMicroseconds / 1_000_000);
         if ($checkAllLogs) {

php-8.1.13.tar.xz/sapi/fpm/tests/logtool.inc -> php-8.1.21.tar.xz/sapi/fpm/tests/logtool.inc Changed

@@ -127,19 +127,33 @@
     /**
      * Match the matcher checking the log lines using the callback.
      *
-     * @param callable $matcher         Callback checking whether the log line matches the expected message.
-     * @param string   $notFoundMessage Error message to show if the message is not found.
+     * @param callable    $matcher             Callback checking whether the log line matches the expected message.
+     * @param string|null $notFoundMessage     Error message to show if the message is not found.
+     * @param bool        $checkAllLogs        Whether to also check past logs.
+     * @param int|null    $timeoutSeconds      Timeout in seconds for reading of all messages.
+     * @param int|null    $timeoutMicroseconds Additional timeout in microseconds for reading of all messages.
      *
      * @return bool
      * @throws \Exception
      */
-    private function match(callable $matcher, string $notFoundMessage): bool
-    {
+    private function match(
+        callable $matcher,
+        string $notFoundMessage = null,
+        bool $checkAllLogs = false,
+        int $timeoutSeconds = null,
+        int $timeoutMicroseconds = null
+    ): bool {
         if ($this->getError()) {
             return false;
         }
 
-        if ($this->logReader->readUntil($matcher, $notFoundMessage)) {
+        if ($this->logReader->readUntil(
+            $matcher,
+            $notFoundMessage,
+            $checkAllLogs,
+            $timeoutSeconds,
+            $timeoutMicroseconds
+        )) {
             $this->popError();
 
             return true;
@@ -434,7 +448,8 @@
      * @return bool
      * @throws \Exception
      */
-    public function expectReloadingLogsLines(): bool {
+    public function expectReloadingLogsLines(): bool
+    {
         return (
             $this->expectNotice('error log file re-opened') &&
             $this->expectNotice('access log file re-opened')
@@ -570,10 +585,14 @@
     /**
      * Expect log entry.
      *
-     * @param string      $type            Entry type like NOTICE, WARNING, DEBUG and so on.
-     * @param string      $expectedMessage Message to search for
-     * @param string|null $pool            Pool that is used and prefixes the message.
-     * @param string      $ignoreErrorFor  Ignore error for supplied string in the message.
+     * @param string      $type                Entry type like NOTICE, WARNING, DEBUG and so on.
+     * @param string      $expectedMessage     Message to search for
+     * @param string|null $pool                Pool that is used and prefixes the message.
+     * @param string      $ignoreErrorFor      Ignore error for supplied string in the message.
+     * @param bool        $checkAllLogs        Whether to also check past logs.
+     * @param bool        $invert              Whether the log entry is not expected rather than expected.
+     * @param int|null    $timeoutSeconds      Timeout in seconds for reading of all messages.
+     * @param int|null    $timeoutMicroseconds Additional timeout in microseconds for reading of all messages.
      *
      * @return bool
      * @throws \Exception
@@ -582,16 +601,29 @@
         string $type,
         string $expectedMessage,
         string $pool = null,
-        string $ignoreErrorFor = self::DEBUG
+        string $ignoreErrorFor = self::DEBUG,
+        bool $checkAllLogs = false,
+        bool $invert = false,
+        int $timeoutSeconds = null,
+        int $timeoutMicroseconds = null
     ): bool {
         if ($this->getError()) {
             return false;
         }
 
-        return $this->match(
+        $matchResult = $this->match(
             $this->getEntryMatcher($type, $expectedMessage, $pool, $ignoreErrorFor),
-            "The $type does not match expected message"
+            $invert ? null : "The $type does not match expected message",
+            $checkAllLogs,
+            $timeoutSeconds,
+            $timeoutMicroseconds
         );
+
+        if ($matchResult && $invert) {
+            return $this->error("The $type matches unexpected message");
+        }
+
+        return $matchResult;
     }
 
     /**
@@ -667,14 +699,23 @@
     /**
      * Expect pattern in the log line.
      *
-     * @param string $pattern
+     * @param string   $pattern             Pattern to use.
+     * @param bool     $invert              Whether to expect pattern not to match.
+     * @param bool     $checkAllLogs        Whether to also check past logs.
+     * @param int|null $timeoutSeconds      Timeout in seconds for reading of all messages.
+     * @param int|null $timeoutMicroseconds Additional timeout in microseconds for reading of all messages.
      *
      * @return bool
      * @throws \Exception
      */
-    public function expectPattern(string $pattern): bool
-    {
-        return $this->match(
+    public function expectPattern(
+        string $pattern,
+        bool $invert = false,
+        bool $checkAllLogs = false,
+        int $timeoutSeconds = null,
+        int $timeoutMicroseconds = null,
+    ): bool {
+        $matchResult = $this->match(
             function ($line) use ($pattern) {
                 if (preg_match($pattern, $line) === 1) {
                     $this->traceMatch("Pattern expectation", $pattern, $line);
@@ -684,8 +725,17 @@
 
                 return false;
             },
-            'The search pattern not found'
+            $invert ? null : 'The search pattern not found',
+            $checkAllLogs,
+            $timeoutSeconds,
+            $timeoutMicroseconds
         );
+
+        if ($invert && $matchResult) {
+            return $this->logReader->printError('The search pattern found - PATTERN: ' . $pattern);
+        }
+
+        return $matchResult;
     }
 
     /**

php-8.1.13.tar.xz/sapi/fpm/tests/reload-uses-sigkill-as-last-measure.phpt -> php-8.1.21.tar.xz/sapi/fpm/tests/reload-uses-sigkill-as-last-measure.phpt Changed

php-8.1.13.tar.xz/sapi/fpm/tests/response.inc -> php-8.1.21.tar.xz/sapi/fpm/tests/response.inc Changed

@@ -92,6 +92,37 @@
     }
 
     /**
+     * Expect that one of the processes in json status process list has a field with value that
+     * matches the supplied pattern.
+     *
+     * @param string $fieldName
+     * @param string $pattern
+     *
+     * @return Response
+     */
+    public function expectJsonBodyPatternForStatusProcessField(string $fieldName, string $pattern)
+    {
+        $rawData = $this->getBody('application/json');
+        $data = json_decode($rawData, true);
+        if (empty($data'processes') || !is_array($data'processes')) {
+            $this->error(
+                "The body data is not a valid status json containing processes field '$rawData'"
+            );
+        }
+        foreach ($data'processes' as $process) {
+            if (preg_match('|' . $pattern . '|', $process$fieldName) !== false) {
+                return $this;
+            }
+        }
+
+        $this->error(
+            "No field $fieldName matched pattern $pattern for any process in status data '$rawData'"
+        );
+
+        return $this;
+    }
+
+    /**
      * @return Response
      */
     public function expectEmptyBody()
@@ -135,6 +166,36 @@
     }
 
     /**
+     * Expect response status.
+     *
+     * @param string|null $status Expected status.
+     *
+     * @return Response
+     */
+    public function expectStatus(string|null $status): Response {
+        $headers = $this->getHeaders();
+        if (is_null($status) && !isset($headers'status')) {
+            return $this;
+        }
+        if (!is_null($status) && !isset($headers'status')) {
+            $this->error('Status is expected but not supplied');
+        } elseif ($status !== $headers'status') {
+            $statusMessage = $status === null ? "expected not to be set": "expected to be $status";
+            $this->error("Status is $statusMessage but the actual value is {$headers'status'}");
+        }
+        return $this;
+    }
+
+    /**
+     * Expect response status not to be set.
+     *
+     * @return Response
+     */
+    public function expectNoStatus(): Response {
+        return $this->expectStatus(null);
+    }
+
+    /**
      * Expect no error in the response.
      *
      * @return Response
@@ -162,18 +223,22 @@
 
     /**
      * Print raw body.
+     *
+     * @param string $contentType Expect body to have specified content type.
      */
-    public function dumpBody()
+    public function dumpBody(string $contentType = 'text/html')
     {
-        var_dump($this->getBody());
+        var_dump($this->getBody($contentType));
     }
 
     /**
      * Print raw body.
+     *
+     * @param string $contentType Expect body to have specified content type.
      */
-    public function printBody()
+    public function printBody(string $contentType = 'text/html')
     {
-        echo $this->getBody() . "\n";
+        echo $this->getBody($contentType) . "\n";
     }
 
     /**

php-8.1.13.tar.xz/sapi/fpm/tests/tester.inc -> php-8.1.21.tar.xz/sapi/fpm/tests/tester.inc Changed

@@ -379,12 +379,19 @@
 * @param array $extraArgs Command extra arguments.
 * @param bool $forceStderr Whether to output to stderr so error log is used.
 * @param bool $daemonize Whether to start FPM daemonized
+ * @param array $extensions List of extension to add if shared build used.
+ * @param array $iniEntries List of ini entries to use.
 *
 * @return bool
 * @throws \Exception
 */
- public function start(array $extraArgs = , bool $forceStderr = true, bool $daemonize = false)
- {
+ public function start(
+ array $extraArgs = ,
+ bool $forceStderr = true,
+ bool $daemonize = false,
+ array $extensions = ,
+ array $iniEntries = ,
+ ) {
 $configFile = $this->createConfig();
 $desc = $this->outDesc ? : 1 => array('pipe', 'w'), 2 => array('redirect', 1);
 
@@ -399,6 +406,18 @@
 $cmd = '-F';
 }
 
+ $extensionDir = getenv('TEST_FPM_EXTENSION_DIR');
+ if ($extensionDir) {
+ $cmd = '-dextension_dir=' . $extensionDir;
+ foreach ($extensions as $extension) {
+ $cmd = '-dextension=' . $extension;
+ }
+ }
+
+ foreach ($iniEntries as $iniEntryName => $iniEntryValue) {
+ $cmd = '-d' . $iniEntryName . '=' . $iniEntryValue;
+ }
+
 if (getenv('TEST_FPM_RUN_AS_ROOT')) {
 $cmd = '--allow-to-run-as-root';
 }
@@ -555,6 +574,7 @@
 * @param array $headers
 * @param string|null $uri
 * @param string|null $scriptFilename
+ * @param string|null $stdin
 *
 * @return array
 */
@@ -562,18 +582,26 @@
 string $query = '',
 array $headers = ,
 string $uri = null,
- string $scriptFilename = null
+ string $scriptFilename = null,
+ string $scriptName = null,
+ ?string $stdin = null
 ): array {
+ if (is_null($scriptFilename)) {
+ $scriptFilename = $this->makeSourceFile();
+ }
 if (is_null($uri)) {
- $uri = $this->makeSourceFile();
+ $uri = '/' . basename($scriptFilename);
+ }
+ if (is_null($scriptName)) {
+ $scriptName = $uri;
 }
 
 $params = array_merge(
 
 'GATEWAY_INTERFACE' => 'FastCGI/1.0',
- 'REQUEST_METHOD' => 'GET',
- 'SCRIPT_FILENAME' => $scriptFilename ?: $uri,
- 'SCRIPT_NAME' => $uri,
+ 'REQUEST_METHOD' => is_null($stdin) ? 'GET' : 'POST',
+ 'SCRIPT_FILENAME' => $scriptFilename === '' ? null : $scriptFilename,
+ 'SCRIPT_NAME' => $scriptName,
 'QUERY_STRING' => $query,
 'REQUEST_URI' => $uri . ($query ? '?' . $query : ""),
 'DOCUMENT_URI' => $uri,
@@ -586,7 +614,7 @@
 'SERVER_PROTOCOL' => 'HTTP/1.1',
 'DOCUMENT_ROOT' => __DIR__,
 'CONTENT_TYPE' => '',
- 'CONTENT_LENGTH' => 0
+ 'CONTENT_LENGTH' => strlen($stdin ?? "") // Default to 0
 ,
 $headers
 );
@@ -597,20 +625,86 @@
 }
 
 /**
+ * Parse stdin and generate data for multipart config.
+ *
+ * @param array $stdin
+ * @param array $headers
+ *
+ * @return void
+ * @throws \Exception
+ */
+ private function parseStdin(array $stdin, array &$headers)
+ {
+ $parts = $stdin'parts' ?? null;
+ if (empty($parts)) {
+ throw new \Exception('The stdin array needs to contain parts');
+ }
+ $boundary = $stdin'boundary' ?? 'AaB03x';
+ if ( ! isset($headers'CONTENT_TYPE')) {
+ $headers'CONTENT_TYPE' = 'multipart/form-data; boundary=' . $boundary;
+ }
+ $count = $parts'count' ?? null;
+ if ( ! is_null($count)) {
+ $dispositionType = $parts'disposition' ?? 'form-data';
+ $dispositionParam = $parts'param' ?? 'name';
+ $namePrefix = $parts'prefix' ?? 'f';
+ $nameSuffix = $parts'suffix' ?? '';
+ $value = $parts'value' ?? 'test';
+ $parts = ;
+ for ($i = 0; $i < $count; $i++) {
+ $parts = 
+ 'disposition' => $dispositionType,
+ 'param' => $dispositionParam,
+ 'name' => "$namePrefix$i$nameSuffix",
+ 'value' => $value
+ ;
+ }
+ }
+ $out = '';
+ $nl = "\r\n";
+ foreach ($parts as $part) {
+ if (!is_array($part)) {
+ $part = 'name' => $part;
+ } elseif ( ! isset($part'name')) {
+ throw new \Exception('Each part has to have a name');
+ }
+ $name = $part'name';
+ $dispositionType = $part'disposition' ?? 'form-data';
+ $dispositionParam = $part'param' ?? 'name';
+ $value = $part'value' ?? 'test';
+ $partHeaders = $part'headers' ?? ;
+
+ $out .= "--$boundary$nl";
+ $out .= "Content-disposition: $dispositionType; $dispositionParam=\"$name\"$nl";
+ foreach ($partHeaders as $headerName => $headerValue) {
+ $out .= "$headerName: $headerValue$nl";
+ }
+ $out .= $nl;
+ $out .= "$value$nl";
+ }
+ $out .= "--$boundary--$nl";
+
+ return $out;
+ }
+
+ /**
 * Execute request.
 *
- * @param string $query
- * @param array $headers
- * @param string|null $uri
- * @param string|null $address
- * @param string|null $successMessage
- * @param string|null $errorMessagereadLimit
- * @param bool $connKeepAlive
- * @param string|null $scriptFilename = null
- * @param bool $expectError
- * @param int $readLimit
+ * @param string $query
+ * @param array $headers
+ * @param string|null $uri
+ * @param string|null $address
+ * @param string|null $successMessage
+ * @param string|null $errorMessage
+ * @param bool $connKeepAlive
+ * @param string|null $scriptFilename = null
+ * @param string|null $scriptName = null
+ * @param string|array|null $stdin = null
+ * @param bool $expectError
+ * @param int $readLimit
 *
 * @return Response
+ * @throws \Exception
 */
 public function request(
 string $query = '',
@@ -621,6 +715,8 @@
 string $errorMessage = null,
 bool $connKeepAlive = false,
 string $scriptFilename = null,
+ string $scriptName = null,
+ string|array $stdin = null,
 bool $expectError = false,
 int $readLimit = -1,
 ): Response {
@@ -628,12 +724,16 @@
 return new Response(null, true);
 }
 
- $params = $this->getRequestParams($query, $headers, $uri, $scriptFilename);
+ if (is_array($stdin)) {
+ $stdin = $this->parseStdin($stdin, $headers);
+ }
+
+ $params = $this->getRequestParams($query, $headers, $uri, $scriptFilename, $scriptName, $stdin);
 $this->trace('Request params', $params);
 
 try {
 $this->response = new Response(
- $this->getClient($address, $connKeepAlive)->request_data($params, false, $readLimit)
+ $this->getClient($address, $connKeepAlive)->request_data($params, $stdin, $readLimit)
 );
 if ($expectError) {
 $this->error('Expected request error but the request was successful');
@@ -695,6 +795,10 @@
 $requestData'uri' ?? null
 );
 
+ if (isset($requestData'delay')) {
+ usleep($requestData'delay');
+ }
+
 return 
 'client' => $client,
 'requestId' => $client->async_request($params, false),
@@ -1200,6 +1304,18 @@
 }
 
 /**
+ * Create a source file and script name.
+ *
+ * @return string
+ */
+ public function createSourceFileAndScriptName(): array
+ {
+ $sourceFile = $this->makeFile('src.php', $this->code, overwrite: false);
+
+ return $sourceFile, '/' . basename($sourceFile);
+ }
+
+ /**
 * @param string|null $msg
 */
 private function message($msg)
@@ -1366,13 +1482,54 @@
 /**
 * Expect log pattern in logs.
 *
- * @param string $pattern Log pattern
+ * @param string $pattern Log pattern
+ * @param bool $checkAllLogs Whether to also check past logs.
+ * @param int|null $timeoutSeconds Timeout in seconds for reading of all messages.
+ * @param int|null $timeoutMicroseconds Additional timeout in microseconds for reading of all messages.
 *
 * @throws \Exception
 */
- public function expectLogPattern(string $pattern)
- {
- $this->logTool->expectPattern($pattern);
+ public function expectLogPattern(
+ string $pattern,
+ bool $checkAllLogs = false,
+ int $timeoutSeconds = null,
+ int $timeoutMicroseconds = null,
+ ) {
+ $this->logTool->expectPattern(
+ $pattern,
+ false,
+ $checkAllLogs,
+ $timeoutSeconds,
+ $timeoutMicroseconds
+ );
+ }
+
+ /**
+ * Expect no such log pattern in logs.
+ *
+ * @param string $pattern Log pattern
+ * @param bool $checkAllLogs Whether to also check past logs.
+ * @param int|null $timeoutSeconds Timeout in seconds for reading of all messages.
+ * @param int|null $timeoutMicroseconds Additional timeout in microseconds for reading of all messages.
+ *
+ * @throws \Exception
+ */
+ public function expectNoLogPattern(
+ string $pattern,
+ bool $checkAllLogs = true,
+ int $timeoutSeconds = null,
+ int $timeoutMicroseconds = null,
+ ) {
+ if (is_null($timeoutSeconds) && is_null($timeoutMicroseconds)) {
+ $timeoutMicroseconds = 10;
+ }
+ $this->logTool->expectPattern(
+ $pattern,
+ true,
+ $checkAllLogs,
+ $timeoutSeconds,
+ $timeoutMicroseconds
+ );
 }
 
 /**
@@ -1426,11 +1583,15 @@
 /**
 * Expect log entry.
 *
- * @param string $type The log type
- * @param string $message The expected message
- * @param string|null $pool The pool for pool prefixed log entry
- * @param int $count The number of items
- * @param bool $checkAllLogs Whether to also check past logs.
+ * @param string $type The log type.
+ * @param string $message The expected message.
+ * @param string|null $pool The pool for pool prefixed log entry.
+ * @param int $count The number of items.
+ * @param bool $checkAllLogs Whether to also check past logs.
+ * @param bool $invert Whether the log entry is not expected rather than expected.
+ * @param int|null $timeoutSeconds Timeout in seconds for reading of all messages.
+ * @param int|null $timeoutMicroseconds Additional timeout in microseconds for reading of all messages.
+ * @param string $ignoreErrorFor Ignore error for supplied string in the message.
 *
 * @return bool
 * @throws \Exception
@@ -1440,10 +1601,25 @@
 string $message,
 string $pool = null,
 int $count = 1,
- bool $checkAllLogs = false
+ bool $checkAllLogs = false,
+ bool $invert = false,
+ int $timeoutSeconds = null,
+ int $timeoutMicroseconds = null,
+ string $ignoreErrorFor = LogTool::DEBUG
 ): bool {
 for ($i = 0; $i < $count; $i++) {
- if ( ! $this->logTool->expectEntry($type, $message, $pool, $checkAllLogs)) {
+ $result = $this->logTool->expectEntry(
+ $type,
+ $message,
+ $pool,
+ $ignoreErrorFor,
+ $checkAllLogs,
+ $invert,
+ $timeoutSeconds,
+ $timeoutMicroseconds,
+ );
+
+ if ( ! $result) {
 return false;
 }
 }
@@ -1454,10 +1630,13 @@
 /**
 * Expect a log debug message.
 *
- * @param string $message
- * @param string|null $pool
- * @param int $count
- * @param bool $checkAllLogs Whether to also check past logs.
+ * @param string $message The expected message.
+ * @param string|null $pool The pool for pool prefixed log entry.
+ * @param int $count The number of items.
+ * @param bool $checkAllLogs Whether to also check past logs.
+ * @param bool $invert Whether the log entry is not expected rather than expected.
+ * @param int|null $timeoutSeconds Timeout in seconds for reading of all messages.
+ * @param int|null $timeoutMicroseconds Additional timeout in microseconds for reading of all messages.
 *
 * @return bool
 * @throws \Exception
@@ -1466,18 +1645,34 @@
 string $message,
 string $pool = null,
 int $count = 1,
- bool $checkAllLogs = false
+ bool $checkAllLogs = false,
+ bool $invert = false,
+ int $timeoutSeconds = null,
+ int $timeoutMicroseconds = null
 ): bool {
- return $this->expectLogEntry(LogTool::DEBUG, $message, $pool, $count, $checkAllLogs);
+ return $this->expectLogEntry(
+ LogTool::DEBUG,
+ $message,
+ $pool,
+ $count,
+ $checkAllLogs,
+ $invert,
+ $timeoutSeconds,
+ $timeoutMicroseconds,
+ LogTool::ERROR
+ );
 }
 
 /**
 * Expect a log notice.
 *
- * @param string $message
- * @param string|null $pool
- * @param int $count
- * @param bool $checkAllLogs Whether to also check past logs.
+ * @param string $message The expected message.
+ * @param string|null $pool The pool for pool prefixed log entry.
+ * @param int $count The number of items.
+ * @param bool $checkAllLogs Whether to also check past logs.
+ * @param bool $invert Whether the log entry is not expected rather than expected.
+ * @param int|null $timeoutSeconds Timeout in seconds for reading of all messages.
+ * @param int|null $timeoutMicroseconds Additional timeout in microseconds for reading of all messages.
 *
 * @return bool
 * @throws \Exception
@@ -1486,18 +1681,33 @@
 string $message,
 string $pool = null,
 int $count = 1,
- bool $checkAllLogs = false
+ bool $checkAllLogs = false,
+ bool $invert = false,
+ int $timeoutSeconds = null,
+ int $timeoutMicroseconds = null
 ): bool {
- return $this->expectLogEntry(LogTool::NOTICE, $message, $pool, $count, $checkAllLogs);
+ return $this->expectLogEntry(
+ LogTool::NOTICE,
+ $message,
+ $pool,
+ $count,
+ $checkAllLogs,
+ $invert,
+ $timeoutSeconds,
+ $timeoutMicroseconds
+ );
 }
 
 /**
 * Expect a log warning.
 *
- * @param string $message
- * @param string|null $pool
- * @param int $count
- * @param bool $checkAllLogs Whether to also check past logs.
+ * @param string $message The expected message.
+ * @param string|null $pool The pool for pool prefixed log entry.
+ * @param int $count The number of items.
+ * @param bool $checkAllLogs Whether to also check past logs.
+ * @param bool $invert Whether the log entry is not expected rather than expected.
+ * @param int|null $timeoutSeconds Timeout in seconds for reading of all messages.
+ * @param int|null $timeoutMicroseconds Additional timeout in microseconds for reading of all messages.
 *
 * @return bool
 * @throws \Exception
@@ -1506,18 +1716,33 @@
 string $message,
 string $pool = null,
 int $count = 1,
- bool $checkAllLogs = false
+ bool $checkAllLogs = false,
+ bool $invert = false,
+ int $timeoutSeconds = null,
+ int $timeoutMicroseconds = null
 ): bool {
- return $this->expectLogEntry(LogTool::WARNING, $message, $pool, $count, $checkAllLogs);
+ return $this->expectLogEntry(
+ LogTool::WARNING,
+ $message,
+ $pool,
+ $count,
+ $checkAllLogs,
+ $invert,
+ $timeoutSeconds,
+ $timeoutMicroseconds
+ );
 }
 
 /**
 * Expect a log error.
 *
- * @param string $message
- * @param string|null $pool
- * @param int $count
- * @param bool $checkAllLogs Whether to also check past logs.
+ * @param string $message The expected message.
+ * @param string|null $pool The pool for pool prefixed log entry.
+ * @param int $count The number of items.
+ * @param bool $checkAllLogs Whether to also check past logs.
+ * @param bool $invert Whether the log entry is not expected rather than expected.
+ * @param int|null $timeoutSeconds Timeout in seconds for reading of all messages.
+ * @param int|null $timeoutMicroseconds Additional timeout in microseconds for reading of all messages.
 *
 * @return bool
 * @throws \Exception
@@ -1526,18 +1751,33 @@
 string $message,
 string $pool = null,
 int $count = 1,
- bool $checkAllLogs = false
+ bool $checkAllLogs = false,
+ bool $invert = false,
+ int $timeoutSeconds = null,
+ int $timeoutMicroseconds = null
 ): bool {
- return $this->expectLogEntry(LogTool::ERROR, $message, $pool, $count, $checkAllLogs);
+ return $this->expectLogEntry(
+ LogTool::ERROR,
+ $message,
+ $pool,
+ $count,
+ $checkAllLogs,
+ $invert,
+ $timeoutSeconds,
+ $timeoutMicroseconds
+ );
 }
 
 /**
 * Expect a log alert.
 *
- * @param string $message
- * @param string|null $pool
- * @param int $count
- * @param bool $checkAllLogs Whether to also check past logs.
+ * @param string $message The expected message.
+ * @param string|null $pool The pool for pool prefixed log entry.
+ * @param int $count The number of items.
+ * @param bool $checkAllLogs Whether to also check past logs.
+ * @param bool $invert Whether the log entry is not expected rather than expected.
+ * @param int|null $timeoutSeconds Timeout in seconds for reading of all messages.
+ * @param int|null $timeoutMicroseconds Additional timeout in microseconds for reading of all messages.
 *
 * @return bool
 * @throws \Exception
@@ -1546,9 +1786,21 @@
 string $message,
 string $pool = null,
 int $count = 1,
- bool $checkAllLogs = false
+ bool $checkAllLogs = false,
+ bool $invert = false,
+ int $timeoutSeconds = null,
+ int $timeoutMicroseconds = null
 ): bool {
- return $this->expectLogEntry(LogTool::ALERT, $message, $pool, $count, $checkAllLogs);
+ return $this->expectLogEntry(
+ LogTool::ALERT,
+ $message,
+ $pool,
+ $count,
+ $checkAllLogs,
+ $invert,
+ $timeoutSeconds,
+ $timeoutMicroseconds
+ );
 }
 
 /**

php-8.1.13.tar.xz/sapi/fpm/www.conf.in -> php-8.1.21.tar.xz/sapi/fpm/www.conf.in Changed

@@ -17,9 +17,14 @@
 ; Default Value: none
 ;prefix = /path/to/pools/$pool
 
-; Unix user/group of processes
-; Note: The user is mandatory. If the group is not set, the default user's group
-;       will be used.
+; Unix user/group of the child processes. This can be used only if the master
+; process running user is root. It is set after the child process is created.
+; The user and group can be specified either by their name or by their numeric
+; IDs.
+; Note: If the user is root, the executable needs to be started with
+;       --allow-to-run-as-root option to work.
+; Default Values: The user is set to master process running user by default.
+;                 If the group is not set, the user's group is used.
 user = @php_fpm_user@
 group = @php_fpm_group@
 
@@ -43,11 +48,12 @@
 ; permissions must be set in order to allow connections from a web server. Many
 ; BSD-derived systems allow connections regardless of permissions. The owner
 ; and group can be specified either by name or by their numeric IDs.
-; Default Values: user and group are set as the running user
-;                 mode is set to 0660
+; Default Values: Owner is set to the master process running user. If the group
+;                 is not set, the owner's group is used. Mode is set to 0660.
 ;listen.owner = @php_fpm_user@
 ;listen.group = @php_fpm_group@
 ;listen.mode = 0660
+
 ; When POSIX Access Control Lists are supported you can set them using
 ; these options, value is a comma separated list of user/group names.
 ; When set, listen.owner and listen.group are ignored

php-8.1.13.tar.xz/sapi/litespeed/lsapilib.c -> php-8.1.21.tar.xz/sapi/litespeed/lsapilib.c Changed

@@ -441,9 +441,10 @@
     lsapi_close(pReq->m_fd);
     pReq->m_fd = -1;
     if (s_busy_workers)
-        __sync_fetch_and_sub(s_busy_workers, 1);
+        __atomic_fetch_sub(s_busy_workers, 1, __ATOMIC_SEQ_CST);
     if (s_worker_status)
-        __sync_lock_test_and_set(&s_worker_status->m_state, LSAPI_STATE_IDLE);
+        __atomic_store_n(&s_worker_status->m_state, LSAPI_STATE_IDLE,
+                         __ATOMIC_SEQ_CST);
 }
 
 
@@ -1587,10 +1588,10 @@
                 else
                 {
                     if (s_worker_status)
-                        __sync_lock_test_and_set(&s_worker_status->m_state,
-                                                 LSAPI_STATE_CONNECTED);
+                        __atomic_store_n(&s_worker_status->m_state,
+                                       LSAPI_STATE_CONNECTED, __ATOMIC_SEQ_CST);
                     if (s_busy_workers)
-                        __sync_fetch_and_add(s_busy_workers, 1);
+                        __atomic_fetch_add(s_busy_workers, 1, __ATOMIC_SEQ_CST);
                     lsapi_set_nblock( pReq->m_fd , 0 );
                     if (((struct sockaddr *)&achPeer)->sa_family == AF_INET )
                     {
@@ -2918,9 +2919,9 @@
         ++pStatus;
     }
     if (s_busy_workers)
-        __sync_lock_release(s_busy_workers);
+        __atomic_store_n(s_busy_workers, 0, __ATOMIC_SEQ_CST);
     if (s_accepting_workers)
-        __sync_lock_release(s_accepting_workers);
+        __atomic_store_n(s_accepting_workers, 0, __ATOMIC_SEQ_CST);
 
 }
 
@@ -2928,6 +2929,8 @@
 static void lsapi_sigchild( int signal )
 {
     int status, pid;
+    char expect_connected = LSAPI_STATE_CONNECTED;
+    char expect_accepting = LSAPI_STATE_ACCEPTING;
     lsapi_child_status * child_status;
     if (g_prefork_server == NULL)
         return;
@@ -2964,19 +2967,23 @@
         child_status = find_child_status( pid );
         if ( child_status )
         {
-            if (__sync_bool_compare_and_swap(&child_status->m_state,
-                                             LSAPI_STATE_CONNECTED,
-                                             LSAPI_STATE_IDLE))
+            if (__atomic_compare_exchange_n(&child_status->m_state,
+                                            &expect_connected,
+                                            LSAPI_STATE_IDLE, 1,
+                                            __ATOMIC_SEQ_CST,
+                                            __ATOMIC_SEQ_CST))
             {
                 if (s_busy_workers)
-                    __sync_fetch_and_sub(s_busy_workers, 1);
+                    __atomic_fetch_sub(s_busy_workers, 1, __ATOMIC_SEQ_CST);
             }
-            else if (__sync_bool_compare_and_swap(&child_status->m_state,
-                                                  LSAPI_STATE_ACCEPTING,
-                                                  LSAPI_STATE_IDLE))
+            else if (__atomic_compare_exchange_n(&child_status->m_state,
+                                                 &expect_accepting,
+                                                 LSAPI_STATE_IDLE, 1,
+                                                 __ATOMIC_SEQ_CST,
+                                                 __ATOMIC_SEQ_CST))
             {
                 if (s_accepting_workers)
-                    __sync_fetch_and_sub(s_accepting_workers, 1);
+                    __atomic_fetch_sub(s_accepting_workers, 1, __ATOMIC_SEQ_CST);
             }
             child_status->m_pid = 0;
             --g_prefork_server->m_iCurChildren;
@@ -3249,7 +3256,7 @@
         {
             int accepting = 0;
             if (s_accepting_workers)
-                accepting = __sync_add_and_fetch(s_accepting_workers, 0);
+                accepting = __atomic_load_n(s_accepting_workers, __ATOMIC_SEQ_CST);
 
             if (pServer->m_iCurChildren > 0
                 && accepting > 0)
@@ -3315,10 +3322,10 @@
                 if (pthread_atfork_func)
                     (*pthread_atfork_func)(NULL, NULL, set_skip_write);
 
-                __sync_lock_test_and_set(&s_worker_status->m_state,
-                                         LSAPI_STATE_CONNECTED);
+                __atomic_store_n(&s_worker_status->m_state,
+                                 LSAPI_STATE_CONNECTED, __ATOMIC_SEQ_CST);
                 if (s_busy_workers)
-                    __sync_add_and_fetch(s_busy_workers, 1);
+                    __atomic_add_fetch(s_busy_workers, 1, __ATOMIC_SEQ_CST);
                 lsapi_set_nblock( pReq->m_fd, 0 );
                 //keep it open if busy_count is used.
                 if (!s_keep_listener && s_busy_workers
@@ -3390,7 +3397,7 @@
 {
     int max_children = g_prefork_server->m_iMaxChildren;
     s_pid = getpid();
-    __sync_lock_test_and_set(&pReq->child_status->m_pid, s_pid);
+    __atomic_store_n(&pReq->child_status->m_pid, s_pid, __ATOMIC_SEQ_CST);
     s_worker_status = pReq->child_status;
 
     setsid();
@@ -3402,10 +3409,10 @@
     if (pthread_atfork_func)
         (*pthread_atfork_func)(NULL, NULL, set_skip_write);
 
-    __sync_lock_test_and_set(&s_worker_status->m_state,
-                                LSAPI_STATE_CONNECTED);
+    __atomic_store_n(&s_worker_status->m_state,
+                     LSAPI_STATE_CONNECTED, __ATOMIC_SEQ_CST);
     if (s_busy_workers)
-        __sync_add_and_fetch(s_busy_workers, 1);
+        __atomic_add_fetch(s_busy_workers, 1, __ATOMIC_SEQ_CST);
     lsapi_set_nblock( pReq->m_fd, 0 );
     //keep it open if busy_count is used.
     if (!s_keep_listener && s_busy_workers
@@ -3522,7 +3529,7 @@
         {
             int accepting = 0;
             if (s_accepting_workers)
-                accepting = __sync_add_and_fetch(s_accepting_workers, 0);
+                accepting = __atomic_load_n(s_accepting_workers, __ATOMIC_SEQ_CST);
 
             if (pServer->m_iCurChildren > 0
                 && accepting > 0)
@@ -3607,7 +3614,7 @@
     }
     else if (s_req_processed > 0 && s_max_busy_workers > 0 && s_busy_workers)
     {
-        ret = __sync_fetch_and_add(s_busy_workers, 0);
+        ret = __atomic_load_n(s_busy_workers, __ATOMIC_SEQ_CST);
         if (ret >= s_max_busy_workers)
         {
             send_conn_close_notification(pReq->m_fd);
@@ -3651,19 +3658,19 @@
             if (fd == pReq->m_fdListen)
             {
                 if (s_worker_status)
-                    __sync_lock_test_and_set(&s_worker_status->m_state,
-                                             LSAPI_STATE_ACCEPTING);
+                    __atomic_store_n(&s_worker_status->m_state,
+                                     LSAPI_STATE_ACCEPTING, __ATOMIC_SEQ_CST);
                 if (s_accepting_workers)
-                    __sync_fetch_and_add(s_accepting_workers, 1);
+                    __atomic_fetch_add(s_accepting_workers, 1, __ATOMIC_SEQ_CST);
             }
             ret = (*g_fnSelect)(fd+1, &readfds, NULL, NULL, &timeout);
             if (fd == pReq->m_fdListen)
             {
                 if (s_accepting_workers)
-                    __sync_fetch_and_sub(s_accepting_workers, 1);
+                    __atomic_fetch_sub(s_accepting_workers, 1, __ATOMIC_SEQ_CST);
                 if (s_worker_status)
-                    __sync_lock_test_and_set(&s_worker_status->m_state,
-                                             LSAPI_STATE_IDLE);
+                    __atomic_store_n(&s_worker_status->m_state,
+                                     LSAPI_STATE_IDLE, __ATOMIC_SEQ_CST);
             }
 
             if ( ret == 0 )
@@ -3711,10 +3718,11 @@
                     if ( pReq->m_fd != -1 )
                     {
                         if (s_worker_status)
-                            __sync_lock_test_and_set(&s_worker_status->m_state,
-                                                     LSAPI_STATE_CONNECTED);
+                            __atomic_store_n(&s_worker_status->m_state,
+                                             LSAPI_STATE_CONNECTED,
+                                             __ATOMIC_SEQ_CST);
                         if (s_busy_workers)
-                            __sync_fetch_and_add(s_busy_workers, 1);
+                            __atomic_fetch_add(s_busy_workers, 1, __ATOMIC_SEQ_CST);
 
                         fd = pReq->m_fd;
 
@@ -4385,5 +4393,5 @@
 
 int LSAPI_Inc_Req_Processed(int cnt)
 {
-    return __sync_add_and_fetch(s_global_counter, cnt);
+    return __atomic_add_fetch(s_global_counter, cnt, __ATOMIC_SEQ_CST);
 }

php-8.1.13.tar.xz/sapi/phpdbg/phpdbg.c -> php-8.1.21.tar.xz/sapi/phpdbg/phpdbg.c Changed

php-8.1.13.tar.xz/sapi/phpdbg/phpdbg_bp.c -> php-8.1.21.tar.xz/sapi/phpdbg/phpdbg_bp.c Changed

php-8.1.13.tar.xz/sapi/phpdbg/phpdbg_lexer.c -> php-8.1.21.tar.xz/sapi/phpdbg/phpdbg_lexer.c Changed

php-8.1.13.tar.xz/sapi/phpdbg/phpdbg_out.c -> php-8.1.21.tar.xz/sapi/phpdbg/phpdbg_out.c Changed

php-8.1.13.tar.xz/sapi/phpdbg/phpdbg_prompt.c -> php-8.1.21.tar.xz/sapi/phpdbg/phpdbg_prompt.c Changed

php-8.1.13.tar.xz/sapi/phpdbg/phpdbg_utils.c -> php-8.1.21.tar.xz/sapi/phpdbg/phpdbg_utils.c Changed

php-8.1.21.tar.xz/sapi/phpdbg/tests/gh10715.phpt Added

php-8.1.21.tar.xz/sapi/phpdbg/tests/watch_007.phpt Added

php-8.1.13.tar.xz/scripts/dev/makedist -> php-8.1.21.tar.xz/scripts/dev/makedist Changed

php-8.1.13.tar.xz/tests/lang/bug44827.phpt -> php-8.1.21.tar.xz/tests/lang/bug44827.phpt Changed

php-8.1.13.tar.xz/win32/build/Makefile -> php-8.1.21.tar.xz/win32/build/Makefile Changed

@@ -59,14 +59,17 @@
 build_dirs: $(BUILD_DIR) $(BUILD_DIRS_SUB) $(BUILD_DIR_DEV)
 
 !if $(RE2C) == ""
-generated_files: build_dirs Zend\zend_ini_parser.c \
+generated_files: build_dirs \
+	Zend\zend_ini_parser.c Zend\zend_ini_parser.h \
 	Zend\zend_language_parser.c \
 	sapi\phpdbg\phpdbg_parser.c \
 	$(PHPDEF) $(MCFILE)
 !else
-generated_files: build_dirs Zend\zend_ini_parser.c \
-	Zend\zend_language_parser.c Zend\zend_ini_scanner.c \
-	Zend\zend_language_scanner.c \
+generated_files: build_dirs \
+	Zend\zend_ini_parser.c Zend\zend_ini_parser.h \
+	Zend\zend_language_parser.c \
+	Zend\zend_ini_scanner.c Zend\zend_ini_scanner_defs.h \
+	Zend\zend_language_scanner.c Zend\zend_language_scanner_defs.h \
 	sapi\phpdbg\phpdbg_parser.c sapi\phpdbg\phpdbg_lexer.c \
 	$(PHPDEF) $(MCFILE)
 !endif
@@ -87,10 +90,10 @@
 	$(BISON) --output=sapi/phpdbg/phpdbg_parser.c -v -d sapi/phpdbg/phpdbg_parser.y
 
 !if $(RE2C) != ""
-Zend\zend_ini_scanner.c: Zend\zend_ini_scanner.l
+Zend\zend_ini_scanner.c Zend\zend_ini_scanner_defs.h: Zend\zend_ini_scanner.l
 	$(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l
 
-Zend\zend_language_scanner.c: Zend\zend_language_scanner.l
+Zend\zend_language_scanner.c Zend\zend_language_scanner_defs.h: Zend\zend_language_scanner.l
 	$(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.l
 
 sapi\phpdbg\phpdbg_lexer.c: sapi\phpdbg\phpdbg_lexer.l

php-8.1.13.tar.xz/win32/ftok.c -> php-8.1.21.tar.xz/win32/ftok.c Changed

php8.keyring Changed

@@ -1,415 +1,249 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-mQINBFjxRtoBEADkS6+Q7afwYDPFnqJXuyF2ZIvXysDBrpr/xbre4jVeiC/HIELa
-QedOJqO1V+BgnTRkfhor+Yq3mZ1un+6zJIiFcm5Kp7sPZjh15JF96PsA4e2Eh5eC
-eJzjXHj1nAKXfn5+CgpYEyL30r1/ACkmo9TKIiUxIDZRkZvxjY4UKeo+EoJo0Viu
-tV8mvSTgxaz9gzPhZ5OJR8zECT8j3T8d+tBD8wWxxmGZ0veOu/MBew1C/BDr8RqT
-CXDywUbyNuSsdb3a5aLuIuLekSJVSCcFwPIje1WrX4FyC42+elOp0SXpjWzdb08N
-XX4DEY8zVyVXI1ScSpTbslffcFkY60NJhjpP7t856L9vTLRfHIM9BIdSYH/ar5mE
-Q0vyJbiNfkx5tIMnEmnIYbmnjjmcPZDKZ4PyQEUEWF3DqNOOAWhk9HUMFEkANkd1
-vEcNNQxgD2eOJM6egfUv9KtuAEcRX2iDu3gIyE+55x92VVoEJDu5M+Q6PYGUIMh7
-nz2gS3lnlpG2vquQpqDS9UogsZ8L4NsukdP2ixRFnD9qaTOemqRYwIptOX6wvrtR
-7PmWOnnRZ5OcpK5/qyK9iCLY7bbHDViBoV0uLEHNPTDHjrALJrqS+dH1glYid/82
-OvKE3KREjRpMOW83nNfQcqkMi9fhH8WUkz6OD6JemvB/s/CwBS2w3+9LAQARAQAB
-tB5TYXJhIEdvbGVtb24gPHBvbGxpdGFAcGhwLm5ldD6JAj4EEwECACgCGwMGCwkI
-BwMCBhUIAgkKCwQWAgMBAh4BAheABQJY/TOeBQkNNFUtAAoJENvbOXRw0SFy1xYP
-/jQeNv4WUPK3M0Hl3EvEnOeODxePysU0khvgnw/mRtQu7BOwRdbB0HWv8Kx0HXL7
-XI4l2myHRZbd9PrBlG4YFYjZqWmqQ9WGlLBxDpSJNeROpTgKjhxA2hOl1xH2Et5k
-bRcZzpJJ9zuD3rqkq80S3u/UAB/QzYfJWKnQBTXi/3psZNAVTRp3/4sEn1kCfEnl
-NUYPih/NqdXE0frlKeITOAmatD2cjYcJlc/ETLil8Sq1nIgiE/++KZalbcXcRSHV
-ZSd/L+fNlMDIh6k9pjcE562oiyyMHKed/pAX7o1BqlKqSwxjQoNskpICVFkyMv+P
-7cIPyOxJa8kaGyyHND+8i1GzvwcPhLYeOWDwmiXBs4Ea8Z7KWxhi19zlxMrEfAcf
-FIomcRoxfzcnSY3FVJYIoEySK/IBiivqeunyeDA2JG1vLSZIV5hNicUihp4hnhX4
-Z1gElN+C68P49SZseFzxvzwMq5RIUbWVwIh2+Wj51/UrULgoM4qNkgejDLYFyTxb
-LfXq+Tk91UXdpepBHvE9KFVqh4MbIlyx9TAzOizqLdZlnPRwLb3rWBLsv7XbCTeY
-tp4jVU8Q35hnvGFy+GsSROJv04mJW+whyz+zxOEMPiVbVA5um3ZbSj5oou87M9Li
-JtrUOqNfyyqddLC8L5LgwwlYKqP+W6Q4LMf/Whoj3FFCuQINBFjxRtoBEACk8wfJ
-qP03Hz6PX8br3jEUllSngdD/28K2C4RVOOr71u4FJRcEMR98SbPnCNIUt4KdedO1
-DJpYac1XvIaVBbLxEcBjRMWNhBgZbxoQzPjFTWHQ/UwHZPiiwQkL55fN1ejBEacD
-V8B1JwqjcBbii6zItLUV/gxGH7Jce/f7KBM7vWlaP+xHpmd+iPK1swK5wNQzDL83
-b7NPyj58fqlmh54Fr+jcpuUjynaYfjtJsgwc4CScdai7FclctLMg8Y8DW7/bkqf1
-BQy9Dik82IWSN4wgVM1eWSGx+PzPlshGH/C8B53U353NcRhjFp3zX31wQhsJrA7J
-p+10S3HbXGrr3aVGMMq3dqSBGp38iKJUmJ3zyVvby5Mk4+8FFmMk3gVuQE52pW4E
-OlSVQNQC8yzYsgaG/4N0M8DRpbfPhT5wiD/Qcb7MUXTE96dzs/KcyPJju/aq4cJ6
-DgpbJmM6OZwnx5HYwa58RgOwAVBbsxYOa6oS+Fj02eaiUETwfPHtqF9juCcM5D0m
-cLZRT1I4zK60qPb6ZDzuFguXg8hm/djjh2YlDFCNKqCZHktCISTWX5u1cyF5j+UL
-3fsKcAAcyiHZV9UH8tr6v0i0P19Uje2ZHk9utJggYSSM0uyqGhmiyd8su2FqitBl
-tvTo00Kc8sv4AcDmCng8SVO0og1wiJZdiHJI7QARAQABiQIfBBgBAgAJBQJY8Uba
-AhsMAAoJENvbOXRw0SFydu4QALeYG2PPMEOQtMV6jOVT51U0Yo0yl94RJoQCOCCT
-/JkUyIDczHmtcVABrpitX3tFl4vacJM3uKWKbzbM7qO2+Hd0u6rxO+o8WUGRMZp5
-IgcbagDOHs0vorVN2Yo0Tl8RoqW91MCvlRFA+8snmKjWfTYj8jxbhIUEtVrIU+5L
-DEgDP+T6PvpaVeXfLYItieCsZgib3qPz5mM49jDH84XG5F19kx0QtVGJs7n8FrcA
-GcQl/iMrm7dRrRuh9394ongIum0uld287Zlg9q12iJiir3w04Npy43G12RXq9TD9
-aRfbMhQ+HB5Dnvf42mfCfGvalSE0rg9mh1KeaiQUXxCzCf1D6a3H50rh1IDn363W
-n41/Hr0j4ntVjvEJxs9nUb8qod2HMOPLOFqwxck7ueGaeDN/GZ5zjPdIppYwE3Lb
-CM1ZFLkV+QhFef4zXwml1/AnGGFULgGYorwGCchizhU1wbZVcoUF74MtprnAsuPd
-Fxlw+4yCcFEeYVpMDQg/ZfZ28T1GruGHqLJqIVpOum48Ec+fjnHAZAH9dOs/qhBu
-CLE+5xUoVyP2lwt0MaHs5SLmxRKhcV6IWRJKTlZ9YdDXbVv5LisL/qDOTjRj7vOg
-CPRhklyA0JjFeyTDpSeAWXFZnab0nYBPWkxtdxxRruEeQPAYP1vl0O6ABMxRAI6o
-6zIImQINBFklYukBEAC9tCSjnoNs3ucOA9RPfKcuK87JD9jdet2UUsw4DHd/Hwmr
-t3T7WKoH1GwRp+ue5+vzXqdFRZ4gG+7tgvUsOtNb5rh22bTBsUIeGsvm/omJntXC
-FQhYcfjtk04p3qtgJ5PGjZahCRYg4aQ2tGp2Mb8auFuFPsHtOHLWQCL7vQShsN9m
-EkEzAQZnn9QYL+IvTQVSKsRy8XcHYZVk2uT2xQY2LvkAucWF0TrjU2LJ2IFdepc0
-+jz1xasBR0afT9YccHpQH5w8yOW+9o/n7BiMHfgT0sBMdKCfKVoQrQe0CsFnqc/+
-V4NsnHkyUrbfKiIFm+NOupIMpL6/A+Iky5YpjIIUHPuVL6VAY6wm463WI8FPk+Nt
-Gekm9jqISxirkYWsIEoZtCrycC8N0iUbGq8eLYdC9ewU5dagCdLGwnDvYjOvzH15
-6LTiE/Svrq2q0kBDAa7CTGRlT+2sgD89ol73QtAVUJst99lVHMmIL1cV4HUpvOlT
-JHRdsN6VhlPrw6ue+2vmYsF86bYni6vMH6KJnmiWa1wijYO0wiSphtTXAa0HE/HT
-V+hSb9bCRbyipwdqkEeaj8sKcx9+XyNxVOlUfo8pQZnLRTd61Fvj+sSTSEbo95a5
-gi0WDnyNtiafKEvLxal7VyatbAcCEcLDYAVHffNLg4fm4H35HN0YQpUt+SuVwQAR
-AQABtBpSZW1pIENvbGxldCA8cmVtaUBwaHAubmV0PokCPgQTAQIAKAUCWSVi6QIb
-AwUJDShogAYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ3J/40+5a8n9OJQ/9
-HtuZ4BMPMDFGVPUZ9DP0d74DF/QcT0V101TrdIZ92R4up56Dv40djjQZc2W9BmpP
-VFr/v6qdjapdPH5vvmatnQDz/nIOfo1iwPWGzvmKnbDBQ4qJX7Jd6PdD/YorcD+0
-tOQNKLIGE9ZFQnS80iz9iaTGzvQKEQKEMugQSf3kG3NBEGqKQBsTTrBQOUJ3g8w6
-id2/qJtrDRbL9TuCU77Dpx9HUAnjj/Ixlvd4RQDa/BCYzGYJlCyTsaVW3qc7DIh/
-pRadqtswghSETtl6SSo9yHtoYOGTxXO6UikLEE8miOlaOPQrC9hCD+LSGc5QhNLB
-EKes0l79w9kw9qZ9Xfh4pw/hf1N4O3kPHyUg0q9QaX1XKtigjTUcpdf2Kq8LtlB6
-0p40eZE2dV3T11X+rcn33pFSXMeTJeaNKHXoeGcva/gyZVtvi8iJhqtw9QOUkxRD
-vGB+FEUId3Z1yAu7ZAz6qiUCgxK/VJ6/kBb+YYR8K4FHLmNOd5KoiTerKQu423uu
-MYlYfBHpVZ9YuEJQnTEpizFEeOgaixx5RDLnoPsd/x59VS9eaaKotTPbW/rEp7Sv
-bKj0dR5WMfGyd/OJrcWVZy8/Kh5Mc/4KOHD+JGAp0bE113TkEEoTZ8gNHFdLdv52
-V9eXUkeT5IxyThZBkUy6palDM8A5vaf6Eet8xOLy9XG5Ag0EWSVi6QEQAKujAODv
-sdbt5n1dO29Nj5htbmt6M2A7eOjt7yUj4UMtBaGOA08O0DVA8MJkvepMq9AJBXHZ
-Mi9Dycw3rxBHQDqHJJMwghu3RoQw1y5Wym7LiLhoWSU/wK0BrKOULBwh+kS6udKA
-4oWrV/gr0JGmfdL8dZjBF10kHCfCcjcjWtmIp2GRaoOKTlHCviNmRxzyqba7zE0Z
-c2maQ/4w98BI83GqD1bT8gF/5qwSI1hecBwt9oS7EbZ1ZiE8SSE8Gr6OR3p5UNHb
-zqxUWy8W4r3qulCLc6g1LPXP1V59cMxX9jQJ7lSdv0k8C6Lb6t9Wm8G63hNYgRCA
-mNW5EnqieTrx45K9vqoqfQK6Apfy0UoOquiuK7QClT3wBd7kmyKsCfV0bwRA/fV/
-sC1Rniu8PV7CRk9ryudUXycKq33pSkrOfZjFIQhCqdJkVc2MPbAuj2pOMutKwGKR
-q/Mt3O8nEfGqWaJPa36C6dhlPqjEGTIEk5P493DzM7fj5VVIWyUrI8Vm9FslSvzI
-LcONHMtKtRs2cRYA085NKDXGN7i5Am7L7ZONfqVs3V493ICwmALzeSULNLiMtX+E
-SQfdWCS3Hosnjbc6INDg9BRhFt5MEWJ/qchM3g4NQuukqtOYsiEUw8bCzepwJxXp
-lvNYu0yQDxvP+0RzjMozruVz3VoHeyf6rSWvABEBAAGJAiUEGAECAA8FAlklYukC
-GwwFCQ0oaIAACgkQ3J/40+5a8n/8gg//a75gXQ4csiDUTsUndb94EXqraffmMcT5
-oCzfcP+Mecbuv3G8oQZeLRchsW2i4QecnvPwrXAJcF8kJuN/KZLyeh21PWBy55wo
-/2nbwOvQockXpK5yVeuc3DmdTaxDnW9u3QpSwbvkEyoCpeHH6rZ1wjqn8Qi1k7nj
-C4qgXpRrLQdRsS5ULXpf3IM+vaxbQ5avVnNRu5zMA6M/0reL0RSjgMfnk+3AwLCt
-uMiy1aStCe8V7Y60/oauk+IZA1VJlSz2n3675YD7TkTZKkYIYZHTBw3ZPVJo08jd
-RUXtGJjpOyyWVjP7GMKvZuQVWqcFyc8QHHaIPDLkdi7B9YFPWqfwJPBfUXcdzjAX
-I7N4XsSEeMm8S8SC4FKCidioP/A+bamKcONHUuZ+AztvLh24ZTkqzA/sRRYpbMGU
-QzpcDbastuXG66s3e9pJa0R14011A4bofy6Ureh9q6TQNOkNegUUdjbGSd1bfNId
-QXRH0+LBV1oaY//v+aBjswy4hJ5oXmQj5jQKFitRCP9jzueyDdMJZ0j0Hhh4ItCz
-FV5zIKtWiy7pRp1DXq9LjoyWeeLfKu+HrEGjMwyTGJiMjcL7oCHeiV/a+fY92wpU
-rY1/mRVLqKqDIA6/iEL2DVf21U7rXY26xxvf4QFImZaYLwKQYLe8TOOjDA/I9bR1
-JJmh54yw10CZAg0EYIdBNgEQALohT1pcSlW4sk0DNfAvur1W3U+TEkevuQnKdSD/
-chKs50nLYRuiVrsZsR28tnr2j41uwvm+Y6ZPYAPSkQZ8yAT0pYnXbaIR83iGtZOH
-P6wdxV39Mpf0T3yD4dOmgka1hynqNjEbRhE/t2fXNKf0JrBUmkyyhLYbQlkH+raU
-gQug9EsyOJxEMER9qZM+Le/JiK5/i+8JxhjPcAQxiKu3l/usGtU6zcVUGjMSqs3Z
-89Fa8WBOeGxDwwSKrn8MyyfEWrbCCF4Ao8gBeFmIkWgoeyumIAA0SYZkFjaltbTm
-sFjVmYmmLXIKtKTnzZx0+jYJr42s0Q8n2ymgSKcC0Cmn+iuKslhuMpWJaqaHuZhj
-K/80BArAYETW6ne1IZWPSsobd/2x4u9iwCkd/SWERA3/KnML6lgOVJfNbFxDxuJ+
-LFvpe6VoSAHlc4fC6+lMroeg011kzjgWX4H94Bdp5svpWHQ/UQ3/YMGvgUY1vy+V
-d28bGzuslsnz5o2Zh40h2Dmpti5s2w7Z9TvLD2RMM1N6PrdCXVrQx3bB9nN7x1nL
-osn+0v/8gfck93SO9PXLQtUgqhhWsh+/TrOiVWmWqLvbN95zWSnDRVHp1P8vKEGX
-I26aokxEd1mVfilQKnHv2k6ieMc1M26GM48uXNqLSihYG2WgNl80agVFU00m/+Ea
-9Uz7ABEBAAG0G0JlbiBSYW1zZXkgPHJhbXNleUBwaHAubmV0PokCVAQTAQgAPhYh
-BDm2QTQ9jBBLKxRtw/nDncC5aYVEBQJgh0E2AhsDBQkGvxrvBQsJCAcCBhUKCQgL
-AgQWAgMBAh4BAheAAAoJEPnDncC5aYVEzJYQAI72cCn9qEq/tRB9n9t02CPgFtLJ
-VFBIJIfWeCRLQsv2vmqWGa9ehqsPT3jd0yTqNsV2hRTkzvNnrbIQUtHbRAm2pNz4
-74ClcIHuqbdk7gwfyEHw2vWpEtiVTHbJA1aqQypBrCjdfJt0s65wg4HSpodSelJO
-A0shWBhBhSgU4kUvxJKPTcF1UM5iAjmm8OVIQLUeZDLFMJV6FAHmOG0JmvGMhPp1
-Hd3YdNgyyhlF1Jrqx/MK+eRBXbXSAMRSmBuUcV5p16bkt1CQ/vU5Nwi3B2HFpsva
-5j6/9NZr4V5q8i2De4CyIpXj31fsKjfgs3k2ShIDUh6rvxyhkCHq1jqc5vYSltnF
-9bIEht/Mn383LUoL+vBejY/UIRKShTt6eK6lcnAxa/ujb4nNvoP+UGHCsTRcNK+t
-oujDxSYF1nI0zHGKCmNRmEyjW6Kp4eNspoNkm8dAwGaEvgvVNM5Jo5zAI/i4jBO1
-4lG7qTVhH1rVUFOUDKM+HMD6AdiOSp2dXXmY5Xa4OMJ8qWbPEUQP/qzFdceQL/Yj
-mzTQOaorhAdB/2ULPiB0XhSJpuz3HSe0Juz8sBVCpabAQHk8++ydOfWRb7hR1oxS
-6qJi2TIlT5vOR6X8v4kccxmvoQQbnSdVUTHSgbp/ifVFITek8Rbe9aNRnu4i+NOk
-KgA3swgzlkJcKfDGuQINBGCHQTYBEADY0/Oat2b8EDcNSKPJNdyrQlDQ+N2fyTbq
-1XPThTe5f3nRT1jepYqfsi/i4/6rza2AMvyxPO7AQSsHYlBYHxccqCH2Q90jCTu7
-iUJyU65Kx3aZC3U7VE4+jl81W5/b5qqjvZNRxLgDZDnvO7hBFh7b+jj7x1ABsHdw
-q+zXjmg2mJCBsD4ba5jQaPr+nirvhr/Y744mGpaVWRlg7d/LhL73GRy546DgCVej
-gd56vMsi2HBy2BKtjxIr2nd2yJn12+A5yenuagOVpye8F5Dy7ULFJ6iYe1/NpoVn
-yipv3m0hE4C0x1vIw8tiXR85cb0aGuYgjOgEyLCE9INmMQ0ZZd1JqZwK2IyWiy0n
-DNVJXqkzc3YjYZcrYiBb8dV7kvAf0E+UniIYTYtBU2rOWBM3aTT47Jh6ftss/tQ4
-e0HLeHZpvpWwJtkPHb1jGD/08icZH4XyVxIlEMhziuAZdBDTr7v7xSmqPrw49afW
-iXfROV01j94tFdvF48wDOIb3qIBBbsNddqMvHPTShq2wMHlnylVFM/0CJn/yxezB
-cuQfRVWeHg7lbzSt0HD29fBz7MlxoOSesmJCN+swoSy4nZ1nhWNHEaRh32Vn2H2q
-4ya0rZFEHk2fS6WWBMTh7cjinmklQVxAhB99d+EYCZ4SHu74Ats4LvAsdJwe5I9b
-lOIrYecwNwARAQABiQI8BBgBCAAmFiEEObZBND2MEEsrFG3D+cOdwLlphUQFAmCH
-QTYCGwwFCQa/Gu8ACgkQ+cOdwLlphUQt+Q/+PWBVFPl05+TbJBF+1yyFXeH3VFjd
-zwwKX+z5FgFcuO/ux4Tyef9nVUboiI9zCwEliczljyho+++Utzb2yG7sPwwsls9L
-eOA3eb4y9pTsjqEfu7jGIbtIIUGqPtet7x4m5Og38qyXnAFUaJz6JJiFqbhekeNk
-SPK/mIfySxkeHBCiyIuvWiAQYFzBYN6DsOKEjjW0HzayKoofKE6fTomaKvUNLs5e
-gyvpuJQA+jtF/UFMWHXwE1UF+CsYCmBRR8uVffYzKt1PAJV3HKhRgcrvUudxoMNs
-Ifl8VFlQeC6S0L3ZK/yyYW2hFyjpLEYwrIbSDRXzZyekhC12d5MRVpo+xqMhoZGY
-iSkFHDfvedjh7htEvjLEDPtolbzZTbdrCFTNnKbTkVAV7z6Sx2AaBX6tCPXycqRe
-I1nB1HqGFLOW9zT4a7FaDAy0o8glTx8ERPjbIBy9R1hIIB5ewyAAP1feG5Xfuj6q
-Vm7IlELvft1kGvB0gm9k3X+hnbwIVzzgvGuMvl5+NumrD8VcoJ7UvjsFDRsvpHIJ
-7zL2rEp4XZ8QwvqOSuYfbxWSTJoW5psyyHurBC4ZF67YFDLB0PiK/CyB4VxYHe79
-GU5ykN+r8SR1eavNndhUFo94I3QQ+999x0DvOhS54Uj4kKidZuZ70yDeh7761wO8
-wqWvQdQZUVULCQWZAg0EYGWinQEQAMQJ6RQqrrZgYJ6SIfzJPsC3zFd00C/UxLQo
-aaiAQHEPnEQgjnAPqkvspSE7MpmyAohbUzXVnDO+ycxznIkLz0yYjs/m1qVB6hTM
-w/PlD10ELoA6m3om/2E1vQQI78U3w3evBgVlGLzBIXWKLX7ZsBSm4xoPmD9mmisM
-sM0xhqQzVuGm0I81gvKkIlWHPB+TqUWBpvDwmIdCRuGis7810OBKaMmTQ/rdhg1T
-YZInZPfjeuW+oZ8Lqs4w3cfmyuDbbKQN8b1Qd2d9lJwkudI6KhIyH7uU0F1GeHIg
-i9hZJZZcnlDiqtcHZ5YYEUHEzD6rPAL0LoUFpS6dP4DFch8R4oBpW8XTjg2BzfwZ
-RCv1IuIgd6HhEUcuWj5QGMi6huCF/2WVDEoGs/K32Kyh+1Jg4OOOpuLP0/YqvsRO
-AMbdY80xppR2yMMtpTJPhs5aCykZ8ffHKEsh4VGvi+xFIwuOGElqXoALFPas8N+D
-5jXnJQR1/2zekei9YiM6jDXps0SIChBL6vG05cua6X5K+71YHHlDoUubb+tjiIHy
-FYtzEe1PPMiLl6XtAdqllLqUQvy+McHgdqNOIU+FxbWDWjDtZ5hlDdZ+sIlz3esG
-wl/zQQMdRdTsjcNuElOdl2pMmLlA8CvhJM+IkHVsIHponLtBqN0Ibrw+Sh1kX0sE
-cjkfrDSJABEBAAG0KFBhdHJpY2sgQWxsYWVydCA8cGF0cmlja2FsbGFlcnRAcGhw
-Lm5ldD6JAmUEEwEIADgWIQTx9pIjj7wWZuWlzNQZn53+9v+6/QUCYGWinQIbAwUL
-CQgHAgYVCgkICwIEFgIDAQIeAQIXgAAhCRAZn53+9v+6/RYhBPH2kiOPvBZm5aXM
-1Bmfnf72/7r9wugQAJuMXAsnTk2m4Esda1R66IaOx3hms49hTtoJ3XTkOP0z/Y89
-66mJ0Zp/tjhof74jRwN+Eo9R0Vc4WpuXdL6ZaOm6alc4hYsT+13bO1hNEXFP70OF
-3sithHac8wShdeutBdXGW/DcR8m7CXOsNWdQAlbYnCb3gt2zTp4DTrxmYVP4YptB
-sQBQtaTqHlO0K0UGoHEkqk5PbbOeuUvvBAyeSEvislOxeSCQakBXFVROKojd90Qb
-i6XFlNvZWzPgBHsrVRKuopgiNqfNAKz/n5ruhZcI4SKdni7zmv9CLiBO8P/qqzta
-9Wv52z669MgPRMfODJr7Q9pG6AZCAm99oKCUStX/adKGBnfu0mx/v0bIyK7YSWp/
-8l4ioiulBs04xeZ1S9T6nMEGry8k2qlErcGI59DAR08aOAbKs/42W70Eoxepx8pw
-S8KSyCfTCuF78bDdxXv3uutYb+A1AiHspu+esjJscgcXNRPYruQFBDUQ0aUzVrns
-bePX6i1ZXYkPUTSRs6Hu9K8sJQ+mr5dTEae28szDxfN9mPqlNGbsKc21CsXwOJhU
-IgU6a32gtZ7xq4g/A9DYHY1jSPhKi2q5JMbckQ2qzrl17zXhVISEcPTebQ0Qcu3Y
-S24+k/mAqIGCrlSnFtLOf6MPTtL8JpeW9fiuys2spb/pHhqmlCevbda8CUtLuQIN
-BGBlop0BEADLZJnHlI7dfEQ+thWKLLdLpd0MZBOugCqWjYdUfL89OY60W2C3Lrzg
-fewjiNLxBzwvqmgEYyQURtlV7o04LJVtyO1B2b7ZQYQoC6gu+KV5z+8w1EOs6G+M
-INda/QydjQk8ymChggGdHtWtGzTZ5K1js+e8wJgkF00n9YCxkkz+jJCK1L7w73vt
-YvS0qYea1UVxmGG+cBsfQ9GbweRl6TvSjlmLtl7m6h1cpGDQrnyyp/yrfONLby1t
-Q32lMhfH09XAPHpJWCfhv9dovgHHtb4Kroaj82UAZz2Je2Rn7SJiACLvezWEFTZM
-WClntlHqHIVtmasntzhzzgK6E1IH67DgWR3m82noLpmbYlHAOLmNBsOYRGdfOQG2
-8L25P3HrWV9APikwdPHg4/0tKLgNzhB6yO6dj5Hs/YRsJD0Jn9X+cCNasP5VTLOF
-sZD4J1i8jT8brlf/f367qOte3aFAPQq7OFYPvpFY/c0J0D6eb3FHCxfejVQL4YV4
-bg3HOUGynUeBGwHgyQJw/LY0LdCejokylQZr7Dj8H4l3b6x85UhJSKRoIin+c8aX
-iI7/2CJbFDAIv3sovyMsAhS+GyntxIpYmoAl0jrqRCr6CWCaFl1Tjh3xrJ+pRCSk
-TVq9OASHUqAb532B3Tt+DJzwrlf4qtQDFz7o7lPGXMnxYLW/KEa7QQARAQABiQJN
-BBgBCAAgFiEE8faSI4+8FmblpczUGZ+d/vb/uv0FAmBlop0CGwwAIQkQGZ+d/vb/
-uv0WIQTx9pIjj7wWZuWlzNQZn53+9v+6/ccvD/0RXb7doLc6YilekZcEqtvvCrgo
-/ZDbda1tjRbpQGyLy9J9whIdD7G7lSoGILSd8U18gCL7PZq96tGq75CDy89u0vI+
-IQ1WemRlfrBZb5qkSOGO2Yr/VYVxxjZbtYiM44aJyrehhA3MCvwzyP27iclH7N0X
-sXgJOF1p3AVEfuXHhAVSbR3tkLPe7osXKyDUgUCuvJIPLSglCqPHsm95Xch8PpUX
-JRemPpFnsPIlqDKu/vfIrDMZtnEFBog/afjA6sqmC8X2BTKF6Tiv8KKy0divkwsm
-dAq+We0vkkIMq1PMc2UkDLv8DujpF4TXMvBXO3AWoKPDNt6L7zMUdymto5TIIA9W
-sIbn+aGTfbfSflJlhlzJ53nyzl/x9ukFabwp7jjF6Vyh7KYMQE6ob16JWTo+AZY3
-mvKoUXw6jwGonaBjNkuR9Em/IyjXDx0tiKKaNPdVh8Tg8pcGNt3ssroEKWqLrUjW
-lrso/+QPeH2Gl5+NjQYSIcQOcYo/MGuiikA9GJu088+IgJ8bmTiFgMuq/ZLAuQ6g
-kpZBQXAN2hVIkV6H5IJwp8lbyf8GG0qBCk9Va03+PZjhZLu/fb9EzVmhyX95cENY
-NUE7QXQplsJZqchsBbjgQE38DWiZKT7uyRhZUCUD3h9ZIsYo63NrQNoA+xkz9tub
-+4cXQV6iJi/GqeBTcpkCDQRc/6jxARAA6399os7LWW0t8VwhEmjSj+1L14Ryh81Q
-PEM15P1DrUXagxeLu7FGmecm7r3/0CA3m6szhpIv9qZ8ifk1KZPYkKQUeFxJvfrt
-RfcfDew1Ynp4ansl4+jARv06GdOwkG7EiyVktSPyf0hGqLayeQhmqDl2cxPJuPO8
-JOSDISgk33rU94/QBWA2RRLSJtB3MZupY9Z6RvYMswyRbcYKWQlqZ09iZ4IDqeeO
-pl/YuIWECl/99bpEEoqFD9tNlpaY+mDy2ihT6RWe+4uefbSWfFEjxpGd+x1ccCKK
-qViYggEl0bw+S60RaS+5xEOG9wnuRrVRnVe9EbTYw2+xMdDsBaFl0qvLPY/66Bfe
-D+iZpA/dN2BrsOLLWk7CJ9yCgoHxL185GMLbQNy687bCeVUGDIBF56OKzGBA7bJi
-W6Z+XVkVX16li908TBnLy6DItYIqYFmSgGCAYviAmsq1v/dVOddpdAzDW4RfH5Fr
-BNopYM92FswF8NtDN+VstwWAUQA2IDX3fYwPimIV+xG8ebgVALy7nWkAdsFGPoZk
-UJa+x5Ln8WUOF37kMbNthd/uBelyeDZ2MU6/Eb+z54GOWijnw2l7bnlTysatJ88l
-0dezmN0OQ8Yn3SaDjMKNVs+kifqVlAhSip3/eIA4/3P3Bp/RWtakzN9nV/fUVWgc
-6hu6FzM6ozcAEQEAAbQlRGVyaWNrIFJldGhhbnMgPGdwZ0BkZXJpY2tyZXRoYW5z
-Lm5sPokCVAQTAQoAPhYhBFpSiAeB91Vgi/gV/JEN60b1PqMSBQJc/6l5AhsDBQkS
-zAMABQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEJEN60b1PqMSNQUP/2me0vxA
-BXrqn9uUr/09Cz+HWio7W3b901alD1amIKS4W8cKs1vNe5qHEQKH5Nd/LlYKuyKu
-agKWKrfLG7dguNAEVCya3zUqFiT71yh7BD8SvvUUTqgpTet4fHW8sr+rIYgvrXUV
-Prb4U5DvzVfMOBBO1QBFM1ZS6J7A8EeVmmyysYc36CPoYb/CB6yMe7G1pnE9tqoo
-A4hiHwfrb3t9TeSzKIbKTcuHtGgaxIosp/e3/eFZUi0zPVAQKLBA1rnUHejVb9cA
-RZQSIFpLBbUaGGBJSjNualoQOWPnHCuTy9yF6++B4ToLWLB5r9nQu70cdod21tLt
-p2BMpryKikpN6OIq5Kpj62uAGDu5b/lhhbQV5tp5gxabhIyfoCnLC6JMHwVsppIG
-1XsDtcM4IaFl3bl5Ol0+G0vuNru21e9ydGMHR153hPl5fszWCkWQhHXw728+vIZX
-4KI3uLbpJLDHWY8QGrwGpqPMcqObcepkskejpKZX2JtycoiOlntuMWfLLmL7S+Om
-YnFkOy8G0TctD45wLlfWtJDzRr2p7TDYcQ3oHf0OQMHAQ4qUJXLYyxlPja4PWiMV
-x5I9hLtXfJ4krKK/FJQDccFegBR8vhQVoQ0WFot/Vzo1qu488f0w0tAJDf16+w8W
-FhYnIbwfndGMgfu/nkAZ/NAkD/bAul9NGKBctCVEZXJpY2sgUmV0aGFucyAoUEhQ
-KSA8ZGVyaWNrQHBocC5uZXQ+iQJUBBMBCgA+FiEEWlKIB4H3VWCL+BX8kQ3rRvU+
-oxIFAlz/qWkCGwMFCRLMAwAFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQkQ3r
-RvU+oxJxzhAAx8TGL+IaTYEzEICUk2wBTISoSMuoF5eZU4x3ZviA6yWG1OLn98uL
-eCGjGCMFp1/OFGZfCe/QAVj7/eBZzPnvVj7JkUrPt4EpU0XOpVan9cVh9Yzds62H
-Q19WRJOnMYO7xzZcempmUsZ5oAGivRsJ42UhvHi409T/ZpRdyOtiWXmdBXIRK9G3
-OuLBhchvFIhAbjfYbFD+gVzdGThU6xHXAfnLoFuyzYIpXzgrDYdmfkskLmTd4meK
-oFVwcBnPWXxUJz1HNxPCI/dY8DUmWjqnb4qBU+JnLq16UmvEG2TdxpKivcoJH5la
-IVnAEa2A3answ7WU5yF7n5b9PH9xFsPJpcUc7+rc2F3D6eY8WY+tSSzyKxuRYF7h
-FeRifwSSjOMDp50kgUR2f/5gGRD8rDSKTtGq9pVDXtIPt2xEnY/SH6O8Mmusmk8/
-bS61t6HPjEZBGOO9LrYbVBcHCZAHRzWuFTIadyh+q330fXlCYHaHAZiN55TEDocj
-1XxlhiLcyRGwDtMnc2IOjJUjyxAXwFwVqVOGCFtop33tj4TCKmMD+NSeLWmCmDLj
-81t4r9+O2A2A8AhEMBCC7m9N6DlDdGMeOyzdDTUTp9cdbnLRc2qJNk8Q3C4/FI82
-SoJtOE0buvA9Jfz5GEU+V/ZEuMj+YYRCz6t3iFISCjxWlUTIH5Gw5A20KERlcmlj
-ayBSZXRoYW5zIDxkZXJpY2tAZGVyaWNrcmV0aGFucy5ubD6JAlQEEwEKAD4WIQRa
-UogHgfdVYIv4FfyRDetG9T6jEgUCXP+o8QIbAwUJEswDAAULCQgHAgYVCgkICwIE
-FgIDAQIeAQIXgAAKCRCRDetG9T6jEo2yD/9PNspNKjiGq0u7CBxY4XrFXYNzGVUJ
-UQxnCZk5o+K1zpU5VCV8XjXBrehwSe/17hAakl+5j+qFt/prORPHdXPyKyI+SM/O
-muc+1AjOU3OPApwrpX0AsYMdDi5BtpXiJ8RGBNEsKJN+hCikpNkUXVlbluvcytCX
-/je4TbnJdRFFSJCdP1YXAzrVbXCVFWgTU5g5SwPEpDxs9Qzvgg35PG/U5QiFSTCN
-CokT1Hdf+S2a+h5nxSnqm2Vn80NyNBy9y4kBBCkU18NzR96cWxiccshR8qS+7Tg1
-EIBFFnheZkR2MQukfxCHliX40pGipyHE5Kf8huYgNRiHsfdYIfzYQx8lfvwRNq38
-QrMihIfcBZfl6z096J6Aj6XiA5VqcKDdD0gVw77KCkRyzBtGt6kSqStF9JYE9RjB
-b375qPsvCVhW/alpScnRtJzVytDT9xeqe5F0V6/GhNvnlgBo3I2p+33gDb5TQOFw
-oidV46lXlAYo0sAbXJPw9ZZrHE661HQ9T5CLtJ+cadITX3638Sc6XcsdbD+upU2V
-1piQ9gUvgCNdYGjcYMXTfe4l7x+6pthE0lb7u+q/nyzTozez0xoCWygMJlETQXKn
-s6EnhMi3phAuUnhso3fWAvwtOgHW9QaL+rx5npad3wGyRo9xqTmrE/El8FgALXY2
-XfggH/zQhIwNIbQxRGVyaWNrIFJldGhhbnMgKEdpdEh1YikgPGdpdGh1YkBkZXJp
-Y2tyZXRoYW5zLm5sPokCVAQTAQoAPhYhBFpSiAeB91Vgi/gV/JEN60b1PqMSBQJc
-/6lWAhsDBQkSzAMABQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEJEN60b1PqMS
-jWUQALGWNAhYnuTTAIoKtwPsDab6kJV3TcBaiD5ezXXYX1WFEKMuLenYkCIzRuWO
-FkZR8Rr8iJj7viCPWV5bniicsKNq4Af8YIXq8Qnam30gSkHo+jGpzZYnDdFDajYa
-x7wVKMxUmPsC6RhfEk0JAFXhoqrFOrsuUw+bBC4LOvFzdufmS8klJq4krpYf1kp5
-CW6/DL38YRrmhq5djyiuA8iJPtylxcR+tXSmyGtgltCiHS4EdOOyG0hOsfkHPqIK
-d5Tb7J+pMGimCp/9YV1NINbFpWIG3pF6sopMLU5YHh0Wq7SgfDVmkuPxUaEChTVz
-S9y6k3DwhW7ZRpcSx9hDRwaHFw/eTuSdNH/7CpXKr0o/+zuvq+gpAHbPH1GfikoN
-B87lSdfUdM95QTveQjS+6IFbQR/5pCEAraZ97EP02A2o45nn2bV/gOvZRqqPuJZQ
-8rJ0ryqfxRWj/cRKrtt+k/n0dKQXJt/0g5s+IVgIHHoe5htzsXyjvxfpSL+vut8Y
-ftr8lyCzGqFUZaX5zpsgwpy4FMf93ttPYiQuG/pVD4dSxc347xL03rB+0F6YIv6S
-DKuA9Yy9bj2xRuJb5WmAlb67qwE7urGvgAkMXs3deVMWJ1oH5KB1t15mOU3Gund/
-q3WO21GQj7leALl4cV+oDXI+3z1idIMEWQWaoY2pT7PnUw5ruQINBFz/qPEBEACw
-WHa7KtEtx2KKghel9yLwLx44LRnuKWLjGNrHqjIy6RSWBcOKVUnewtlzr8ugAAE3
-qMXtGd3vCLpEtqDJ4RghBrV9YVLArr9ba4clmSgr1iDKZE4xjR71rkwEcrQA9Iqa
-faOQmTzj/MJoErYONat57CfArQs+Sd4SYJyLTZ+6HdSZVyM5tDooookToZaq/FHQ
-1gKtQVuIkM7229JaVo+4xQn8N+nQCsKvbl/9ATxXoxzsf2UxDsOOW+Mi9qAmSDdD
-pGIsWkFmvZnRPPnLXRkQiCcq703Zt/A5ake4JPLV3ZVvvzhvA37Qz8YE8Pud+jTL
-bvZ6eKh/X3XYkUGjtbDUPfY61HTbiLKcDYmEbtD9bPa9gePhNPXVcpVKd+r9UQJA
-+Oskt5zbNnOx1JCNIHKJ8s2ll62G4BcS76BnPSzCtGuDnW01xPj8Q5qEHwBcpKvW
-j4sRx6DSxhieeMm3FZ2ScCarz2vNY3smDJSc2lOWYlFgQwwzqAsxqA7Lb5VmYuSR
-KKEWB8XnQ2rcoAaUuCm8qU/zfa/yn97eZa9VKMMX9X7tcMAuYRD0fEmS9zjeX64h
-/+tZdQnUq2Jtthz4qInNs/lSSYhCTC5H9FZ9hFe5X7LiYnTws5o6TXejtXxItaYF
-/4Ltdsq/bT5gI/PNqP++iTQFjLDUUoG5S3U8/631+QARAQABiQI8BBgBCgAmFiEE
-WlKIB4H3VWCL+BX8kQ3rRvU+oxIFAlz/qPECGwwFCRLMAwAACgkQkQ3rRvU+oxIW
-mg/8CHGV74oqKrNf0ruUaHWfm1Lk++/CAp6uSZeMOkJST/4Nl5f2O3aPA7XVk4da
-vvHA3IrS053LM7xUUb0FnarKMlKg//3f6Jtvavege6zfG3qj/s6fS/8EgoZkS3sy
-wGHYzy299sgZKx7eF/pkVj/olgDQ/MpkM5scpDhY1rHjvhcR8sLM8O5DkOfyTaEi
-RuphMRF9G21pu3kIPf4C/4tMN0TmNBzd+9L6n4iQooVsxzAohjlIQl6DjnGM5U7I
-o3ufQqCuGOhJNdMPbuaH/ZtLxhnru1kZiHToPoGRDAW8YdjBnYIljW73RKPgMpkI
-iL56DXSsb87qKBLZ3aBkjZO2NxT3GUPbCAYQ/b5JQ0Oeu2wbfYDZ8lr+rATED/9Z
-6mrmPPgmVg+EmXpX3byBlfLvWuknZQgEFyZEiQUNWsPX1ML+VXUS9VkHYngZ6PDS
-PREP+rN/XwsNaCKg76Dx3Vcxq+0Nj9c6qEPoiC4eQGa7iSc7ylHsYlQ9qLrwSBXm
-OoGSnFkpToyEi33SA2FqZqLIvG1+z7sqiTiWbTdjZ8GShAwZDDnsbNUxue9YiYFN
-UwEkJhcxkApawGhNtWkbDtTrvRRAHZ58CMDMRvpaKfGcpF+RlyRumTlEChpi+vNX
-3Uyor2raD12YolIUGbjVdj3vYRkwdvoQ3cZJpZZLHyT9nDWZAg0EWxcHQgEQAJrY
-yC/KKIzplzkKtuc6jCpUT2LMovFvUHp+OdCMN+K1SgveBhxsHgK10fx9Ki1Uvo2W
-jhUAw1reQk/g06wiusJW0bZ2W5rKQKUPJH2JLEJcVdJAVdq2vGTdsVNkvia8O0XX
-zN0tGb2juyjX1HPXUJ5jRBsiPrppeK6+NEizQmj4WYBF6wfsEalJdQ8g7nSR4p9s
-HdotI+6ug6hxStcjK/wwFLRqpYwZQLDbRJVVMDAXIVLmmg8CP4VarIsF+PEv9ioC
-EaT2yynFVYShmbU2XmUJSlatXaHhS3/C6IkKtOWZdU2Z2Yg0OyAUssikXYDV8bNO
-dlSq+0gz+xwmglKGYwMxs1S+CtSnSwbuwmLvN2VMRWDCN4CLYRezmkNW03U2OXRx
-rME6qlk82VNcLjpJnc1AVWBF/Wi4K+sG32e+uoTa7vZD4p5YmfgMRwe3sa6KCNgb
-ufin5idIttHB/ZOZdyIMvxMqEBkjgCOHArLDFLMeMe364uBt7c2MLCPH6+v584Rd
-rOz+Yl8AvKg3+izX6lwXE2VrC/6fkXlW7Z0+gES8YmNd++si5JOjDGqQhJ6h/r9u
-ZVGLYk1LpgExgHxGhG1WXISIrGBd0kqFdkHYAIgTZ929grdv4tFpz4+rSBxTBlwd
-PCKselkX3b0S5hSqAGsyFL/UT+l7h5vlLvTJe6W5ABEBAAG0IUNocmlzdG9waCBN
-LiBCZWNrZXIgPGNtYkBwaHAubmV0PokCVAQTAQgAPhYhBMuvafFzoP6ktTf0cNZs
-lZMRi8y2BQJbFwdCAhsDBQkHhM4ABQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJ
-ENZslZMRi8y2o4MP/14vXeLNCNNtnhpbknRUVXrORcKZsDTyTHLx4BJvae9DsB0G
-lzGI4xlkWFXRW9o1/3xG/sHpg1hQ2o5qAKPN8IAJBRm+O/cbyYxX5Jowy1l+vipt
-93ZS9h+L2nEWk+hBT6hnf23u5po5JKPCEWgAqZxCnFivP5/STND9CZ5fXlTMXGYR
-mehI/uGQ1k8qXMLVCG75mMxIbtXVnl0NIoq/mnT8kNWs2y17EKrbhX6tKVdOzsQI
-SZ1CN0+SJeYrfCjvlVnCFQS/wG3OfmfsXIMtXR02sLffhai54jIM/DndaGrsNxay
-GqScMVMnhkU8Tk1M92fwph3JaMlT7mik+fndWkQZtKAuu9j7CNmFhd19UKPbx+Fp
-LIEccYyn0jh0Rngc8Js3ZhIAjaCNpSjJTIuWcNwRdks0hHSuvsK32C+YpakF1G7O
-WWFSSy/p7VGXNR6R/sZgn7oC0qd954BGyaMhxmM7fezhcFYCSNG5D+jG2Ri5KtcF
-Jcuw4tKXDxT1wg0pmk0tLH+ZNPw307Wdzrjqpz5TrYzLTiycxbl+uo4btKe742rl
-uSXVaqx5bVpx6o1i42lGevCjq/n6oBbM78n8gTc4vPrdPjRYONviTplNipLol47h
-rPG2yakoe0PqYKFLm7CzHbL64a3ZCK9K/XWth8OUJbDUGWRHnVZ5tpxQqYR2uQIN
-BFsXB0IBEADDWz0jKxhy7ARP8K38vBwajJGTbwiuyiUNm/ShCWhmu/JgECQoKJa7
-gd/DpzZgjkA/7fTFGrF//AH8CK2kX/9TDnkLsjsT0Wlm66MOtMyz4HYkTjJHHFqQ
-UgyoVhU2xFAp2snVgZLdV7ySoz++t3t9lSu8fUUzqdf07ufX+A4HXzgI6/2A+xzv
-bvkWY/j18XE2ME13xiBXitdZGqVLLD02i/OaaQHYi1PEalfLnWtMBPu5oQd+2VTt
-6bYsEOPjCOYfXXw7UTvGtOXOHE5wt0mZB28yBv8oZjsNpa36FHW90O+8KGBmrz5X
-5c0MuilAnrfGdFaU1cnSFeGyEGdfsG2FzwPL9vfIVX14f92JzcppfwlOjm/vzONj
-OE2/GbAOaCG9ppP37yfGmsSftLu4MpBsqSkKB/QlGncwP9tww+swe17DWMKmtm6C
-0uSb3dbTb/QNdzWEEz5ZYAU4Aq8Y1Sc8QRlqSgRLmBsvffX4vQsg70r0khp3Ari/
-tcBAkWnnkkOg1xPB0/DGEhOzEIChjImtLghIkYXeVWJcfcR4fPrEcs37V8PR0WWK
-s4gNEKy7nBelcB4EfPjEXEYjiAXCzzF5CaoY4uob5RXtvOp20Xv6+thPKFAhuDdP
-XLxOGLYJ5/uhk7lElEhTaQ7PqxRsCcWDtf4OZEhOl1ag2G3TEXx/8QARAQABiQI8
-BBgBCAAmFiEEy69p8XOg/qS1N/Rw1myVkxGLzLYFAlsXB0ICGwwFCQeEzgAACgkQ
-1myVkxGLzLZwBw/+Osh1vCAHiFUakQ2VPXzHe1wYbZPLbN+8as8O/pF/U6DzwO4Q
-KUxjwbMrIFs2t0OucldFgJUjNHxQmKSdeq4x+NNhcZegobY8CIEdsWsXle4jZukq
-DP+83xbH0z6AWZI3GuRvNCVg3KN4RRIFCOmBkdfmiGMXZq0tQgFWYFZ+o3R7FPt0
-eZ1Vm34TiG5zRcyZfWqWZtmow9yPYCcV0Xfb7H85H3f3M5xter9LXxbf0XXdPnlW
-wZw7iuNgMjgtjUbWiidE/KRVCxEUGzARw7kV12EYESA13z1PYFY5n2evaXw0jCkD
-JKtBJ/2HjkL7ruNDkKOtR/1/8D6b/yuKHZQXmLnJ3791yOtNnH064lALDeyZWorb
-lSTyblBZmCsw2LKq0OyXEzPkY6KwPWI0oXOc2OSjcYTEIaXMOYACubQ1AeSol9cQ
-U7zrIsCRoDN6hI6ENSVsukt8BTRuInHxFIwrmsd00RMsEdtRjfnmvvpLB4YeW7aI
-CojEQ4S9Rec5HhbjbS7LcNGVBjgwh5EuA0qQWtjd8cOi3SHlKu9p7vgTaiwuhaH3
-km6Ntuy4xUSuuDA7/WHKxWOaR2JTZQ+QfUUH+JAfM/QUYK7lJAH7v4DaCraEFJND
-O2qA/HKCscuFvMFXKZyf3Il33omfBV7l3UGvEWXFx8MMb8YEapUHwyy5+aOZAy4E
-T2apoBEIAIVKpwaY26eSNBC7df7JedOYV4SS8zgldlM4F1HxoR680aaYUR/K+NoO
-NaL2FzCngT+Vi0L4/tWxWMzU5Jf16rSML+UYvRnJFd6T6Y3LSfkfU1K5Ol/1jXws
-yqFzgb5FT4tw2Jn0rQMm44680s/Fbs4dmC7FvfB0o9c1VraPJF8kAqba5okkxPWZ
-OYVP1rRDxIqv6ZSusmS4bQfajpLOsq3xbCiKe3V6HrvNWwlom1AVyGcRmeVrAhyo
-/bILicsZHcyS5ujDGgQFgJl63XxodVVFu+kbZC2hvwu7nGuwZuZfKZOQdN2m+R9w
-kUANrwzM4v3TM7FfBsZ9shk6WHkSfyMBAJeV+fHZ5AvcFJb/pcA1rnV1taISnV3U
-ECSkYq1m+WTRB/4z1YCL71pcx7fE/mSvG2CdE1R/ZY3pl3LYzEvVFEkIVvK0uGXS
-uicLj0GwZhUayF0QfzGEFuIg4kq5Vn8NOX1sSbs/1zsILuInJUKSFQCGi4frHNlA
-0tH5FT5B5tjNfKlV+X31CTsR0yav9YBkIcu69qfKp6kLkQGxrdWcB9B6ZI2gF4YE
-pZYuI6w+O9Lvb7LXPhFQwB9cefiX+wUy3zO3v/vgCYk/Bmq5XjWniY87XZXj7E/J
-zpGwHzix+yTZBWK9TzDwCS8ZB5iNejPsjBqj3n59a15XNnfopFC9RyQ/ykaMeUNe
-cfEnQcjUj+Q4FlKPBHBR/R13vfLp6s+FsuT6B/410jcf0oYkHMbn+tXJYrBR5D13
-m53iNMlGRAa8A/mmDvq8Rr12iBul7hbln7QF9uIlKdCZBZIeJl12P+3fem1u6njg
-KTplOB2WYVgwsXWFHjs8hlMMoRES4pgZyL++ryydm8Qk/1gLD9O2Idwx2swpxj/4
-unyVA7QYcs8H2CVWGcLR1vqXVemDUIwjz9GjMExyKPfQSABOCAL/LbNuKoAWhL0U
-32dc9t7imFK2oAETJ5n6de523s9RhONWByuqjxsdkKKwGhtYLs6crJTPFXHNR64+
-Qh+Zm7OQtozDYxxB2/DCw29DQPNos/fRzVeyb/sQhglw5anOVUnlCt2YTT8FtDJT
-dGFuaXNsYXYgTWFseXNoZXYgKFBIUCBrZXkpIDxzbWFseXNoZXZAZ21haWwuY29t
-Poh6BBMRCAAiBQJPZqq0AhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAv
-eVa8XaBLXZczAP0e5EiiVLAgrvu7wRjjrXLa7qxtffqfn+6j8sNC7GiLewD/Qy+m
-e/M6G/0i5+++xkSPcTuLeH6IPnrjxgzB9MUKKP60K1N0YW5pc2xhdiBNYWx5c2hl
-diAoUEhQIGtleSkgPHN0YXNAcGhwLm5ldD6IegQTEQgAIgUCT2apoAIbAwYLCQgH
-AwIGFQgCCQoLBBYCAwECHgECF4AACgkQL3lWvF2gS12F2wD/WpBvlFluHo+UhV4c
-IUULd8y/LnrAnUoLSSeGmHJl1wYA/1tAWFYZvHKUWfvGadsnZulr7Rh/NFbBuCZ4
-hKhki1DVtDVTdGFuaXNsYXYgTWFseXNoZXYgKFBIUCBrZXkpIDxzbWFseXNoZXZA
-c3VnYXJjcm0uY29tPoh6BBMRCAAiBQJPZqqdAhsDBgsJCAcDAgYVCAIJCgsEFgID
-AQIeAQIXgAAKCRAveVa8XaBLXWuhAP9L9/cztiAKFozxIC3v2IA+8uJ6mVQGBiC4
-4mMdzXpADQD8CbSaMqY2rdbk/S4D+8H6WIIRwwt1xmI4iw0jjh4ePk+5Ag0ET2ap
-oBAIAN9k8ymNmSQZmPcFj/sCmguribCrNuH4KktfA2fbS0U29Jd9vxF15e9URvtJ
-zH5b2pimJq6faJcmAJUfx+ClmlHznq6VPWrq4Ib74Je5sS+Kn94mRmX3f/ziHTgp
-AnCyA6sCHQ6bc549Gfw+v777Qs1LQQvy5f9gd5M4Y6eeZOphN7JIFUV2i/oviZ6l
-11+N6SJwpCqEvuZmH/G6rb0mKNPS401fy/i8NZAO7l2UBx1364HeBxcwP8+CKcPX
-XOn7rC2tYKb/7IGqm8PBdBfk8ZSfC9tF+XsDLcybCaheJ5xkyDR3BNJzt7SWEHgc
-ZEdl0EwkHisdRUZ3Oq6Mr9y06+sAAwUH/RS1vvpB7qwIyUfFUCZ4T99ujs+LTlu1
-n/HTWvrt0d9oxI/SuIIonszQ5b6MBe2737P8FWdiKxbrtZZ/GXZxLm1kOCIeAkBF
-dZQ47vb6xJwc/wpCZOXXPXqDIpvBjdKbIGTByk4vfmeFRY0vL3ezI+hjqxlROKSv
-Ztli6QcNDfdcE+zh7oxtYp+xr2ppWaeU4XeTlSoKGO618doRrhDtU/jAEimmEcGL
-0wjXqgkjPME9saXa6h52PCJnpB5BmdK45VhnFTZ3eVEDw+u18U3VVKWkSb9VwC+2
-J4dRhYc3TA675yndKWvlclU2NOMmGXbxKWKcwwTniYoAZ/Yt2v91HBeIYQQYEQgA
-CQUCT2apoAIbDAAKCRAveVa8XaBLXboRAP9VV3cWCMsqCUKVFA/N19Tzju2oMrjM
-mNuZG/m8svCgTQD7ButCzuNUZTc2tLQAiXm9SZ7CmnYErNKR6nLbedaZ6PCZAg0E
-Xrb0LgEQAOX87ju0d9lqnpjc/B8j3/jB79MPAkuoE/yMzPcAfyzl7ytYcgjBclqj
-U1YWR3hWdJKI0Qx59+Ss1anIJuOvTo0Saanj0YJSlDCFPUO5C7wuEqh4+EgacAiy
-23LUtunKVJ9MQ7t+TtKeRijI84KK58RcM4ukHHwbCb9ww1mEUjTlcJBJ/n70iNoT
-GKGCZ18IpyFvK8atSf1jt67k9hS2wS7VJNqw3Orm6xJDqGi3fMFtWg9ErxrtNkIM
-YmrO+ofRsilUcpUrEDyv2Q/FNviOVE9BXzVVJ7zxOCwjMNJ4ao6Ezk0NOZU36qv0
-Bg8B3IWN6axWMwUQvfh0SAzZUGxfzuraG86Rj1z21PJwJxQATIRhERfm118EAVxw
-P/xz0Nwrr044Hx0Wi8mX6qi0B5d1rf08VAUoJ/Bhr7Lfbpjbi0z4mvwZh+ydRrow
-Doff+g0IAamzRVmcFVFyOdLM2iM9z10Ds6dPvi6QVvTMZfrE3l1MIpFb+YuOeU5A
-QFbl0so2HaWP1TMb/0pQjhXh9WwSOfwjG1QyEibs4CxSMbJ2TwPYLNo9QQZnBdPM
-PBUfa0Jkahw+NnztHjENsHbsr/ic1Zvi7HuaUTCKzm1oGeiIqIBXtH8WrQsQlAWi
-JdEvu2YkKAyjxUOD9reL4a8NbGve1MeNC1T4onX5OqJ/dCsnnd19ABEBAAG0OEdh
-YnJpZWwgQ2FydXNvIChSZWxlYXNlIE1hbmFnZXIpIDxjYXJ1c29nYWJyaWVsQHBo
-cC5uZXQ+iQJUBBMBCAA+FiEEv93ShkKCT4EY73eQm2elwSIpEY8FAl629C4CGwMF
-CQeEzgAFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQm2elwSIpEY93YRAAorek
-8NdIxkegDBXSrVVR0wA3FsT7tMT25cVDHpV0NnGVoRYRQW65rjW7zPAKHe/oXk6M
-OuVbCg9Gr9znJa/KlQHsi0Hsv+6+w6rLpXw8aQfikfFgLIVOELY6/MoVcao2vEXv
-Q0gDPo3JKVA+W7lMrY+sLUyJcww9yI1181qBJRlAp5wwyKPiqNExHKlxRklMSR6v
-gJHocL7hSWcGPpSmKMqq5oZkwB73mhEktXAI6yEuAeOKEx7XarBfWeN4BCo9BHgp
-nslR5pjgzWjKbHK5k+XBS0ApKi4dDuzuDcodqhIhqUhrFj04LGznYfnLa7IVuupI
-NVY+HX/OBd9+a7qEH+hF7IOGFwfjv5xOCfbdzDzp3v4G6mluzTmDxByNta/T30hF
-tWmKsqY5FP7ip1eN6//DvhZlQVcpbs8WEeivo8BRvbMBy6tW/hFMhWxEPrA+i9Qq
-CRt0l5f29smtnJyCcZPi3AvtZI8qK+fgFgEinbz+NnOXY62JLJl/+GucSoWnx9rg
-OJb2ZEDcTFuN8JCo4YxPAvACSPib4CF03nnFhAuyP/qnPcDKwFGhLUT++3FIilEA
-CZ/dSGEylGQqTSYDl/gyxCpHslnZt6f2T8ZMd4fuqyrNvWT6sTARjwX3VCCwHNPn
-M7ik9DWsgZM3gIFrtBwkfd9zeL2tgxgC25WWkJS5Ag0EXrb0LgEQAN1a0LLbJ+fK
-NIFqwxsjNM5X5YdyPQMkkM0mMZzLgZMz3yCSUFw/ZbfD6ZqRfpxugek39M2l8BRA
-8eWo0TiFAq2HdD9yXBfqiWc1DFL0ZkVgJtSM8czE4IX1EON7BRwin0BkOChn+PE0
-JWKdvrjyo6bZ995YFyNkA3GlUxSyoAhaivPFfrSoKBUSXSiZBk9KzdrS5k76ZlhE
-73Vej1S5XCz+Ssqj6X683iDqTWlkXaUJ8EAnwv+b81zPmnjfxnAWYxa/Hi+vGWxD
-gDhP4El+XJSLjcEB5JWt0a1UkSKXigz7LkYib1s091mIkTPsNmtsh5c2opGMoWJd
-wbZvyqgM3VqrlCIkLdGiThqvhh85kKkvgg1Bicg0d00vmWlzJ4MFhkbt0pTLY7hp
-+e+PF3gWey9inmqbiz52Xag8PQav7opOi1fb95Wvi/BkMZ6v5nmjxzQEe+HaF4Uj
-ZG1fFwVp3Hss2V2DvT2QAzz/JV1Aj0aNFo37VAVebKqkdrxNCRQQg4p630kwEImR
-wJTYY8tVNUlVQPbdVwkYJvdhXjsVXApPoxBhU20S5qevxMiI/2FhEHHgm5PmokSa
-XiDgII7Gm4sUgoAreslvOmydpQeGKSOU5gZ1MQtvfBvdcQQfV1klnCTtYQMV/6lN
-UXEx9LlXzaQ3/Ah0LC0XSV+8B9zz/A0FABEBAAGJAjwEGAEIACYWIQS/3dKGQoJP
-gRjvd5CbZ6XBIikRjwUCXrb0LgIbDAUJB4TOAAAKCRCbZ6XBIikRj1+vD/9KA9Ev
-HdPNyDk8jU/dUvPYKqLcQTKA0cBpDcv9+N0bfVFijBtw8Hpyg+23Q0XxJuwpgL7N
-72HLxCJzrpfIyucc5j99+Wrh1wrbqdynkKJ9hM24lMhj2ZHaP42oN6At4unLFGh8
-0a+YkJFjTxh9jORvtjXpQjzq+j+8isQ5i71yT9WTzesJBhtrLMVQrgOND5E6AS/I
-uUEjOHt3INuG2HFJp0jRtdlBT9ZLB+zoTJIIMARUqZGZTgF+rehVIsTXed7fdWid
-MK9GKN9SU+cBWZ3vcb37lDph8bCmRb/aGlby5hBUy6KwrSXF/V6VsyqWiccXzt99
-Dq0BfuSE+VCKYjHToyw4j9gnlrZdH2NMwyUgicKbc8GLbxGS6tzYrSy2MD+BILQD
-+cnpGgAyD2kbcEm6ghGWLTTi11cotcr0uXCLiPZwWG28ychx9HxXvvNUNArvDSmP
-26uZqo/WZFYukaaFLltQocI5PEAkx2K4N+xb0y5Ht/8M+XNO/t/pAR+yHWNUpZUg
-bZ0dujm5hPdVA9U51cyHMCucOl0sN0+oO26re7e0ZTnImjF6HBzgN5LhDmccoT4r
-pOFJqrW77hOMhvIUkg5n4Sd63wbB88BKsPXF6mRUEPcHuvwLr5jAE8QSW6sLhphA
-bh57GXdFtudEaKvQbGW9yalYwuj7Yip5XJGttg==
-=XZOV
+mQINBGBlJjMBEAC2wbO/PIAzVSAp2kk7MXmzoXVRSPyEbnjN6qm77nrzvugh/beP
+ZucG6lbXMxRsCj4GS9xLcGZoSQZhT/2GJdy+aUt7zf6sympJUTcgPdEVmf5uTxWn
+QkBg0Bdm6h8xwvgTZVrdfwy7f7jfAsGSXKzEmJfJ2L6LHmAMI3I+csdPqKBHSzj6
+hYjZYcwXSp2TAISkpKKmV9kpkY3ZKDoJCdDb5Q6bzy4xK+BI7XFbIMLWCEkfpUas
+GXlPoV/9qvWWr3SGtnKjE5VjoVgA5iqgMUymyd2L9z3Bqy8+mKtmdxXyXg3O0o68
+xG9o7pcjoavVbRWiqE9TqZcwar+42KoL6BchWYlMveZ9RO6X+umq9wGJjR3G99PE
+cHtF6WomMXGieLqbUz/WW0GioL37vkqKMZYZ0tyITiJZf7am2J4Tigyq8kk1HG6r
+mSbXSSOBcIXWv+aVnnTM14HKjsbf6jx91Vd/54yD7hyozwEutb4+Cz/O3R9Z3V6p
+/OfcnATLXCdDg1hYNjWoz6TZclxGTpZJp7TevqEBhqQ8ua/QXHJyF6za3VFYXI4C
+2XtaV6X6c7H2SvRphsnnVZEMWSBsZecW+u931eamQizz5dmWW7jCtQqD/rcybqo+
+PetszW+Drsxg3zF9dPM3H+G1Xc4RIL1K4PhRrrpl+HwZtsOgUiJLMgrXPwARAQAB
+tCNQaWVycmljayBDaGFycm9uIDxwaWVycmlja0BwaHAubmV0PokCTgQTAQgAOBYh
+BBGYwBF1k0l6XsXBmShq8fmJdGncBQJicJ29AhsDBQsJCAcCBhUICQoLAgQWAgMB
+Ah4BAheAAAoJEChq8fmJdGnchjkP/iYwps3xV3I/KJKSBNUHdm7obMuXW1qnDZ/O
+XNh5L28T0Py8XTdSyF0T2EpBvSq0yiRuVpTVwE8aspZY+q/HSwltIBnHr1gp9kCI
+lZ8exWC8BPB8yByqWl0YepGcQSfx8q1rT5UvcYrBdb9ocCd0noktPmonaqoyhrxW
+qFPkJwejtMncJ8xcPDt0jlOIT8w4g+5FQTDLDYleozYZOpKlfV3P88w8/9QczYEy
+BPXtNJIvqDr0mEc1Vyu5jKlAc3EU4FaqDmU/yJe62pL9InoUkRZ8pfuAvJ90D9mP
+TnW22rITWL+WJV8u2LxDh5lff7+1tCfrxPeO1CJjJL9OOr3/y3nS3UHvgVcJ7z/C
+VJwGlNrOeAlPGQMVj2Q1JxiBoJ/B1r39kX1OaEn+saiqmP4gfWdYfJTqS8vKWeCu
+vn+A2qDCZzSDj+fa3BhxtYGCxNfwBMtKjF1EXz2Er1+clIVLqlenctEysyuSIeD+
+wW4OSISIrwC3ezR4wWnIGACYMm6Iai020k+814wjqAASM0qUx/TxBdvKCqGHM7UE
+Vg8deDxDBxQi1eJ5faF2QzJJeZUuAFD8hpJYBAjHiI724ogySUaXNsTtmRIwsytT
+umdYFck67s31piygsLHutz/0Lx16yjyxtC+TPC7nmszKJN7Xgm8fq0U5VCumMswH
+JeeHMVqrtDJQaWVycmljayBDaGFycm9uIChQaWVycmljayBQSFApIDxwaWVycmlj
+a0BwaHAubmV0PokCTgQTAQoAOAIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgBYh
+BBGYwBF1k0l6XsXBmShq8fmJdGncBQJic0zgAAoJEChq8fmJdGncIWwP/RFhFn+2
+/X+dhZGy0SDwdvPA+dGXGiAEMC9BloT/CjZbVcMQ3tlA5A9Zytuyi1FBe09AJbLH
+O4ba4XMZmNCxd2WISLPC1zjgemjWz5bryYFfRxA8Z1iqQn4z+kHlcLMpNeFsmuYW
+Px/aW5mV1STdGv9pUHv98u3cOWNg56qRhoD0ktZ0lBoQjqxdcJpfObTC1VKD+B+N
+Ml3QkBlzXRwmNk5Q5qlmxG+38EHU3hPPAxHhP+UupuW+M7OTFuW2WGAx0zp4D7eI
+++5ViM4uW2ZNQYeKhLbAoSVO8PvPgCIx/n++pSOenO1HbYkk5oNU1ypF1JSg5eKe
+KPMmmB3dEaII3ImJ0c8zJ+rg75gqxIzm7yi8kPRZeE7mLX6IpDuMvfuhn+DUqS6R
+CRuOT7Q/0AxIaivUnBrVl+0P9MAH7h+dsz28DJ0SeBHeOQailbPE+Dm8QroDQYUN
+hjlmkVwdes8f6IUhal9X20zxVkEAzw5qkN9twh+tvEvich/m9idrhExVLeUKTOjg
+xOe17OQkJs45pdqmKt3otzNJTBgEOeMYHFMSsd7pewDONjxACo0jj6/QipNK1mad
+7RTR96nerqCYSKqP5HDpq4FYUU/bLKxyt771Ir0jULSUfqkclwlsvIYvuQlnZmpS
+UYS04vIH6SDqEMMr4S/0+kNRme4V3v8+80kXuQINBGBlJjMBEADtm6XiVTQIq5Up
+NUXpaudyuuMEjkE1hI7hy/j4OL+dv8XbjJv3tKNOHncJUd+dixXBHBriWZUlNYrc
+xtEMJbxPs4jw9CuZafK6Tnt7n6cbKGG/RTnPwvDL+jOGp+1n3aBHupCaC69RBclP
+0evYNT9rzqAy4NIc9AFLECHy4pbdBQKEz9A66TNUlbV6RijhIWCju9vvVrQgwE9M
+2XWXT/RukJkmnwwWilGTCk2/Z9BRczZyUS6edD1gp66FBqlpEF582PnL+7oAtjww
+Y8NBYgXkQmTEwvvTj4hj1VTsf/ygZc8N2TNi2sX6ffYFaSJFd4xxfKT0DIdUckI2
+0m+zxLMweVZOvb6kFV53/wKDD/9LfKCp8mvvfrSUjlrkKtNtJvbxQjRAhhRTpGaF
+0jDOmREXPlHn5r/BPsFylX24FJt2WsFna2ORt3gosm2PkXy3p5r/W1VdqwgRVFxA
+iV6zzEPAUppY/UeXwGVrbXMsIb1oFtpPgbT0Cu4tj3pPVse87cW9bUlBcTl7XW3K
+hlXuEwOho6jcUIzqno6s45tPOKt3tL9epIFWEN5X+Y5Bx4Pt4pecwYxPevqu99yT
+JYOls0uqdee9TzPIudIbcLysZvQH8J8EfM5urqUQcCOmXPJjeaSmteTdOlCn124f
+eXd6m50dZOee4DpoaZLOxxERUJjG5wARAQABiQI2BBgBCAAgAhsMFiEEEZjAEXWT
+SXpexcGZKGrx+Yl0adwFAmJv7usACgkQKGrx+Yl0adx3Ew/9FGoms1QQzlGD/xla
+QCswyEDNlmFls7ft44ss9RgfMEJCZTb+5e/niDXGHFikZqX2YjebIo2zF0iRN7g9
+9El57gobnxFPoxJTHz+9aNM0Mk0+6yhEWekJrzOePDoxt7Zkk/NGaQQ+tvQJ3nB4
+ZOqz8M6HaLj0Ssf0gQTwOp6CXZ/JsnNxY9QVCQxeQgSGi+kgUq3kdJ1xbIae4ZrG
+HOOgda4YIo9HO2IhTZY1qKWV2FHAunq1WlhVbGbFPuXXkzOKBZe5iK5Lh4bQBO5A
+dTGzg8mMvUr6DaS5vEfniGFjc5pdPaiWHhgtak9yplrSnSVc9GJRdvql8l0lTDGk
+bGdSpw++0De2S0zrs7A1OLabATxYoYoUjcMe2Q0bfLmGf864eG95PJK7gMUAQW+W
+APAkCGs9NHi4y7MHSEJwAibzYSmK1XTtoPWzzNnQMiu4ehnZJZVU1MGV+t4E/50C
+AgblTkdF0FQc9LiZRAEIeaa5qF7ggc+1CL/o0eDKlb2+WIN3pMUYjqON7iCTRf/S
+O0mKkSRf0F4VNBcPjoOdRCnnnmDaV8NN/jXmWflV8QaGRa9LsrT25Dj3818Q0r6s
+sbrDylaLrWEKuZ19TQ1TpNAEH9lPCmtNHWKsBPU1GFH+T2CUy4kM43jWJ5LZli/n
+wpxdIIyaoaS8NSuPIrV1g4SUXYs=
+=fB6k
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGCHQTYBEAC6IU9aXEpVuLJNAzXwL7q9Vt1PkxJHr7kJynUg/3ISrOdJy2Eb
+ola7GbEdvLZ69o+NbsL5vmOmT2AD0pEGfMgE9KWJ122iEfN4hrWThz+sHcVd/TKX
+9E98g+HTpoJGtYcp6jYxG0YRP7dn1zSn9CawVJpMsoS2G0JZB/q2lIELoPRLMjic
+RDBEfamTPi3vyYiuf4vvCcYYz3AEMYirt5f7rBrVOs3FVBozEqrN2fPRWvFgTnhs
+Q8MEiq5/DMsnxFq2wgheAKPIAXhZiJFoKHsrpiAANEmGZBY2pbW05rBY1ZmJpi1y
+CrSk582cdPo2Ca+NrNEPJ9spoEinAtApp/orirJYbjKViWqmh7mYYyv/NAQKwGBE
+1up3tSGVj0rKG3f9seLvYsApHf0lhEQN/ypzC+pYDlSXzWxcQ8bifixb6XulaEgB
+5XOHwuvpTK6HoNNdZM44Fl+B/eAXaebL6Vh0P1EN/2DBr4FGNb8vlXdvGxs7rJbJ
+8+aNmYeNIdg5qbYubNsO2fU7yw9kTDNTej63Ql1a0Md2wfZze8dZy6LJ/tL//IH3
+JPd0jvT1y0LVIKoYVrIfv06zolVplqi72zfec1kpw0VR6dT/LyhBlyNumqJMRHdZ
+lX4pUCpx79pOonjHNTNuhjOPLlzai0ooWBtloDZfNGoFRVNNJv/hGvVM+wARAQAB
+tBtCZW4gUmFtc2V5IDxyYW1zZXlAcGhwLm5ldD6JAlQEEwEIAD4CGwMFCwkIBwIG
+FQoJCAsCBBYCAwECHgECF4AWIQQ5tkE0PYwQSysUbcP5w53AuWmFRAUCYoZZgwUJ
+CJ09uAAKCRD5w53AuWmFRPRlD/0f0JsjsWCF4YziRpBe8LCs52o0VrtNMUW206Hz
+a6CXI3AHLXHXeCmYwU0LpEC3vssA6vatMhrPKnbzVXaERJ8JCu7HyHP7piYU5lnW
+6JY8NO8fjT85+9cS7IvMQ09ddypUnoD0i+rX5Eg6p7+Cqx0CW+B2CXsfcIXJ81vy
+kdNeW4h+g4nx0H00cOF6oXnJ3ojQn3WjTE0W9Qz+FEqyQBSJSCvM8ILiT9ImJykn
+iJ1gQB4K6FHKy7nFAHQX6EHQER0KJ5ZJUNstasYdZuKorR9DHlCus16E2ABIFTGC
+SDduoBWjKAUXdff9Vh/KdodiHHnLGghQT1qSNY278/YfO+nCwujfYYWT2RX7GeAQ
+XuCMOd3hIZYAXZuWmukkaG7YSiPKvPQ6CrsOaJP7RCv1mPUBc5Ew4YkB3cn7m6KY
+1VaWpGjWJiTBekjZbuwXy7+cnP6R6+8+QQOuFilHeACSlhLTe57tiwJeI7Yb9t1J
+yfMdctHv2TNZua/f5XkUM+LhalxAWvGNPyKafDgZ0FjWo5jh6juOBOPwTl69PRWJ
+tdoguS9lfE8S+h4FPpy0XrYLLBSFka/TV4XpSE3Xyjoouqq2yz+rkK4xV5y5y6oC
+ge9oElwmHRyxJ8LbJJKil7QeI82Jtjj4dE7LXzUXY2kt8Hqbq80qeFJj+NooGceH
+BszafLkCDQRgh0E2ARAA2NPzmrdm/BA3DUijyTXcq0JQ0Pjdn8k26tVz04U3uX95
+0U9Y3qWKn7Iv4uP+q82tgDL8sTzuwEErB2JQWB8XHKgh9kPdIwk7u4lCclOuSsd2
+mQt1O1ROPo5fNVuf2+aqo72TUcS4A2Q57zu4QRYe2/o4+8dQAbB3cKvs145oNpiQ
+gbA+G2uY0Gj6/p4q74a/2O+OJhqWlVkZYO3fy4S+9xkcueOg4AlXo4HeerzLIthw
+ctgSrY8SK9p3dsiZ9dvgOcnp7moDlacnvBeQ8u1CxSeomHtfzaaFZ8oqb95tIROA
+tMdbyMPLYl0fOXG9GhrmIIzoBMiwhPSDZjENGWXdSamcCtiMlostJwzVSV6pM3N2
+I2GXK2IgW/HVe5LwH9BPlJ4iGE2LQVNqzlgTN2k0+OyYen7bLP7UOHtBy3h2ab6V
+sCbZDx29Yxg/9PInGR+F8lcSJRDIc4rgGXQQ06+7+8Upqj68OPWn1ol30TldNY/e
+LRXbxePMAziG96iAQW7DXXajLxz00oatsDB5Z8pVRTP9AiZ/8sXswXLkH0VVnh4O
+5W80rdBw9vXwc+zJcaDknrJiQjfrMKEsuJ2dZ4VjRxGkYd9lZ9h9quMmtK2RRB5N
+n0ullgTE4e3I4p5pJUFcQIQffXfhGAmeEh7u+ALbOC7wLHScHuSPW5TiK2HnMDcA
+EQEAAYkCPAQYAQgAJgIbDBYhBDm2QTQ9jBBLKxRtw/nDncC5aYVEBQJihlm8BQkI
+natvAAoJEPnDncC5aYVESbIQAJCHSdsTOzFfDxrPnjdjtPwWKYgnzjnONn8AIqmE
+M6/Vk9xbQeqEoesm2jfkUYCJHtVgvR8SL48V1mrSZ27NVN4sowZsh7zAcTgsbCJu
+4csiyP0Ae8Ae7HUW+GXjm1HslzqAClopY969rzk7gvivflvrluR49h9rZ1Cjr2vR
+fEY6JEpDIgqQlaBk9WFrFsCgC3J0AYqPxgsswEUwkNrlx6R8gDnTa6ISQSVg9qk9
+9BZP45zhgm8NBVW/nl+fOeM6LIvMT1hVB61Js0MxcKHqtcrIPeRaeS8AraKyNIpW
+ZQp4BS9Yo9DgOyJKWVmXwkWK53tuiXjJk10gPQhMvFPGIYfGd+iT6In3/bBNPA3d
+75mQMYYo46dKex9GKQruaghugAiFCoKKsB1e245EOvmZ6rNNkIvMBvoDFThOoJos
+P0qSBxPBCTK7adwDqgvIVnZ6rSfDL9Wk5X5C5+315nlstEPrsyVywKpwd4WSDV0+
+ZSNY8Y48nVO2JUIjxyhpyf24gavhMDHFUN1Iq7Yytkb5xSHanKAoZbn7D8hKPfVa
+wesi/rRG8W0oDTsEzVhLlWdNy1Tx/lq9bI6fwKP03sXCybj4L41ZB8ajDZyS9pFJ
+zL2J3sadb5qHEi/26q9BoYOZKjJfq6v4cJf+iZYgua7gSKeNRYOw9B8LdA3iYmoW
+iU/+
+=pJ+M
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGBd5LkBEADOcegzhSUO+DqPpQSTRyVE5mHE9dAhpexUvAmyT3b5rJoOgUXp
+I+/VzKa2t40gkcdkg/uHZbMGTQg43fvtsY1eD32uveJK0rMntBINnOaf7jDRa9Qd
+KqXWyQIbOSM/yyyItc6n2mFC4rZHaNU1QwZCPGEYt4PTgTmOiFj6NHfyWMIUzITY
+a/7EkuFcV3tiqeu8Gm2cGllFgaQ09/3dhLzblstggd4f1A7z75aoGmMy6xvwFzc3
+ZAy1rxXdF5QCpds+uvWXkrpNJpRGZJ4eR8O42LODJEpgRGk4LA+jvZunW0gtJOIK
+mAGfX2ISk28arCR129dxahHHKefUS8Qc2zTK6/I/Bp/ZMVc/NC3os6JurQJD/Kff
+4amhNaBYRWD+Nn7fR+itZ3HPBH2yf0nzL0cgwGt37GbQXGqRvHcwmoABY9m3WZVC
+1ImdOS6T3zMrUC4ATyD/qtUs6NuxyV22C1jLRtGqu2YMdAw+s1G6V6Q3Y0SrlRqw
+0Nb4Ug0gMwKZdVCU+22qGmVJ44D7fSr7AyIZmSrC4i6IoF9I0pcpZYdIImgOBnmS
+mwOIin5/k0Oqg3gZWZAn2YV6qpVn3RjVz/GkFkml31TneDi+aZJSvmypbvTjkaH/
+zALwKpcSIdVZYlmlWfWprG8UY3Wc3XJq6zRYjG9YAdgZLzH+7B7yr/VR8wARAQAB
+tCFTZXJnZXkgUGFudGVsZWV2IDxzZXJnZXlAcGhwLm5ldD6JAlcEEwEIAEECGwMF
+CwkIBwIGFQoJCAsCBBYCAwECHgECF4ACGQEWIQTmCRPk3yCZB9jjDZZlmpfJzyp5
+WgUCYmuyVgUJEO1yXAAKCRBlmpfJzyp5WoQ2EACCVGtdOTFMQWF7cpnAbNFSGzMv
+9dffE7aOacVahEcRMuu5O5ONhZMlKweXjXJjmXJga4XxZifcopnoJEiiAmd6eb1o
+deHfrXAarKig/HqCHXtTFBc0ADEgIew9ErHjKCipg3uBAxvR8ndCV/xDmAIDdZGM
+7uhklYvtk68jgzK3tzYyDzes+eQKhjQdXfHgp2MqV+aeuuy8csFWvJV/DJDTXFMe
+DwAm9tB8fMqHZDOlF1jpl+FbXS3NdN/Oee8Ltja+x5iTMMI5lVmnHpemx62W+O2y
+CHUdd4TXxI6afvpKXnHDjsXZoZoLU1iYwVtA7XGIZTCzfzWMvFsXtXp+3GsfOFFZ
+teXYk4XgoF+3m+VRUDXckyd33Hc2WZDIe4PKYU+SjxV9Gn/Ltq9XzwPb9UgLoi6u
+FRnJo9r4zATKeU4e0mK9mZyy5Ndl57tHXsEd+r2Saih0kv0bX3LxWI8ab6JWpOCF
+WY+3nVUXJq5aH3Gtsdv/XUqk+M7616LIsdDZbLZ789QrE9mOEvADns9wIjt8XFcd
+//5k7/OM/5f/GK0+p9dv51uSnuyqtX21StG5/Y+ixu0MuK7jK2gSmQ0HwoU2uzlU
+XvFyIWgEH/+QUgM1QoflovBjp+5cwIb7CIl0sqPDoRbaWWAqtgiRIFeI/UcIss2W
+qHUY+bIZbtipSA+Tv7QoU2VyZ2V5IFBhbnRlbGVldiA8c2VyZ2V5QHMtcGFudGVs
+ZWV2LnJ1PokCVAQTAQgAPgIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgBYhBOYJ
+E+TfIJkH2OMNlmWal8nPKnlaBQJia7JWBQkQ7XJcAAoJEGWal8nPKnlaeLQP/3dE
+YpCNYxSx6itLIkMnVifdWi7Oe7ATqIGfIO5Z4uZ9E0JCv0CDHy4AMQ78NG67zK5X
+SngoCGHdsXUw9h857dtXTqVKpG7wDABSJQC+g6hu4sK67tpFlu8Zc+IGtGc2eNjT
+FSciMdlCaocY+ehWVVuuEew7KvdVfEMxJILRk3grhqzsXo0PaePqjRK/lx/wYHDW
+7255ALibJ8Q3yf9h+LOdEa0qH1xsdSP7G55t1kBCoGsFbT8sPLNzFMtqzuiTgQgs
+TMNOeiwOrPRUIw4yVQOO5svZ0+agjOGf0iklG0heQMC7LGKFAzKIFtxVrV6hSgwH
+t7y2fA5RvRBR0zZG6L5bUkP0/9txF6c6HsSVihAOpX2Mypel5uHDgnqq6eGbMzG4
+0MoOmnaWcFrICNr+uZLY1FfAlr1Nl4syiqXF36+rA2e53QVcPp2nlv9IR+ijWtUV
+IO+xcpAFKZ5NwWERO+oQoGNkquW7UK4x8jO8ezkYs/nC6Y+cJ3AiuPS76avnP47/
+SAvbyVLDamyzyt8mSMsnyqgghz6ivqqWE810i103AfFCjDokNTd0uzpCcL74VN5p
+FsveI563xWinbIoAtgPvFHd18NfYgkyLbk69V4s/h0onD8pEid23ExDKXKOXBZzn
+1Bw57z/ZFCxySlULQs59BMFTdY9VXTqX8l2pahmLtC1TZXJnZXkgUGFudGVsZWV2
+IDxzZXJnZXlAc2VyZ2V5cGFudGVsZWV2LmNvbT6JAlQEEwEIAD4CGwMFCwkIBwIG
+FQoJCAsCBBYCAwECHgECF4AWIQTmCRPk3yCZB9jjDZZlmpfJzyp5WgUCYmuyVgUJ
+EO1yXAAKCRBlmpfJzyp5WlRDEACcPD/Dra0f0HW4qqu0ZYeorsmRqyI2+pb1tsXU
+5qLn7VUZebyRaLkt3kq/E3emnxB2Mftn3OW9YzHDWQcjczHtkKPrfeU82Ja13TF5
+vutyHUSTn9RqzL5ftx+O4OZ0H5cqssnypgdnkBA5ca2G2s3DqnpthZP7e2Yh3vPE
+EHg5HvE7GsH1cyN73Efp4xAJltFSdFVtNDrZ8xIjw9iUnnl0Pa6YxFKuy5AsLTv9
+T6yhAP882o5fW1jqiTUpKq4l/GCjKZWIjBgUQaUPDdWISNhG0qoK/GUNpR/WfaJM
+dyYFt9bG+NGSx+g0RXYOWmn3OEVga5J7f1pkXgciOdHY4FMRGWGGhDDcfaWBTXVa
+k/iMlWbrPNwUeu371W4pMkZaDHq0RqFbzkX5ePCcUqeOHZPz5qrjASkOrDrp75D5
+Zho6UcMEaOmA3E883LZQCY+zh9H9n34UUIqla2js7pnq9Ab0uYOVe5F+TirH3qAz
+IrpfbralGnED6lgLbJaxU3eUTu13L/xgUfH2jqa4mvDBS4g+rBqj4J2Qcbc/fjnU
+Eintu2HN8QGJEpkNSFAjuWXQ0Dmjidl710DzcVZy+WMcHmANeXZ7MSXXvGwUV+RC
+5Kr/PzVATkCwJUY+cemU3E/+vp+oUOF1OxvISKKEF1QH9p64kyE0ezPJ5SsVz4nz
+i6CE+bkCDQRgXeS5ARAAkDhiIBBJa1Hml3MB3yDDg7JvVbDAA6Bi9w5Xeym0sqId
+M623U2O/RQlzzfZXsg3f4a66Zjot1t1axFZXXNw6p999kZtE5xk10Qcq6zfmUDM6
+yrlmatmCImu+mlWRrW7Yqba7DpgWJ5m4FXGTp08Np8nNJiICaG7Hfk7HtZIjzMr9
+5ffaTaXsiSLadvP0o2knP0cvBLPWQKMU89ADI8xh80mm6omsnSby2fluUeugSKNo
+KxJqdoqWCWD5br0Ypk3UyG9gUcoJUyQmC2gUUs9g1ksyeq/xGlrTcJ9l7c5I2iby
+frRrafWyE5Zg/vlKLBffnsSkIrV+0c4RFjjlteRm6Eig6lVmXbOXbfSopIyvG9IY
+mbgY5tRX/aMvpOeUcbqx9Wfsup1MYY7th5B/XSXJQCsRg2k1nMl7Hgq9MVrmkKCu
+X1IvWBmAilrxlAqdldqSA+8/ZJxQyapdDtw8ecV0NIFFG2tCxodnJcl5RVZRGsO4
+gNjQVZW6Hp3ktpcDLsJkpNhnsH8yK9hmBve//KBftpzb0I13W7bJMJoz6rg52FDb
+O99NZmLJl9N85mCPNISvhaHFOLKcyFpROnue2eiER8OLv/M24n/2nvp1SWwkhv+i
+M6FIT1yCFpxXjXxCISJM1oYmTM9e5Wj30jZAvYcgwD9KY/TGzSZo1W/BPiuIQiUA
+EQEAAYkCPAQYAQgAJhYhBOYJE+TfIJkH2OMNlmWal8nPKnlaBQJgXeS5AhsMBQkH
+hh9cAAoJEGWal8nPKnla6mwP/3D/kYM2nkvoXLMO8K0q59Y7uf3SE3wZ2VHyDd/X
+aKjOfXQFEyK5RqZYI+mbv/xI58+XoVlf9y3nUzyURCaBRaPtvTbpy6b8Y3ARw8xT
+5wBYDVaY0xzlHjidFVNnDJ1MKNvwn68V4qZdX1dxzHB+PrUeZG5YVoGCSw1au4Yq
+GuYP0VuE5AeY9pP6c/mC7sSuLAJ7izkaz6INiIW7hcJcRPXY2NdyCRwzSY36UAI7
+ZVnKervpK1eXrLhpwSbbBgS4/oh+sdu90oQb32dJRVTZZ/nT18CR6Ttxvsu5rFt8
+Q4bVkXHiDZPvrrz9kOCo1pe3DfXOb2oRMlF3oZ6h+MhNC3IZvVTEY0WK62I5Grfe
+uGdMBvcI+BFpQ+prv7bZVOU/jZlQL6DEfQ2T2eNc2xiYP1dKwoqH6hcb8j3Oids8
+8xPfLxeMIPZBgCLyxwRJIW8ChSh/R9vo9P+HNmFkt7TLy+AVQm5QV/gmdvwJnTS3
+tDsPUBA7WX2pMsYbQEDzWyQdrmSAgpGw5naHqz+hcjGK6VsYW/bH5FQeOKfUPE4E
+VPpIcXjQE//JzrJ8sJkPITD4I8cIrMo2DSessrODvkDootC5wCwD2jzKzbwVjGTg
+tm6LWTIamS0UshAHDk9tnddxgPD8yeFzXbQRJC7sBoFcLcBRJrF6urlEBgmmWo4A
+bItY
+=z8k6
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGBlop0BEADECekUKq62YGCekiH8yT7At8xXdNAv1MS0KGmogEBxD5xEII5w
+D6pL7KUhOzKZsgKIW1M11ZwzvsnMc5yJC89MmI7P5talQeoUzMPz5Q9dBC6AOpt6
+Jv9hNb0ECO/FN8N3rwYFZRi8wSF1ii1+2bAUpuMaD5g/ZporDLDNMYakM1bhptCP
+NYLypCJVhzwfk6lFgabw8JiHQkbhorO/NdDgSmjJk0P63YYNU2GSJ2T343rlvqGf
+C6rOMN3H5srg22ykDfG9UHdnfZScJLnSOioSMh+7lNBdRnhyIIvYWSWWXJ5Q4qrX
+B2eWGBFBxMw+qzwC9C6FBaUunT+AxXIfEeKAaVvF044Ngc38GUQr9SLiIHeh4RFH
+Llo+UBjIuobghf9llQxKBrPyt9isoftSYODjjqbiz9P2Kr7ETgDG3WPNMaaUdsjD
+LaUyT4bOWgspGfH3xyhLIeFRr4vsRSMLjhhJal6ACxT2rPDfg+Y15yUEdf9s3pHo
+vWIjOow16bNEiAoQS+rxtOXLmul+Svu9WBx5Q6FLm2/rY4iB8hWLcxHtTzzIi5el
+7QHapZS6lEL8vjHB4HajTiFPhcW1g1ow7WeYZQ3WfrCJc93rBsJf80EDHUXU7I3D
+bhJTnZdqTJi5QPAr4STPiJB1bCB6aJy7QajdCG68PkodZF9LBHI5H6w0iQARAQAB
+tChQYXRyaWNrIEFsbGFlcnQgPHBhdHJpY2thbGxhZXJ0QHBocC5uZXQ+iQJlBBMB
+CAA4FiEE8faSI4+8FmblpczUGZ+d/vb/uv0FAmBlop0CGwMFCwkIBwIGFQoJCAsC
+BBYCAwECHgECF4AAIQkQGZ+d/vb/uv0WIQTx9pIjj7wWZuWlzNQZn53+9v+6/cLo
+EACbjFwLJ05NpuBLHWtUeuiGjsd4ZrOPYU7aCd105Dj9M/2PPeupidGaf7Y4aH++
+I0cDfhKPUdFXOFqbl3S+mWjpumpXOIWLE/td2ztYTRFxT+9Dhd7IrYR2nPMEoXXr
+rQXVxlvw3EfJuwlzrDVnUAJW2Jwm94Lds06eA068ZmFT+GKbQbEAULWk6h5TtCtF
+BqBxJKpOT22znrlL7wQMnkhL4rJTsXkgkGpAVxVUTiqI3fdEG4ulxZTb2Vsz4AR7
+K1USrqKYIjanzQCs/5+a7oWXCOEinZ4u85r/Qi4gTvD/6qs7WvVr+ds+uvTID0TH
+zgya+0PaRugGQgJvfaCglErV/2nShgZ37tJsf79GyMiu2Elqf/JeIqIrpQbNOMXm
+dUvU+pzBBq8vJNqpRK3BiOfQwEdPGjgGyrP+Nlu9BKMXqcfKcEvCksgn0wrhe/Gw
+3cV797rrWG/gNQIh7KbvnrIybHIHFzUT2K7kBQQ1ENGlM1a57G3j1+otWV2JD1E0
+kbOh7vSvLCUPpq+XUxGntvLMw8XzfZj6pTRm7CnNtQrF8DiYVCIFOmt9oLWe8auI
+PwPQ2B2NY0j4SotquSTG3JENqs65de814VSEhHD03m0NEHLt2EtuPpP5gKiBgq5U
+pxbSzn+jD07S/CaXlvX4rsrNrKW/6R4appQnr23WvAlLS7kCDQRgZaKdARAAy2SZ
+x5SO3XxEPrYViiy3S6XdDGQTroAqlo2HVHy/PTmOtFtgty684H3sI4jS8Qc8L6po
+BGMkFEbZVe6NOCyVbcjtQdm+2UGEKAuoLvilec/vMNRDrOhvjCDXWv0MnY0JPMpg
+oYIBnR7VrRs02eStY7PnvMCYJBdNJ/WAsZJM/oyQitS+8O977WL0tKmHmtVFcZhh
+vnAbH0PRm8HkZek70o5Zi7Ze5uodXKRg0K58sqf8q3zjS28tbUN9pTIXx9PVwDx6
+SVgn4b/XaL4Bx7W+Cq6Go/NlAGc9iXtkZ+0iYgAi73s1hBU2TFgpZ7ZR6hyFbZmr
+J7c4c84CuhNSB+uw4Fkd5vNp6C6Zm2JRwDi5jQbDmERnXzkBtvC9uT9x61lfQD4p
+MHTx4OP9LSi4Dc4QesjunY+R7P2EbCQ9CZ/V/nAjWrD+VUyzhbGQ+CdYvI0/G65X
+/39+u6jrXt2hQD0KuzhWD76RWP3NCdA+nm9xRwsX3o1UC+GFeG4NxzlBsp1HgRsB
+4MkCcPy2NC3Qno6JMpUGa+w4/B+Jd2+sfOVISUikaCIp/nPGl4iO/9giWxQwCL97
+KL8jLAIUvhsp7cSKWJqAJdI66kQq+glgmhZdU44d8ayfqUQkpE1avTgEh1KgG+d9
+gd07fgyc8K5X+KrUAxc+6O5TxlzJ8WC1vyhGu0EAEQEAAYkCTQQYAQgAIBYhBPH2
+kiOPvBZm5aXM1Bmfnf72/7r9BQJgZaKdAhsMACEJEBmfnf72/7r9FiEE8faSI4+8
+FmblpczUGZ+d/vb/uv3HLw/9EV2+3aC3OmIpXpGXBKrb7wq4KP2Q23WtbY0W6UBs
+i8vSfcISHQ+xu5UqBiC0nfFNfIAi+z2averRqu+Qg8vPbtLyPiENVnpkZX6wWW+a
+pEjhjtmK/1WFccY2W7WIjOOGicq3oYQNzAr8M8j9u4nJR+zdF7F4CThdadwFRH7l
+x4QFUm0d7ZCz3u6LFysg1IFArrySDy0oJQqjx7JveV3IfD6VFyUXpj6RZ7DyJagy
+rv73yKwzGbZxBQaIP2n4wOrKpgvF9gUyhek4r/CistHYr5MLJnQKvlntL5JCDKtT
+zHNlJAy7/A7o6ReE1zLwVztwFqCjwzbei+8zFHcpraOUyCAPVrCG5/mhk3230n5S
+ZYZcyed58s5f8fbpBWm8Ke44xelcoeymDEBOqG9eiVk6PgGWN5ryqFF8Oo8BqJ2g
+YzZLkfRJvyMo1w8dLYiimjT3VYfE4PKXBjbd7LK6BClqi61I1pa7KP/kD3h9hpef
+jY0GEiHEDnGKPzBroopAPRibtPPPiICfG5k4hYDLqv2SwLkOoJKWQUFwDdoVSJFe
+h+SCcKfJW8n/BhtKgQpPVWtN/j2Y4WS7v32/RM1Zocl/eXBDWDVBO0F0KZbCWanI
+bAW44EBN/A1omSk+7skYWVAlA94fWSLGKOtza0DaAPsZM/bbm/uHF0FeoiYvxqng
+U3I=
+=wkmV
 -----END PGP PUBLIC KEY BLOCK-----

repack.sh Added

Changes of Revision 6