From 3c3b2b5bdc8e2bcff4d0e7d09375ad7af760b32a Mon Sep 17 00:00:00 2001
From: Adam Harvey <aharvey@php.net>
Date: Mon, 9 Sep 2013 16:24:49 -0700
Subject: Handle CLI server request headers case insensitively.

Fixes bug #65633 (built-in server treat some http headers as case-sensitive).
---
 NEWS                         |  4 ++++
 sapi/cli/php_cli_server.c    | 17 +++++++---------
 sapi/cli/tests/bug65633.phpt | 48 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 10 deletions(-)
 create mode 100644 sapi/cli/tests/bug65633.phpt

diff --git a/NEWS b/NEWS
index 486ccb2a88..e05b24042b 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2013, PHP 5.4.21
 
+- CLI server:
+  . Fixed bug #65633 (built-in server treat some http headers as
+    case-sensitive). (Adam)
+
 ?? ??? 2013, PHP 5.4.20
 
 - Core:
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index 5a12134a91..4da55acc6c 100644
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -408,7 +408,7 @@ static void append_essential_headers(smart_str* buffer, php_cli_server_client *c
 {
 	{
 		char **val;
-		if (SUCCESS == zend_hash_find(&client->request.headers, "Host", sizeof("Host"), (void**)&val)) {
+		if (SUCCESS == zend_hash_find(&client->request.headers, "host", sizeof("host"), (void**)&val)) {
 			smart_str_appendl_ex(buffer, "Host", sizeof("Host") - 1, persistent);
 			smart_str_appendl_ex(buffer, ": ", sizeof(": ") - 1, persistent);
 			smart_str_appends_ex(buffer, *val, persistent);
@@ -558,7 +558,7 @@ static char *sapi_cli_server_read_cookies(TSRMLS_D) /* {{{ */
 {
 	php_cli_server_client *client = SG(server_context);
 	char **val;
-	if (FAILURE == zend_hash_find(&client->request.headers, "Cookie", sizeof("Cookie"), (void**)&val)) {
+	if (FAILURE == zend_hash_find(&client->request.headers, "cookie", sizeof("cookie"), (void**)&val)) {
 		return NULL;
 	}
 	return *val;
@@ -1556,12 +1556,9 @@ static int php_cli_server_client_read_request_on_header_value(php_http_parser *p
 		return 1;
 	}
 	{
-		char *header_name = client->current_header_name;
-		size_t header_name_len = client->current_header_name_len;
-		char c = header_name[header_name_len];
-		header_name[header_name_len] = '\0';
-		zend_hash_add(&client->request.headers, header_name, header_name_len + 1, &value, sizeof(char *), NULL);
-		header_name[header_name_len] = c;
+		char *header_name = zend_str_tolower_dup(client->current_header_name, client->current_header_name_len);
+		zend_hash_add(&client->request.headers, header_name, client->current_header_name_len + 1, &value, sizeof(char *), NULL);
+		efree(header_name);
 	}
 
 	if (client->current_header_name_allocated) {
@@ -1719,7 +1716,7 @@ static void php_cli_server_client_populate_request_info(const php_cli_server_cli
 	request_info->post_data = client->request.content;
 	request_info->content_length = request_info->post_data_length = client->request.content_len;
 	request_info->auth_user = request_info->auth_password = request_info->auth_digest = NULL;
-	if (SUCCESS == zend_hash_find(&client->request.headers, "Content-Type", sizeof("Content-Type"), (void**)&val)) {
+	if (SUCCESS == zend_hash_find(&client->request.headers, "content-type", sizeof("content-type"), (void**)&val)) {
 		request_info->content_type = *val;
 	}
 } /* }}} */
@@ -1957,7 +1954,7 @@ static int php_cli_server_begin_send_static(php_cli_server *server, php_cli_serv
 static int php_cli_server_request_startup(php_cli_server *server, php_cli_server_client *client TSRMLS_DC) { /* {{{ */
 	char **auth;
 	php_cli_server_client_populate_request_info(client, &SG(request_info));
-	if (SUCCESS == zend_hash_find(&client->request.headers, "Authorization", sizeof("Authorization"), (void**)&auth)) {
+	if (SUCCESS == zend_hash_find(&client->request.headers, "authorization", sizeof("authorization"), (void**)&auth)) {
 		php_handle_auth_data(*auth TSRMLS_CC);
 	}
 	SG(sapi_headers).http_response_code = 200;
diff --git a/sapi/cli/tests/bug65633.phpt b/sapi/cli/tests/bug65633.phpt
new file mode 100644
index 0000000000..55834095b1
--- /dev/null
+++ b/sapi/cli/tests/bug65633.phpt
@@ -0,0 +1,48 @@
+--TEST--
+Bug #65633 (built-in server treat some http headers as case-sensitive)
+--SKIPIF--
+<?php
+include "skipif.inc";
+?>
+--FILE--
+<?php
+include "php_cli_server.inc";
+php_cli_server_start(<<<'PHP'
+var_dump($_COOKIE, $_SERVER['HTTP_FOO']);
+PHP
+);
+
+list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS);
+$port = intval($port)?:80;
+
+$fp = fsockopen($host, $port, $errno, $errstr, 0.5);
+if (!$fp) {
+  die("connect failed");
+}
+
+if(fwrite($fp, <<<HEADER
+GET / HTTP/1.1
+cookie: foo=bar
+foo: bar
+
+
+HEADER
+)) {
+    while (!feof($fp)) {
+        echo fgets($fp);
+    }
+}
+
+fclose($fp);
+?>
+--EXPECTF--
+HTTP/1.1 200 OK
+Connection: close
+X-Powered-By: %s
+Content-type: text/html
+
+array(1) {
+  ["foo"]=>
+  string(3) "bar"
+}
+string(3) "bar"
-- 
cgit v1.2.1


From 160cd8d0a7205cacab9800318abb63a540587c4f Mon Sep 17 00:00:00 2001
From: Adam Harvey <aharvey@php.net>
Date: Mon, 9 Sep 2013 16:56:57 -0700
Subject: Tinker with the wording of the short_open_tag description.

I'm still not thrilled with this, but it's a bit better and addresses the
issues noted in bug #65644. Plus, it now mentions the decoupling of <?=.
---
 php.ini-development | 13 ++++++-------
 php.ini-production  | 13 ++++++-------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/php.ini-development b/php.ini-development
index db908c0718..ba20bd3fb8 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -197,13 +197,12 @@
 engine = On
 
 ; This directive determines whether or not PHP will recognize code between
-; <? and ?> tags as PHP source which should be processed as such. It's been
-; recommended for several years that you not use the short tag "short cut" and
-; instead to use the full <?php and ?> tag combination. With the wide spread use
-; of XML and use of these tags by other languages, the server can become easily
-; confused and end up parsing the wrong code in the wrong context. But because
-; this short cut has been a feature for such a long time, it's currently still
-; supported for backwards compatibility, but we recommend you don't use them.
+; <? and ?> tags as PHP source which should be processed as such. It is
+; generally recommended that <?php and ?> should be used and that this feature
+; should be disabled, as enabling it may result in issues when generating XML
+; documents, however this remains supported for backward compatibility reasons.
+; Note that this directive does not control the <?= shorthand tag, which can be
+; used regardless of this directive.
 ; Default Value: On
 ; Development Value: Off
 ; Production Value: Off
diff --git a/php.ini-production b/php.ini-production
index 3d7c6c0dab..db48a8fbc8 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -197,13 +197,12 @@
 engine = On
 
 ; This directive determines whether or not PHP will recognize code between
-; <? and ?> tags as PHP source which should be processed as such. It's been
-; recommended for several years that you not use the short tag "short cut" and
-; instead to use the full <?php and ?> tag combination. With the wide spread use
-; of XML and use of these tags by other languages, the server can become easily
-; confused and end up parsing the wrong code in the wrong context. But because
-; this short cut has been a feature for such a long time, it's currently still
-; supported for backwards compatibility, but we recommend you don't use them.
+; <? and ?> tags as PHP source which should be processed as such. It is
+; generally recommended that <?php and ?> should be used and that this feature
+; should be disabled, as enabling it may result in issues when generating XML
+; documents, however this remains supported for backward compatibility reasons.
+; Note that this directive does not control the <?= shorthand tag, which can be
+; used regardless of this directive.
 ; Default Value: On
 ; Development Value: Off
 ; Production Value: Off
-- 
cgit v1.2.1


From a475b2c1db3512eabfece71430cb49065f558e40 Mon Sep 17 00:00:00 2001
From: Boro Sitnikovski <bsitnikovski@sugarcrm.com>
Date: Fri, 13 Sep 2013 02:20:19 +0200
Subject: Bug 64157 Changed error message to make sense

---
 ext/date/lib/parse_date.c    |  2 +-
 ext/date/lib/parse_date.re   |  2 +-
 ext/date/tests/bug64157.phpt | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 ext/date/tests/bug64157.phpt

diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c
index 2ad4d31edb..f510a665e8 100644
--- a/ext/date/lib/parse_date.c
+++ b/ext/date/lib/parse_date.c
@@ -25036,7 +25036,7 @@ timelib_time *timelib_parse_from_format(char *format, char *string, int len, tim
 					TIMELIB_CHECK_NUMBER;
 					sec = timelib_get_nr_ex((char **) &ptr, 2, &length);
 					if (sec == TIMELIB_UNSET || length != 2) {
-						add_pbf_error(s, "A two second minute could not be found", string, begin);
+						add_pbf_error(s, "A two digit second could not be found", string, begin);
 					} else {
 						s->time->s = sec;
 					}
diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re
index f874682ce6..df33508f50 100644
--- a/ext/date/lib/parse_date.re
+++ b/ext/date/lib/parse_date.re
@@ -2043,7 +2043,7 @@ timelib_time *timelib_parse_from_format(char *format, char *string, int len, tim
 					TIMELIB_CHECK_NUMBER;
 					sec = timelib_get_nr_ex((char **) &ptr, 2, &length);
 					if (sec == TIMELIB_UNSET || length != 2) {
-						add_pbf_error(s, "A two second minute could not be found", string, begin);
+						add_pbf_error(s, "A two digit second could not be found", string, begin);
 					} else {
 						s->time->s = sec;
 					}
diff --git a/ext/date/tests/bug64157.phpt b/ext/date/tests/bug64157.phpt
new file mode 100644
index 0000000000..fb71495430
--- /dev/null
+++ b/ext/date/tests/bug64157.phpt
@@ -0,0 +1,14 @@
+--TEST--
+Test for bug #64157: DateTime::createFromFormat() reports confusing error message
+--CREDITS--
+Boro Sitnikovski <buritomath@yahoo.com>
+--INI--
+date.timezone = UTC
+--FILE--
+<?php
+DateTime::createFromFormat('s', '0');
+$lastErrors = DateTime::getLastErrors();
+print_r($lastErrors['errors'][0]);
+?>
+--EXPECT--
+A two digit second could not be found
-- 
cgit v1.2.1


From c0afe829e33c5f5690c6967a102148984836d5aa Mon Sep 17 00:00:00 2001
From: David Soria Parra <dsp@php.net>
Date: Mon, 16 Sep 2013 03:48:34 +0200
Subject: News for bugfix #64157

---
 NEWS | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/NEWS b/NEWS
index e05b24042b..c7d5e030f3 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,10 @@ PHP                                                                        NEWS
   . Fixed bug #65633 (built-in server treat some http headers as
     case-sensitive). (Adam)
 
+- Datetime:
+  . Fixed bug #64157 (DateTime::createFromFormat() reports confusing error
+    message). (Boro Sitnikovski)
+
 ?? ??? 2013, PHP 5.4.20
 
 - Core:
-- 
cgit v1.2.1


From 8a936e8eb938965b0daaf076c109ec60141e57a7 Mon Sep 17 00:00:00 2001
From: Levi Morrison <levim@php.net>
Date: Thu, 12 Sep 2013 16:03:39 -0600
Subject: EmptyIterator now implements Countable; fixes bug 60577

(cherry picked from commit 6398844c86bee08abe4ee3f206ecd86ad0a498f9)
---
 ext/spl/internal/emptyiterator.inc | 13 +++++++++++--
 ext/spl/spl_iterators.c            | 12 ++++++++++++
 ext/spl/tests/bug60577.phpt        |  8 ++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 ext/spl/tests/bug60577.phpt

diff --git a/ext/spl/internal/emptyiterator.inc b/ext/spl/internal/emptyiterator.inc
index ac80e79581..d02b15b999 100644
--- a/ext/spl/internal/emptyiterator.inc
+++ b/ext/spl/internal/emptyiterator.inc
@@ -15,7 +15,7 @@
  * @version 1.0
  * @since PHP 5.1
  */
-class EmptyIterator implements Iterator
+class EmptyIterator implements Iterator, Countable
 {
 	/** No operation.
 	 * @return void
@@ -57,6 +57,15 @@ class EmptyIterator implements Iterator
 	{
 		// nothing to do
 	}
+
+	/**
+	 * @return int
+	 */
+	function count()
+	{
+		return 0;
+	}
+
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index eb8247654e..ad76258413 100644
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -3279,12 +3279,23 @@ SPL_METHOD(EmptyIterator, next)
 	}
 } /* }}} */
 
+/* {{{ proto int EmptyIterator::count()
+   Does nothing */
+SPL_METHOD(EmptyIterator, count)
+{
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
+	}
+	RETURN_LONG(0);
+} /* }}} */
+
 static const zend_function_entry spl_funcs_EmptyIterator[] = {
 	SPL_ME(EmptyIterator, rewind,           arginfo_recursive_it_void, ZEND_ACC_PUBLIC)
 	SPL_ME(EmptyIterator, valid,            arginfo_recursive_it_void, ZEND_ACC_PUBLIC)
 	SPL_ME(EmptyIterator, key,              arginfo_recursive_it_void, ZEND_ACC_PUBLIC)
 	SPL_ME(EmptyIterator, current,          arginfo_recursive_it_void, ZEND_ACC_PUBLIC)
 	SPL_ME(EmptyIterator, next,             arginfo_recursive_it_void, ZEND_ACC_PUBLIC)
+	SPL_ME(EmptyIterator, count,            arginfo_recursive_it_void, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 
@@ -3756,6 +3767,7 @@ PHP_MINIT_FUNCTION(spl_iterators)
 
 	REGISTER_SPL_STD_CLASS_EX(EmptyIterator, NULL, spl_funcs_EmptyIterator);
 	REGISTER_SPL_ITERATOR(EmptyIterator);
+	REGISTER_SPL_IMPLEMENTS(EmptyIterator, Countable);
 
 	REGISTER_SPL_SUB_CLASS_EX(RecursiveTreeIterator, RecursiveIteratorIterator, spl_RecursiveTreeIterator_new, spl_funcs_RecursiveTreeIterator);
 	REGISTER_SPL_CLASS_CONST_LONG(RecursiveTreeIterator, "BYPASS_CURRENT",      RTIT_BYPASS_CURRENT);
diff --git a/ext/spl/tests/bug60577.phpt b/ext/spl/tests/bug60577.phpt
new file mode 100644
index 0000000000..33fc133d0f
--- /dev/null
+++ b/ext/spl/tests/bug60577.phpt
@@ -0,0 +1,8 @@
+--TEST--
+count(new EmptyIterator) should return zero
+--FILE--
+<?php
+$it = new EmptyIterator;
+var_dump(count($it));
+--EXPECT--
+int(0)
-- 
cgit v1.2.1


From 18b54a2366dd589959240f8770bbb54be819f6e7 Mon Sep 17 00:00:00 2001
From: Alex Bobrov <syragg@gmail.com>
Date: Sun, 21 Apr 2013 14:32:02 +0700
Subject: Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain
 names)

(cherry picked from commit c149d4ee4be81ecf005eafd43ede06e70aa4c985)
---
 ext/filter/logical_filters.c   |  4 ----
 ext/filter/tests/bug64441.phpt | 11 +++++++++++
 2 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 ext/filter/tests/bug64441.phpt

diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c
index 58d5870c11..c8f94a772c 100644
--- a/ext/filter/logical_filters.c
+++ b/ext/filter/logical_filters.c
@@ -484,10 +484,6 @@ void php_filter_validate_url(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
 			}
 			s++;
 		}
-
-		if (*(e - 1) == '.') {
-			goto bad_url;
-		}
 	}
 
 	if (
diff --git a/ext/filter/tests/bug64441.phpt b/ext/filter/tests/bug64441.phpt
new file mode 100644
index 0000000000..149079ec05
--- /dev/null
+++ b/ext/filter/tests/bug64441.phpt
@@ -0,0 +1,11 @@
+--TEST--
+bug 64441, FILTER_VALIDATE_URL will invalidate a hostname that ended by dot
+--SKIPIF--
+<?php if (!extension_loaded("filter")) die("skip"); ?>
+--FILE--
+<?php
+var_dump(filter_var('http://example.com./', FILTER_VALIDATE_URL));
+var_dump(filter_var('http://example.com/', FILTER_VALIDATE_URL));
+--EXPECT--
+string(20) "http://example.com./"
+string(19) "http://example.com/"
-- 
cgit v1.2.1


From 1939d9e3db2fdbc89bf002c7de00cc0623f321b3 Mon Sep 17 00:00:00 2001
From: David Soria Parra <dsp@php.net>
Date: Mon, 16 Sep 2013 05:21:42 +0200
Subject: NEWS for bug #64441

---
 NEWS | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/NEWS b/NEWS
index c7d5e030f3..67e31d044f 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,10 @@ PHP                                                                        NEWS
   . Fixed bug #64157 (DateTime::createFromFormat() reports confusing error
     message). (Boro Sitnikovski)
 
+- Filter:
+  . Fixed bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names).
+    (Syra)
+
 ?? ??? 2013, PHP 5.4.20
 
 - Core:
-- 
cgit v1.2.1


From 6a0b90da84433ab1b0844a96036f3185d8a29cef Mon Sep 17 00:00:00 2001
From: David Soria Parra <dsp@php.net>
Date: Mon, 16 Sep 2013 16:23:29 +0200
Subject: NEWS for #60577

---
 NEWS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/NEWS b/NEWS
index 67e31d044f..b1280b376b 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,9 @@ PHP                                                                        NEWS
   . Fixed bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names).
     (Syra)
 
+- SPL:
+  . Fixed bug #60577 (count(new EmptyIterator) returns 1). (Levi Morrison)
+
 ?? ??? 2013, PHP 5.4.20
 
 - Core:
-- 
cgit v1.2.1


From 7c279df6ae29d585021355559c07fa51f4373075 Mon Sep 17 00:00:00 2001
From: Sebastian Nohn <sebastian@nohn.net>
Date: Sun, 15 Sep 2013 19:18:20 +0200
Subject: Add RFC 6598 IPs to reserved addresses

(cherry picked from commit b3f5b822e9f83d99d7cb5eed36ba8d307d1408ee)
---
 ext/filter/logical_filters.c | 1 +
 ext/filter/tests/018.phpt    | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c
index c8f94a772c..71c5aba1e9 100644
--- a/ext/filter/logical_filters.c
+++ b/ext/filter/logical_filters.c
@@ -714,6 +714,7 @@ void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
 			if (flags & FILTER_FLAG_NO_RES_RANGE) {
 				if (
 					(ip[0] == 0) ||
+					(ip[0] == 100 && (ip[1] == 0 || ip[1] <= 127)) ||
 					(ip[0] == 128 && ip[1] == 0) ||
 					(ip[0] == 191 && ip[1] == 255) ||
 					(ip[0] == 169 && ip[1] == 254) ||
diff --git a/ext/filter/tests/018.phpt b/ext/filter/tests/018.phpt
index af52b2e60d..9c73fc3cfc 100644
--- a/ext/filter/tests/018.phpt
+++ b/ext/filter/tests/018.phpt
@@ -15,6 +15,8 @@ var_dump(filter_var("192.168.0.1", FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE
 var_dump(filter_var("192.0.34.166", FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE));
 var_dump(filter_var("127.0.0.1", FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE));
 var_dump(filter_var("192.0.0.1", FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE));
+var_dump(filter_var("100.0.0.0", FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE));
+var_dump(filter_var("100.127.255.255", FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE));
 var_dump(filter_var("192.0.34.166", FILTER_VALIDATE_IP));
 var_dump(filter_var("256.1237.123.1", FILTER_VALIDATE_IP));
 var_dump(filter_var("255.255.255.255", FILTER_VALIDATE_IP));
@@ -40,6 +42,8 @@ bool(false)
 string(12) "192.0.34.166"
 bool(false)
 string(9) "192.0.0.1"
+bool(false)
+bool(false)
 string(12) "192.0.34.166"
 bool(false)
 string(15) "255.255.255.255"
-- 
cgit v1.2.1


From dfd7d1063a5292b04f6134284337550f4f513749 Mon Sep 17 00:00:00 2001
From: David Soria Parra <dsp@php.net>
Date: Tue, 17 Sep 2013 09:54:58 +0200
Subject: NEWS for added reserved ip addresses according to RFC 6598

---
 NEWS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NEWS b/NEWS
index b1280b376b..d8895bdfde 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ PHP                                                                        NEWS
     message). (Boro Sitnikovski)
 
 - Filter:
+  . Add RFC 6598 IPs to reserved addresses. (Sebastian Nohn)
   . Fixed bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names).
     (Syra)
 
-- 
cgit v1.2.1


From 9bfd55cda3bd66b56af84a569fafd8a77cbb3726 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Wed, 18 Sep 2013 11:10:55 +0200
Subject: fix a very rare case of use of uninitialized value combined with a
 memleak

---
 main/fopen_wrappers.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index 6f11cf3f32..9b8645a061 100644
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -775,7 +775,12 @@ PHPAPI char *expand_filepath_with_mode(const char *filepath, char *real_path, co
 				 * we cannot cannot getcwd() and the requested,
 				 * relatively referenced file is accessible */
 				copy_len = strlen(filepath) > MAXPATHLEN - 1 ? MAXPATHLEN - 1 : strlen(filepath);
-				real_path = estrndup(filepath, copy_len);
+				if (real_path) {
+					memcpy(real_path, filepath, copy_len);
+					real_path[copy_len] = '\0';
+				} else {
+					real_path = estrndup(filepath, copy_len);
+				}
 				close(fdtest);
 				return real_path;
 			} else {
-- 
cgit v1.2.1


From 7e9044b6a251f40da1217c3265b83a9caae8bff8 Mon Sep 17 00:00:00 2001
From: David Soria Parra <dsp@php.net>
Date: Wed, 18 Sep 2013 14:26:10 +0200
Subject: RFC 6598 reserved ip range starts at 100.64.0.0

---
 ext/filter/logical_filters.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c
index 71c5aba1e9..14964883c1 100644
--- a/ext/filter/logical_filters.c
+++ b/ext/filter/logical_filters.c
@@ -714,7 +714,7 @@ void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
 			if (flags & FILTER_FLAG_NO_RES_RANGE) {
 				if (
 					(ip[0] == 0) ||
-					(ip[0] == 100 && (ip[1] == 0 || ip[1] <= 127)) ||
+					(ip[0] == 100 && (ip[1] >= 64 || ip[1] <= 127)) ||
 					(ip[0] == 128 && ip[1] == 0) ||
 					(ip[0] == 191 && ip[1] == 255) ||
 					(ip[0] == 169 && ip[1] == 254) ||
-- 
cgit v1.2.1


From 7a24ee13ec74bf3e85970e59dd69db8034ff434c Mon Sep 17 00:00:00 2001
From: David Soria Parra <dsp@php.net>
Date: Wed, 18 Sep 2013 15:06:19 +0200
Subject: Revert "EmptyIterator now implements Countable; fixes bug 60577"

This reverts commit 8a936e8eb938965b0daaf076c109ec60141e57a7.
---
 NEWS                               |  3 ---
 ext/spl/internal/emptyiterator.inc | 13 ++-----------
 ext/spl/spl_iterators.c            | 12 ------------
 ext/spl/tests/bug60577.phpt        |  8 --------
 4 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 ext/spl/tests/bug60577.phpt

diff --git a/NEWS b/NEWS
index d8895bdfde..6d94980fbc 100644
--- a/NEWS
+++ b/NEWS
@@ -15,9 +15,6 @@ PHP                                                                        NEWS
   . Fixed bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names).
     (Syra)
 
-- SPL:
-  . Fixed bug #60577 (count(new EmptyIterator) returns 1). (Levi Morrison)
-
 ?? ??? 2013, PHP 5.4.20
 
 - Core:
diff --git a/ext/spl/internal/emptyiterator.inc b/ext/spl/internal/emptyiterator.inc
index d02b15b999..ac80e79581 100644
--- a/ext/spl/internal/emptyiterator.inc
+++ b/ext/spl/internal/emptyiterator.inc
@@ -15,7 +15,7 @@
  * @version 1.0
  * @since PHP 5.1
  */
-class EmptyIterator implements Iterator, Countable
+class EmptyIterator implements Iterator
 {
 	/** No operation.
 	 * @return void
@@ -57,15 +57,6 @@ class EmptyIterator implements Iterator, Countable
 	{
 		// nothing to do
 	}
-
-	/**
-	 * @return int
-	 */
-	function count()
-	{
-		return 0;
-	}
-
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index ad76258413..eb8247654e 100644
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -3279,23 +3279,12 @@ SPL_METHOD(EmptyIterator, next)
 	}
 } /* }}} */
 
-/* {{{ proto int EmptyIterator::count()
-   Does nothing */
-SPL_METHOD(EmptyIterator, count)
-{
-	if (zend_parse_parameters_none() == FAILURE) {
-		return;
-	}
-	RETURN_LONG(0);
-} /* }}} */
-
 static const zend_function_entry spl_funcs_EmptyIterator[] = {
 	SPL_ME(EmptyIterator, rewind,           arginfo_recursive_it_void, ZEND_ACC_PUBLIC)
 	SPL_ME(EmptyIterator, valid,            arginfo_recursive_it_void, ZEND_ACC_PUBLIC)
 	SPL_ME(EmptyIterator, key,              arginfo_recursive_it_void, ZEND_ACC_PUBLIC)
 	SPL_ME(EmptyIterator, current,          arginfo_recursive_it_void, ZEND_ACC_PUBLIC)
 	SPL_ME(EmptyIterator, next,             arginfo_recursive_it_void, ZEND_ACC_PUBLIC)
-	SPL_ME(EmptyIterator, count,            arginfo_recursive_it_void, ZEND_ACC_PUBLIC)
 	PHP_FE_END
 };
 
@@ -3767,7 +3756,6 @@ PHP_MINIT_FUNCTION(spl_iterators)
 
 	REGISTER_SPL_STD_CLASS_EX(EmptyIterator, NULL, spl_funcs_EmptyIterator);
 	REGISTER_SPL_ITERATOR(EmptyIterator);
-	REGISTER_SPL_IMPLEMENTS(EmptyIterator, Countable);
 
 	REGISTER_SPL_SUB_CLASS_EX(RecursiveTreeIterator, RecursiveIteratorIterator, spl_RecursiveTreeIterator_new, spl_funcs_RecursiveTreeIterator);
 	REGISTER_SPL_CLASS_CONST_LONG(RecursiveTreeIterator, "BYPASS_CURRENT",      RTIT_BYPASS_CURRENT);
diff --git a/ext/spl/tests/bug60577.phpt b/ext/spl/tests/bug60577.phpt
deleted file mode 100644
index 33fc133d0f..0000000000
--- a/ext/spl/tests/bug60577.phpt
+++ /dev/null
@@ -1,8 +0,0 @@
---TEST--
-count(new EmptyIterator) should return zero
---FILE--
-<?php
-$it = new EmptyIterator;
-var_dump(count($it));
---EXPECT--
-int(0)
-- 
cgit v1.2.1


From cc66eaa04b123bdfb6aaa7305713fa508640999e Mon Sep 17 00:00:00 2001
From: Adam Harvey <aharvey@php.net>
Date: Fri, 20 Sep 2013 14:15:19 -0700
Subject: Fix the broken sh syntax in ext/imap/config.m4.

Patch by ryotakatsuki at gmail dot com. Fixes bug #65721 (configure script
broken in 5.5.4 and 5.4.20 when enabling imap).
---
 NEWS               | 4 ++++
 ext/imap/config.m4 | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 6d94980fbc..bb170e7fcf 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,10 @@ PHP                                                                        NEWS
   . Fixed bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names).
     (Syra)
 
+- IMAP:
+  . Fixed bug #65721 (configure script broken in 5.5.4 and 5.4.20 when enabling
+    imap). (ryotakatsuki at gmail dot com)
+
 ?? ??? 2013, PHP 5.4.20
 
 - Core:
diff --git a/ext/imap/config.m4 b/ext/imap/config.m4
index d4dcd4c8ad..3fcf6742da 100644
--- a/ext/imap/config.m4
+++ b/ext/imap/config.m4
@@ -198,9 +198,9 @@ if test "$PHP_IMAP" != "no"; then
       AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.)
     fi
 
-    if test ! -r "$IMAP_DIR/c-client/libc-client.a" && -r "$IMAP_DIR/c-client/c-client.a" ; then
+    if test ! -r "$IMAP_DIR/c-client/libc-client.a" && test -r "$IMAP_DIR/c-client/c-client.a" ; then
       ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1
-    elif test ! -r "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" && -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then
+    elif test ! -r "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" && test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then
       ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1
     fi
 
-- 
cgit v1.2.1


From 30e0442c549bd20288ca8754daa0cdf24d98f055 Mon Sep 17 00:00:00 2001
From: Adam Harvey <aharvey@php.net>
Date: Sun, 22 Sep 2013 16:46:17 -0700
Subject: Copy dba_*() keys before converting to string.

A nice Sunday afternoon project for somebody would be to refactor the dba
functions to use zend_parse_parameters() reliably and try to untangle some of
the macros in dba.c. Sadly, it is not a nice Sunday afternoon here.

Fixes bug #65708 (dba functions cast $key param to string in-place, bypassing
copy on write).
---
 NEWS                        |  4 ++++
 ext/dba/dba.c               | 25 +++++++++++++++++++------
 ext/dba/tests/bug65708.phpt | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 61 insertions(+), 6 deletions(-)
 create mode 100644 ext/dba/tests/bug65708.phpt

diff --git a/NEWS b/NEWS
index bb170e7fcf..e17632543c 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,10 @@ PHP                                                                        NEWS
   . Fixed bug #64157 (DateTime::createFromFormat() reports confusing error
     message). (Boro Sitnikovski)
 
+- DBA extension:
+  . Fixed bug #65708 (dba functions cast $key param to string in-place,
+    bypassing copy on write). (Adam)
+
 - Filter:
   . Add RFC 6598 IPs to reserved addresses. (Sebastian Nohn)
   . Fixed bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names).
diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index 8005101de3..50a94dd2ad 100644
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -226,12 +226,17 @@ static size_t php_dba_make_key(zval *key, char **key_str, char **key_free TSRMLS
 		*key_free = *key_str;
 		return len;
 	} else {
-		*key_free = NULL;
+		zval tmp = *key;
+		int len;
 
-		convert_to_string(key);
-		*key_str = Z_STRVAL_P(key);
+		zval_copy_ctor(&tmp);
+		convert_to_string(&tmp);
 
-		return Z_STRLEN_P(key);
+		*key_free = *key_str = estrndup(Z_STRVAL(tmp), Z_STRLEN(tmp));
+		len = Z_STRLEN(tmp);
+
+		zval_dtor(&tmp);
+		return len;
 	}
 }
 /* }}} */
@@ -297,6 +302,14 @@ static size_t php_dba_make_key(zval *key, char **key_str, char **key_free TSRMLS
 		RETURN_FALSE; \
 	}
 
+/* the same check, but with a call to DBA_ID_DONE before returning */
+#define DBA_WRITE_CHECK_WITH_ID \
+	if(info->mode != DBA_WRITER && info->mode != DBA_TRUNC && info->mode != DBA_CREAT) { \
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "You cannot perform a modification to a database without proper access"); \
+		DBA_ID_DONE; \
+		RETURN_FALSE; \
+	}
+
 /* }}} */
 
 /* {{{ globals */
@@ -557,7 +570,7 @@ static void php_dba_update(INTERNAL_FUNCTION_PARAMETERS, int mode)
 
 	DBA_FETCH_RESOURCE(info, &id);
 
-	DBA_WRITE_CHECK;
+	DBA_WRITE_CHECK_WITH_ID;
 
 	if (info->hnd->update(info, key_str, key_len, val, val_len, mode TSRMLS_CC) == SUCCESS) {
 		DBA_ID_DONE;
@@ -1110,7 +1123,7 @@ PHP_FUNCTION(dba_delete)
 {
 	DBA_ID_GET2;
 	
-	DBA_WRITE_CHECK;
+	DBA_WRITE_CHECK_WITH_ID;
 	
 	if(info->hnd->delete(info, key_str, key_len TSRMLS_CC) == SUCCESS)
 	{
diff --git a/ext/dba/tests/bug65708.phpt b/ext/dba/tests/bug65708.phpt
new file mode 100644
index 0000000000..b77138f6ed
--- /dev/null
+++ b/ext/dba/tests/bug65708.phpt
@@ -0,0 +1,38 @@
+--TEST--
+Bug #65708 (dba functions cast $key param to string in-place, bypassing copy on write)
+--SKIPIF--
+<?php 
+	require_once(dirname(__FILE__) .'/skipif.inc');
+?>
+--FILE--
+<?php
+
+error_reporting(E_ALL);
+
+require_once(dirname(__FILE__) .'/test.inc');
+
+$db = dba_popen($db_filename, 'c');
+
+$key = 1;
+$copy = $key;
+
+echo gettype($key)."\n";
+echo gettype($copy)."\n";
+
+dba_exists($key, $db);
+
+echo gettype($key)."\n";
+echo gettype($copy)."\n";
+
+dba_close($db);
+
+?>
+--CLEAN--
+<?php 
+	require(dirname(__FILE__) .'/clean.inc'); 
+?>
+--EXPECT--
+integer
+integer
+integer
+integer
-- 
cgit v1.2.1


From ac05cfb49912dd87264573df930d0ead3c3e0cca Mon Sep 17 00:00:00 2001
From: Stanley Sufficool <ssufficool@php.net>
Date: Thu, 26 Sep 2013 19:53:47 -0700
Subject: FIX BUG #48539 - Disable TEXTLIMIT for FreeTDS driver

---
 ext/pdo_dblib/dblib_driver.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ext/pdo_dblib/dblib_driver.c b/ext/pdo_dblib/dblib_driver.c
index ff42514721..2aaf3975db 100644
--- a/ext/pdo_dblib/dblib_driver.c
+++ b/ext/pdo_dblib/dblib_driver.c
@@ -362,8 +362,10 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
 		goto cleanup;
 	}
 
+#if PHP_DBLIB_IS_MSSQL
 	/* dblib do not return more than this length from text/image */
 	DBSETOPT(H->link, DBTEXTLIMIT, "2147483647");
+#endif
 
 	/* limit text/image from network */
 	DBSETOPT(H->link, DBTEXTSIZE, "2147483647");
-- 
cgit v1.2.1


From 7a1a1aec8c90fff8a24dc53d2232e22fbca3d39f Mon Sep 17 00:00:00 2001
From: Derick Rethans <github@derickrethans.nl>
Date: Fri, 27 Sep 2013 10:14:46 +0100
Subject: - Updated to version 2013.6 (2013f)

---
 ext/date/lib/timezonedb.h | 1578 ++++++++++++++++++++++-----------------------
 1 file changed, 784 insertions(+), 794 deletions(-)

diff --git a/ext/date/lib/timezonedb.h b/ext/date/lib/timezonedb.h
index 1e5706cdcc..8142aab565 100644
--- a/ext/date/lib/timezonedb.h
+++ b/ext/date/lib/timezonedb.h
@@ -58,529 +58,529 @@ const timelib_tzdb_index_entry timezonedb_idx_builtin[579] = {
 	{ "America/Anguilla"                  , 0x002952 },
 	{ "America/Antigua"                   , 0x0029A7 },
 	{ "America/Araguaina"                 , 0x002A0D },
-	{ "America/Argentina/Buenos_Aires"    , 0x002C67 },
-	{ "America/Argentina/Catamarca"       , 0x002E15 },
-	{ "America/Argentina/ComodRivadavia"  , 0x002FD6 },
-	{ "America/Argentina/Cordoba"         , 0x00317C },
-	{ "America/Argentina/Jujuy"           , 0x003351 },
-	{ "America/Argentina/La_Rioja"        , 0x003505 },
-	{ "America/Argentina/Mendoza"         , 0x0036BD },
-	{ "America/Argentina/Rio_Gallegos"    , 0x00387D },
-	{ "America/Argentina/Salta"           , 0x003A32 },
-	{ "America/Argentina/San_Juan"        , 0x003BDE },
-	{ "America/Argentina/San_Luis"        , 0x003D96 },
-	{ "America/Argentina/Tucuman"         , 0x003F5C },
-	{ "America/Argentina/Ushuaia"         , 0x004118 },
-	{ "America/Aruba"                     , 0x0042D3 },
-	{ "America/Asuncion"                  , 0x004339 },
-	{ "America/Atikokan"                  , 0x00461E },
-	{ "America/Atka"                      , 0x0046F4 },
-	{ "America/Bahia"                     , 0x004A5A },
-	{ "America/Bahia_Banderas"            , 0x004BED },
-	{ "America/Barbados"                  , 0x004E66 },
-	{ "America/Belem"                     , 0x004F00 },
-	{ "America/Belize"                    , 0x004FFB },
-	{ "America/Blanc-Sablon"              , 0x005177 },
-	{ "America/Boa_Vista"                 , 0x00522B },
-	{ "America/Bogota"                    , 0x005334 },
-	{ "America/Boise"                     , 0x0053A0 },
-	{ "America/Buenos_Aires"              , 0x005737 },
-	{ "America/Cambridge_Bay"             , 0x0058D0 },
-	{ "America/Campo_Grande"              , 0x005BF8 },
-	{ "America/Cancun"                    , 0x005EE7 },
-	{ "America/Caracas"                   , 0x006129 },
-	{ "America/Catamarca"                 , 0x006190 },
-	{ "America/Cayenne"                   , 0x006336 },
-	{ "America/Cayman"                    , 0x006398 },
-	{ "America/Chicago"                   , 0x0063ED },
-	{ "America/Chihuahua"                 , 0x006904 },
-	{ "America/Coral_Harbour"             , 0x006B6F },
-	{ "America/Cordoba"                   , 0x006C01 },
-	{ "America/Costa_Rica"                , 0x006DA7 },
-	{ "America/Creston"                   , 0x006E31 },
-	{ "America/Cuiaba"                    , 0x006EBD },
-	{ "America/Curacao"                   , 0x00719B },
-	{ "America/Danmarkshavn"              , 0x007201 },
-	{ "America/Dawson"                    , 0x007345 },
-	{ "America/Dawson_Creek"              , 0x007662 },
-	{ "America/Denver"                    , 0x00783C },
-	{ "America/Detroit"                   , 0x007BC2 },
-	{ "America/Dominica"                  , 0x007F21 },
-	{ "America/Edmonton"                  , 0x007F76 },
-	{ "America/Eirunepe"                  , 0x00832E },
-	{ "America/El_Salvador"               , 0x008441 },
-	{ "America/Ensenada"                  , 0x0084B6 },
-	{ "America/Fort_Wayne"                , 0x00895D },
-	{ "America/Fortaleza"                 , 0x00881F },
-	{ "America/Glace_Bay"                 , 0x008BC7 },
-	{ "America/Godthab"                   , 0x008F3E },
-	{ "America/Goose_Bay"                 , 0x009202 },
-	{ "America/Grand_Turk"                , 0x0096BF },
-	{ "America/Grenada"                   , 0x00996E },
-	{ "America/Guadeloupe"                , 0x0099C3 },
-	{ "America/Guatemala"                 , 0x009A18 },
-	{ "America/Guayaquil"                 , 0x009AA1 },
-	{ "America/Guyana"                    , 0x009AFE },
-	{ "America/Halifax"                   , 0x009B7F },
-	{ "America/Havana"                    , 0x00A095 },
-	{ "America/Hermosillo"                , 0x00A408 },
-	{ "America/Indiana/Indianapolis"      , 0x00A4E6 },
-	{ "America/Indiana/Knox"              , 0x00A777 },
-	{ "America/Indiana/Marengo"           , 0x00AB0E },
-	{ "America/Indiana/Petersburg"        , 0x00ADB4 },
-	{ "America/Indiana/Tell_City"         , 0x00B301 },
-	{ "America/Indiana/Vevay"             , 0x00B59A },
-	{ "America/Indiana/Vincennes"         , 0x00B7D5 },
-	{ "America/Indiana/Winamac"           , 0x00BA89 },
-	{ "America/Indianapolis"              , 0x00B097 },
-	{ "America/Inuvik"                    , 0x00BD42 },
-	{ "America/Iqaluit"                   , 0x00C039 },
-	{ "America/Jamaica"                   , 0x00C35B },
-	{ "America/Jujuy"                     , 0x00C420 },
-	{ "America/Juneau"                    , 0x00C5CA },
-	{ "America/Kentucky/Louisville"       , 0x00C948 },
-	{ "America/Kentucky/Monticello"       , 0x00CD66 },
-	{ "America/Knox_IN"                   , 0x00D0EB },
-	{ "America/Kralendijk"                , 0x00D45C },
-	{ "America/La_Paz"                    , 0x00D4C2 },
-	{ "America/Lima"                      , 0x00D529 },
-	{ "America/Los_Angeles"               , 0x00D5D1 },
-	{ "America/Louisville"                , 0x00D9E2 },
-	{ "America/Lower_Princes"             , 0x00DDD7 },
-	{ "America/Maceio"                    , 0x00DE3D },
-	{ "America/Managua"                   , 0x00DF77 },
-	{ "America/Manaus"                    , 0x00E02A },
-	{ "America/Marigot"                   , 0x00E12C },
-	{ "America/Martinique"                , 0x00E181 },
-	{ "America/Matamoros"                 , 0x00E1ED },
-	{ "America/Mazatlan"                  , 0x00E446 },
-	{ "America/Mendoza"                   , 0x00E6B3 },
-	{ "America/Menominee"                 , 0x00E867 },
-	{ "America/Merida"                    , 0x00EBE8 },
-	{ "America/Metlakatla"                , 0x00EE23 },
-	{ "America/Mexico_City"               , 0x00EF5D },
-	{ "America/Miquelon"                  , 0x00F1D8 },
-	{ "America/Moncton"                   , 0x00F44A },
-	{ "America/Monterrey"                 , 0x00F8E1 },
-	{ "America/Montevideo"                , 0x00FB44 },
-	{ "America/Montreal"                  , 0x00FE56 },
-	{ "America/Montserrat"                , 0x01036C },
-	{ "America/Nassau"                    , 0x0103C1 },
-	{ "America/New_York"                  , 0x010706 },
-	{ "America/Nipigon"                   , 0x010C11 },
-	{ "America/Nome"                      , 0x010F62 },
-	{ "America/Noronha"                   , 0x0112E0 },
-	{ "America/North_Dakota/Beulah"       , 0x011410 },
-	{ "America/North_Dakota/Center"       , 0x0117A4 },
-	{ "America/North_Dakota/New_Salem"    , 0x011B38 },
-	{ "America/Ojinaga"                   , 0x011EE1 },
-	{ "America/Panama"                    , 0x012142 },
-	{ "America/Pangnirtung"               , 0x012197 },
-	{ "America/Paramaribo"                , 0x0124CD },
-	{ "America/Phoenix"                   , 0x01255F },
-	{ "America/Port-au-Prince"            , 0x01260D },
-	{ "America/Port_of_Spain"             , 0x01292C },
-	{ "America/Porto_Acre"                , 0x01282D },
-	{ "America/Porto_Velho"               , 0x012981 },
-	{ "America/Puerto_Rico"               , 0x012A77 },
-	{ "America/Rainy_River"               , 0x012AE2 },
-	{ "America/Rankin_Inlet"              , 0x012E1A },
-	{ "America/Recife"                    , 0x013100 },
-	{ "America/Regina"                    , 0x01322A },
-	{ "America/Resolute"                  , 0x0133E8 },
-	{ "America/Rio_Branco"                , 0x0136D9 },
-	{ "America/Rosario"                   , 0x0137DC },
-	{ "America/Santa_Isabel"              , 0x013982 },
-	{ "America/Santarem"                  , 0x013D25 },
-	{ "America/Santiago"                  , 0x013E2A },
-	{ "America/Santo_Domingo"             , 0x0141D3 },
-	{ "America/Sao_Paulo"                 , 0x014299 },
-	{ "America/Scoresbysund"              , 0x0145A8 },
-	{ "America/Shiprock"                  , 0x014896 },
-	{ "America/Sitka"                     , 0x014C25 },
-	{ "America/St_Barthelemy"             , 0x014FAD },
-	{ "America/St_Johns"                  , 0x015002 },
-	{ "America/St_Kitts"                  , 0x015555 },
-	{ "America/St_Lucia"                  , 0x0155AA },
-	{ "America/St_Thomas"                 , 0x0155FF },
-	{ "America/St_Vincent"                , 0x015654 },
-	{ "America/Swift_Current"             , 0x0156A9 },
-	{ "America/Tegucigalpa"               , 0x0157CA },
-	{ "America/Thule"                     , 0x015849 },
-	{ "America/Thunder_Bay"               , 0x015A90 },
-	{ "America/Tijuana"                   , 0x015DD9 },
-	{ "America/Toronto"                   , 0x016172 },
-	{ "America/Tortola"                   , 0x016689 },
-	{ "America/Vancouver"                 , 0x0166DE },
-	{ "America/Virgin"                    , 0x016B1B },
-	{ "America/Whitehorse"                , 0x016B70 },
-	{ "America/Winnipeg"                  , 0x016E8D },
-	{ "America/Yakutat"                   , 0x0172CD },
-	{ "America/Yellowknife"               , 0x017638 },
-	{ "Antarctica/Casey"                  , 0x017948 },
-	{ "Antarctica/Davis"                  , 0x0179E5 },
-	{ "Antarctica/DumontDUrville"         , 0x017A86 },
-	{ "Antarctica/Macquarie"              , 0x017B18 },
-	{ "Antarctica/Mawson"                 , 0x017D5F },
-	{ "Antarctica/McMurdo"                , 0x017DDB },
-	{ "Antarctica/Palmer"                 , 0x0180DD },
-	{ "Antarctica/Rothera"                , 0x0183F9 },
-	{ "Antarctica/South_Pole"             , 0x01846F },
-	{ "Antarctica/Syowa"                  , 0x018777 },
-	{ "Antarctica/Vostok"                 , 0x0187E5 },
-	{ "Arctic/Longyearbyen"               , 0x018856 },
-	{ "Asia/Aden"                         , 0x018B88 },
-	{ "Asia/Almaty"                       , 0x018BDD },
-	{ "Asia/Amman"                        , 0x018D5C },
-	{ "Asia/Anadyr"                       , 0x019012 },
-	{ "Asia/Aqtau"                        , 0x0191F7 },
-	{ "Asia/Aqtobe"                       , 0x0193F6 },
-	{ "Asia/Ashgabat"                     , 0x0195AE },
-	{ "Asia/Ashkhabad"                    , 0x0196CB },
-	{ "Asia/Baghdad"                      , 0x0197E8 },
-	{ "Asia/Bahrain"                      , 0x01995D },
-	{ "Asia/Baku"                         , 0x0199C3 },
-	{ "Asia/Bangkok"                      , 0x019CAB },
-	{ "Asia/Beirut"                       , 0x019D00 },
-	{ "Asia/Bishkek"                      , 0x01A00D },
-	{ "Asia/Brunei"                       , 0x01A1B9 },
-	{ "Asia/Calcutta"                     , 0x01A21B },
-	{ "Asia/Choibalsan"                   , 0x01A294 },
-	{ "Asia/Chongqing"                    , 0x01A40D },
-	{ "Asia/Chungking"                    , 0x01A4FC },
-	{ "Asia/Colombo"                      , 0x01A5AB },
-	{ "Asia/Dacca"                        , 0x01A647 },
-	{ "Asia/Damascus"                     , 0x01A6ED },
-	{ "Asia/Dhaka"                        , 0x01AA3D },
-	{ "Asia/Dili"                         , 0x01AAE3 },
-	{ "Asia/Dubai"                        , 0x01AB6C },
-	{ "Asia/Dushanbe"                     , 0x01ABC1 },
-	{ "Asia/Gaza"                         , 0x01ACC4 },
-	{ "Asia/Harbin"                       , 0x01B017 },
-	{ "Asia/Hebron"                       , 0x01B0FE },
-	{ "Asia/Ho_Chi_Minh"                  , 0x01B45A },
-	{ "Asia/Hong_Kong"                    , 0x01B4D2 },
-	{ "Asia/Hovd"                         , 0x01B694 },
-	{ "Asia/Irkutsk"                      , 0x01B80C },
-	{ "Asia/Istanbul"                     , 0x01B9F2 },
-	{ "Asia/Jakarta"                      , 0x01BDDF },
-	{ "Asia/Jayapura"                     , 0x01BE89 },
-	{ "Asia/Jerusalem"                    , 0x01BF25 },
-	{ "Asia/Kabul"                        , 0x01C254 },
-	{ "Asia/Kamchatka"                    , 0x01C2A5 },
-	{ "Asia/Karachi"                      , 0x01C481 },
-	{ "Asia/Kashgar"                      , 0x01C536 },
-	{ "Asia/Kathmandu"                    , 0x01C607 },
-	{ "Asia/Katmandu"                     , 0x01C66D },
-	{ "Asia/Khandyga"                     , 0x01C6D3 },
-	{ "Asia/Kolkata"                      , 0x01C8F8 },
-	{ "Asia/Krasnoyarsk"                  , 0x01C971 },
-	{ "Asia/Kuala_Lumpur"                 , 0x01CB59 },
-	{ "Asia/Kuching"                      , 0x01CC16 },
-	{ "Asia/Kuwait"                       , 0x01CD04 },
-	{ "Asia/Macao"                        , 0x01CD59 },
-	{ "Asia/Macau"                        , 0x01CE94 },
-	{ "Asia/Magadan"                      , 0x01CFCF },
-	{ "Asia/Makassar"                     , 0x01D1B1 },
-	{ "Asia/Manila"                       , 0x01D275 },
-	{ "Asia/Muscat"                       , 0x01D2FA },
-	{ "Asia/Nicosia"                      , 0x01D34F },
-	{ "Asia/Novokuznetsk"                 , 0x01D637 },
-	{ "Asia/Novosibirsk"                  , 0x01D839 },
-	{ "Asia/Omsk"                         , 0x01DA24 },
-	{ "Asia/Oral"                         , 0x01DC0B },
-	{ "Asia/Phnom_Penh"                   , 0x01DDDB },
-	{ "Asia/Pontianak"                    , 0x01DE53 },
-	{ "Asia/Pyongyang"                    , 0x01DF14 },
-	{ "Asia/Qatar"                        , 0x01DF81 },
-	{ "Asia/Qyzylorda"                    , 0x01DFE7 },
-	{ "Asia/Rangoon"                      , 0x01E1BD },
-	{ "Asia/Riyadh"                       , 0x01E235 },
-	{ "Asia/Saigon"                       , 0x01E28A },
-	{ "Asia/Sakhalin"                     , 0x01E302 },
-	{ "Asia/Samarkand"                    , 0x01E4F9 },
-	{ "Asia/Seoul"                        , 0x01E62F },
-	{ "Asia/Shanghai"                     , 0x01E6D3 },
-	{ "Asia/Singapore"                    , 0x01E7B3 },
-	{ "Asia/Taipei"                       , 0x01E86A },
-	{ "Asia/Tashkent"                     , 0x01E982 },
-	{ "Asia/Tbilisi"                      , 0x01EAB3 },
-	{ "Asia/Tehran"                       , 0x01EC6D },
-	{ "Asia/Tel_Aviv"                     , 0x01EEDB },
-	{ "Asia/Thimbu"                       , 0x01F20A },
-	{ "Asia/Thimphu"                      , 0x01F270 },
-	{ "Asia/Tokyo"                        , 0x01F2D6 },
-	{ "Asia/Ujung_Pandang"                , 0x01F35F },
-	{ "Asia/Ulaanbaatar"                  , 0x01F3DB },
-	{ "Asia/Ulan_Bator"                   , 0x01F536 },
-	{ "Asia/Urumqi"                       , 0x01F683 },
-	{ "Asia/Ust-Nera"                     , 0x01F74A },
-	{ "Asia/Vientiane"                    , 0x01F94F },
-	{ "Asia/Vladivostok"                  , 0x01F9C7 },
-	{ "Asia/Yakutsk"                      , 0x01FBB3 },
-	{ "Asia/Yekaterinburg"                , 0x01FD98 },
-	{ "Asia/Yerevan"                      , 0x01FFA3 },
-	{ "Atlantic/Azores"                   , 0x0201A3 },
-	{ "Atlantic/Bermuda"                  , 0x0206A6 },
-	{ "Atlantic/Canary"                   , 0x020987 },
-	{ "Atlantic/Cape_Verde"               , 0x020C5D },
-	{ "Atlantic/Faeroe"                   , 0x020CD6 },
-	{ "Atlantic/Faroe"                    , 0x020F7A },
-	{ "Atlantic/Jan_Mayen"                , 0x02121E },
-	{ "Atlantic/Madeira"                  , 0x021550 },
-	{ "Atlantic/Reykjavik"                , 0x021A59 },
-	{ "Atlantic/South_Georgia"            , 0x021C12 },
-	{ "Atlantic/St_Helena"                , 0x021E24 },
-	{ "Atlantic/Stanley"                  , 0x021C56 },
-	{ "Australia/ACT"                     , 0x021E79 },
-	{ "Australia/Adelaide"                , 0x022196 },
-	{ "Australia/Brisbane"                , 0x0224C2 },
-	{ "Australia/Broken_Hill"             , 0x022589 },
-	{ "Australia/Canberra"                , 0x0228C7 },
-	{ "Australia/Currie"                  , 0x022BE4 },
-	{ "Australia/Darwin"                  , 0x022F17 },
-	{ "Australia/Eucla"                   , 0x022F9D },
-	{ "Australia/Hobart"                  , 0x023072 },
-	{ "Australia/LHI"                     , 0x0233D0 },
-	{ "Australia/Lindeman"                , 0x02366B },
-	{ "Australia/Lord_Howe"               , 0x02374C },
-	{ "Australia/Melbourne"               , 0x0239F7 },
-	{ "Australia/North"                   , 0x023D1C },
-	{ "Australia/NSW"                     , 0x023D90 },
-	{ "Australia/Perth"                   , 0x0240AD },
-	{ "Australia/Queensland"              , 0x024185 },
-	{ "Australia/South"                   , 0x024231 },
-	{ "Australia/Sydney"                  , 0x02454E },
-	{ "Australia/Tasmania"                , 0x02488B },
-	{ "Australia/Victoria"                , 0x024BD0 },
-	{ "Australia/West"                    , 0x024EED },
-	{ "Australia/Yancowinna"              , 0x024FA3 },
-	{ "Brazil/Acre"                       , 0x0252C5 },
-	{ "Brazil/DeNoronha"                  , 0x0253C4 },
-	{ "Brazil/East"                       , 0x0254E4 },
-	{ "Brazil/West"                       , 0x0257C1 },
-	{ "Canada/Atlantic"                   , 0x0258B9 },
-	{ "Canada/Central"                    , 0x025DA1 },
-	{ "Canada/East-Saskatchewan"          , 0x0266AB },
-	{ "Canada/Eastern"                    , 0x0261BB },
-	{ "Canada/Mountain"                   , 0x026834 },
-	{ "Canada/Newfoundland"               , 0x026BAA },
-	{ "Canada/Pacific"                    , 0x0270D5 },
-	{ "Canada/Saskatchewan"               , 0x0274EE },
-	{ "Canada/Yukon"                      , 0x027677 },
-	{ "CET"                               , 0x02797A },
-	{ "Chile/Continental"                 , 0x027C83 },
-	{ "Chile/EasterIsland"                , 0x02801E },
-	{ "CST6CDT"                           , 0x028360 },
-	{ "Cuba"                              , 0x0286B1 },
-	{ "EET"                               , 0x028A24 },
-	{ "Egypt"                             , 0x028CD7 },
-	{ "Eire"                              , 0x028F9A },
-	{ "EST"                               , 0x0294AB },
-	{ "EST5EDT"                           , 0x0294EF },
-	{ "Etc/GMT"                           , 0x029840 },
-	{ "Etc/GMT+0"                         , 0x02990C },
-	{ "Etc/GMT+1"                         , 0x029996 },
-	{ "Etc/GMT+10"                        , 0x029A23 },
-	{ "Etc/GMT+11"                        , 0x029AB1 },
-	{ "Etc/GMT+12"                        , 0x029B3F },
-	{ "Etc/GMT+2"                         , 0x029C5A },
-	{ "Etc/GMT+3"                         , 0x029CE6 },
-	{ "Etc/GMT+4"                         , 0x029D72 },
-	{ "Etc/GMT+5"                         , 0x029DFE },
-	{ "Etc/GMT+6"                         , 0x029E8A },
-	{ "Etc/GMT+7"                         , 0x029F16 },
-	{ "Etc/GMT+8"                         , 0x029FA2 },
-	{ "Etc/GMT+9"                         , 0x02A02E },
-	{ "Etc/GMT-0"                         , 0x0298C8 },
-	{ "Etc/GMT-1"                         , 0x029950 },
-	{ "Etc/GMT-10"                        , 0x0299DC },
-	{ "Etc/GMT-11"                        , 0x029A6A },
-	{ "Etc/GMT-12"                        , 0x029AF8 },
-	{ "Etc/GMT-13"                        , 0x029B86 },
-	{ "Etc/GMT-14"                        , 0x029BCD },
-	{ "Etc/GMT-2"                         , 0x029C14 },
-	{ "Etc/GMT-3"                         , 0x029CA0 },
-	{ "Etc/GMT-4"                         , 0x029D2C },
-	{ "Etc/GMT-5"                         , 0x029DB8 },
-	{ "Etc/GMT-6"                         , 0x029E44 },
-	{ "Etc/GMT-7"                         , 0x029ED0 },
-	{ "Etc/GMT-8"                         , 0x029F5C },
-	{ "Etc/GMT-9"                         , 0x029FE8 },
-	{ "Etc/GMT0"                          , 0x029884 },
-	{ "Etc/Greenwich"                     , 0x02A074 },
-	{ "Etc/UCT"                           , 0x02A0B8 },
-	{ "Etc/Universal"                     , 0x02A0FC },
-	{ "Etc/UTC"                           , 0x02A140 },
-	{ "Etc/Zulu"                          , 0x02A184 },
-	{ "Europe/Amsterdam"                  , 0x02A1C8 },
-	{ "Europe/Andorra"                    , 0x02A606 },
-	{ "Europe/Athens"                     , 0x02A882 },
-	{ "Europe/Belfast"                    , 0x02ABC5 },
-	{ "Europe/Belgrade"                   , 0x02B0FC },
-	{ "Europe/Berlin"                     , 0x02B3C5 },
-	{ "Europe/Bratislava"                 , 0x02B729 },
-	{ "Europe/Brussels"                   , 0x02BA5B },
-	{ "Europe/Bucharest"                  , 0x02BE92 },
-	{ "Europe/Budapest"                   , 0x02C1BC },
-	{ "Europe/Busingen"                   , 0x02C52F },
-	{ "Europe/Chisinau"                   , 0x02C7E6 },
-	{ "Europe/Copenhagen"                 , 0x02CB74 },
-	{ "Europe/Dublin"                     , 0x02CE7E },
-	{ "Europe/Gibraltar"                  , 0x02D38F },
-	{ "Europe/Guernsey"                   , 0x02D7E6 },
-	{ "Europe/Helsinki"                   , 0x02DD1D },
-	{ "Europe/Isle_of_Man"                , 0x02DFD3 },
-	{ "Europe/Istanbul"                   , 0x02E50A },
-	{ "Europe/Jersey"                     , 0x02E8F7 },
-	{ "Europe/Kaliningrad"                , 0x02EE2E },
-	{ "Europe/Kiev"                       , 0x02F094 },
-	{ "Europe/Lisbon"                     , 0x02F3AB },
-	{ "Europe/Ljubljana"                  , 0x02F8AF },
-	{ "Europe/London"                     , 0x02FB78 },
-	{ "Europe/Luxembourg"                 , 0x0300AF },
-	{ "Europe/Madrid"                     , 0x030505 },
-	{ "Europe/Malta"                      , 0x0308CB },
-	{ "Europe/Mariehamn"                  , 0x030C84 },
-	{ "Europe/Minsk"                      , 0x030F3A },
-	{ "Europe/Monaco"                     , 0x031148 },
-	{ "Europe/Moscow"                     , 0x031583 },
-	{ "Europe/Nicosia"                    , 0x0317D4 },
-	{ "Europe/Oslo"                       , 0x031ABC },
-	{ "Europe/Paris"                      , 0x031DEE },
-	{ "Europe/Podgorica"                  , 0x032234 },
-	{ "Europe/Prague"                     , 0x0324FD },
-	{ "Europe/Riga"                       , 0x03282F },
-	{ "Europe/Rome"                       , 0x032B74 },
-	{ "Europe/Samara"                     , 0x032F37 },
-	{ "Europe/San_Marino"                 , 0x03316A },
-	{ "Europe/Sarajevo"                   , 0x03352D },
-	{ "Europe/Simferopol"                 , 0x0337F6 },
-	{ "Europe/Skopje"                     , 0x033B21 },
-	{ "Europe/Sofia"                      , 0x033DEA },
-	{ "Europe/Stockholm"                  , 0x0340F2 },
-	{ "Europe/Tallinn"                    , 0x0343A1 },
-	{ "Europe/Tirane"                     , 0x0346DB },
-	{ "Europe/Tiraspol"                   , 0x0349E1 },
-	{ "Europe/Uzhgorod"                   , 0x034D6F },
-	{ "Europe/Vaduz"                      , 0x035086 },
-	{ "Europe/Vatican"                    , 0x035319 },
-	{ "Europe/Vienna"                     , 0x0356DC },
-	{ "Europe/Vilnius"                    , 0x035A09 },
-	{ "Europe/Volgograd"                  , 0x035D48 },
-	{ "Europe/Warsaw"                     , 0x035F48 },
-	{ "Europe/Zagreb"                     , 0x036329 },
-	{ "Europe/Zaporozhye"                 , 0x0365F2 },
-	{ "Europe/Zurich"                     , 0x036933 },
-	{ "Factory"                           , 0x036BE2 },
-	{ "GB"                                , 0x036C53 },
-	{ "GB-Eire"                           , 0x03718A },
-	{ "GMT"                               , 0x0376C1 },
-	{ "GMT+0"                             , 0x03778D },
-	{ "GMT-0"                             , 0x037749 },
-	{ "GMT0"                              , 0x037705 },
-	{ "Greenwich"                         , 0x0377D1 },
-	{ "Hongkong"                          , 0x037815 },
-	{ "HST"                               , 0x0379D7 },
-	{ "Iceland"                           , 0x037A1B },
-	{ "Indian/Antananarivo"               , 0x037BD4 },
-	{ "Indian/Chagos"                     , 0x037C48 },
-	{ "Indian/Christmas"                  , 0x037CAA },
-	{ "Indian/Cocos"                      , 0x037CEE },
-	{ "Indian/Comoro"                     , 0x037D32 },
-	{ "Indian/Kerguelen"                  , 0x037D87 },
-	{ "Indian/Mahe"                       , 0x037DDC },
-	{ "Indian/Maldives"                   , 0x037E31 },
-	{ "Indian/Mauritius"                  , 0x037E86 },
-	{ "Indian/Mayotte"                    , 0x037EFC },
-	{ "Indian/Reunion"                    , 0x037F51 },
-	{ "Iran"                              , 0x037FA6 },
-	{ "Israel"                            , 0x038214 },
-	{ "Jamaica"                           , 0x038543 },
-	{ "Japan"                             , 0x038608 },
-	{ "Kwajalein"                         , 0x038691 },
-	{ "Libya"                             , 0x0386F4 },
-	{ "MET"                               , 0x0388ED },
-	{ "Mexico/BajaNorte"                  , 0x038BF6 },
-	{ "Mexico/BajaSur"                    , 0x038F5F },
-	{ "Mexico/General"                    , 0x0391A4 },
-	{ "MST"                               , 0x039402 },
-	{ "MST7MDT"                           , 0x039446 },
-	{ "Navajo"                            , 0x039797 },
-	{ "NZ"                                , 0x039B10 },
-	{ "NZ-CHAT"                           , 0x039E8E },
-	{ "Pacific/Apia"                      , 0x03A176 },
-	{ "Pacific/Auckland"                  , 0x03A312 },
-	{ "Pacific/Chatham"                   , 0x03A69E },
-	{ "Pacific/Chuuk"                     , 0x03A995 },
-	{ "Pacific/Easter"                    , 0x03A9EE },
-	{ "Pacific/Efate"                     , 0x03AD4C },
-	{ "Pacific/Enderbury"                 , 0x03AE12 },
-	{ "Pacific/Fakaofo"                   , 0x03AE80 },
-	{ "Pacific/Fiji"                      , 0x03AED1 },
-	{ "Pacific/Funafuti"                  , 0x03B064 },
-	{ "Pacific/Galapagos"                 , 0x03B0A8 },
-	{ "Pacific/Gambier"                   , 0x03B120 },
-	{ "Pacific/Guadalcanal"               , 0x03B185 },
-	{ "Pacific/Guam"                      , 0x03B1DA },
-	{ "Pacific/Honolulu"                  , 0x03B230 },
-	{ "Pacific/Johnston"                  , 0x03B2A7 },
-	{ "Pacific/Kiritimati"                , 0x03B2F9 },
-	{ "Pacific/Kosrae"                    , 0x03B364 },
-	{ "Pacific/Kwajalein"                 , 0x03B3C1 },
-	{ "Pacific/Majuro"                    , 0x03B42D },
-	{ "Pacific/Marquesas"                 , 0x03B48C },
-	{ "Pacific/Midway"                    , 0x03B4F3 },
-	{ "Pacific/Nauru"                     , 0x03B57D },
-	{ "Pacific/Niue"                      , 0x03B5F5 },
-	{ "Pacific/Norfolk"                   , 0x03B653 },
-	{ "Pacific/Noumea"                    , 0x03B6A8 },
-	{ "Pacific/Pago_Pago"                 , 0x03B738 },
-	{ "Pacific/Palau"                     , 0x03B7C1 },
-	{ "Pacific/Pitcairn"                  , 0x03B805 },
-	{ "Pacific/Pohnpei"                   , 0x03B85A },
-	{ "Pacific/Ponape"                    , 0x03B8AF },
-	{ "Pacific/Port_Moresby"              , 0x03B8F4 },
-	{ "Pacific/Rarotonga"                 , 0x03B938 },
-	{ "Pacific/Saipan"                    , 0x03BA14 },
-	{ "Pacific/Samoa"                     , 0x03BA77 },
-	{ "Pacific/Tahiti"                    , 0x03BB00 },
-	{ "Pacific/Tarawa"                    , 0x03BB65 },
-	{ "Pacific/Tongatapu"                 , 0x03BBB9 },
-	{ "Pacific/Truk"                      , 0x03BC45 },
-	{ "Pacific/Wake"                      , 0x03BC8A },
-	{ "Pacific/Wallis"                    , 0x03BCDA },
-	{ "Pacific/Yap"                       , 0x03BD1E },
-	{ "Poland"                            , 0x03BD63 },
-	{ "Portugal"                          , 0x03C144 },
-	{ "PRC"                               , 0x03C640 },
-	{ "PST8PDT"                           , 0x03C6F1 },
-	{ "ROC"                               , 0x03CA42 },
-	{ "ROK"                               , 0x03CB5A },
-	{ "Singapore"                         , 0x03CBFE },
-	{ "Turkey"                            , 0x03CCB5 },
-	{ "UCT"                               , 0x03D0A2 },
-	{ "Universal"                         , 0x03D0E6 },
-	{ "US/Alaska"                         , 0x03D12A },
-	{ "US/Aleutian"                       , 0x03D493 },
-	{ "US/Arizona"                        , 0x03D7F9 },
-	{ "US/Central"                        , 0x03D887 },
-	{ "US/East-Indiana"                   , 0x03E291 },
-	{ "US/Eastern"                        , 0x03DD92 },
-	{ "US/Hawaii"                         , 0x03E4FB },
-	{ "US/Indiana-Starke"                 , 0x03E56C },
-	{ "US/Michigan"                       , 0x03E8DD },
-	{ "US/Mountain"                       , 0x03EC14 },
-	{ "US/Pacific"                        , 0x03EF8D },
-	{ "US/Pacific-New"                    , 0x03F392 },
-	{ "US/Samoa"                          , 0x03F797 },
-	{ "UTC"                               , 0x03F820 },
-	{ "W-SU"                              , 0x03FB17 },
-	{ "WET"                               , 0x03F864 },
-	{ "Zulu"                              , 0x03FD51 },
+	{ "America/Argentina/Buenos_Aires"    , 0x002B72 },
+	{ "America/Argentina/Catamarca"       , 0x002D20 },
+	{ "America/Argentina/ComodRivadavia"  , 0x002EE1 },
+	{ "America/Argentina/Cordoba"         , 0x003087 },
+	{ "America/Argentina/Jujuy"           , 0x00325C },
+	{ "America/Argentina/La_Rioja"        , 0x003410 },
+	{ "America/Argentina/Mendoza"         , 0x0035C8 },
+	{ "America/Argentina/Rio_Gallegos"    , 0x003788 },
+	{ "America/Argentina/Salta"           , 0x00393D },
+	{ "America/Argentina/San_Juan"        , 0x003AE9 },
+	{ "America/Argentina/San_Luis"        , 0x003CA1 },
+	{ "America/Argentina/Tucuman"         , 0x003E67 },
+	{ "America/Argentina/Ushuaia"         , 0x004023 },
+	{ "America/Aruba"                     , 0x0041DE },
+	{ "America/Asuncion"                  , 0x004244 },
+	{ "America/Atikokan"                  , 0x004529 },
+	{ "America/Atka"                      , 0x0045FF },
+	{ "America/Bahia"                     , 0x004965 },
+	{ "America/Bahia_Banderas"            , 0x004AF8 },
+	{ "America/Barbados"                  , 0x004D71 },
+	{ "America/Belem"                     , 0x004E0B },
+	{ "America/Belize"                    , 0x004F06 },
+	{ "America/Blanc-Sablon"              , 0x005082 },
+	{ "America/Boa_Vista"                 , 0x005136 },
+	{ "America/Bogota"                    , 0x00523F },
+	{ "America/Boise"                     , 0x0052AB },
+	{ "America/Buenos_Aires"              , 0x005642 },
+	{ "America/Cambridge_Bay"             , 0x0057DB },
+	{ "America/Campo_Grande"              , 0x005B03 },
+	{ "America/Cancun"                    , 0x005DF2 },
+	{ "America/Caracas"                   , 0x006034 },
+	{ "America/Catamarca"                 , 0x00609B },
+	{ "America/Cayenne"                   , 0x006241 },
+	{ "America/Cayman"                    , 0x0062A3 },
+	{ "America/Chicago"                   , 0x0062F8 },
+	{ "America/Chihuahua"                 , 0x00680F },
+	{ "America/Coral_Harbour"             , 0x006A7A },
+	{ "America/Cordoba"                   , 0x006B0C },
+	{ "America/Costa_Rica"                , 0x006CB2 },
+	{ "America/Creston"                   , 0x006D3C },
+	{ "America/Cuiaba"                    , 0x006DC8 },
+	{ "America/Curacao"                   , 0x0070A6 },
+	{ "America/Danmarkshavn"              , 0x00710C },
+	{ "America/Dawson"                    , 0x007250 },
+	{ "America/Dawson_Creek"              , 0x00756D },
+	{ "America/Denver"                    , 0x007747 },
+	{ "America/Detroit"                   , 0x007ACD },
+	{ "America/Dominica"                  , 0x007E2C },
+	{ "America/Edmonton"                  , 0x007E81 },
+	{ "America/Eirunepe"                  , 0x008239 },
+	{ "America/El_Salvador"               , 0x00834C },
+	{ "America/Ensenada"                  , 0x0083C1 },
+	{ "America/Fort_Wayne"                , 0x008868 },
+	{ "America/Fortaleza"                 , 0x00872A },
+	{ "America/Glace_Bay"                 , 0x008AD2 },
+	{ "America/Godthab"                   , 0x008E49 },
+	{ "America/Goose_Bay"                 , 0x00910D },
+	{ "America/Grand_Turk"                , 0x0095CA },
+	{ "America/Grenada"                   , 0x009879 },
+	{ "America/Guadeloupe"                , 0x0098CE },
+	{ "America/Guatemala"                 , 0x009923 },
+	{ "America/Guayaquil"                 , 0x0099AC },
+	{ "America/Guyana"                    , 0x009A09 },
+	{ "America/Halifax"                   , 0x009A8A },
+	{ "America/Havana"                    , 0x009FA0 },
+	{ "America/Hermosillo"                , 0x00A313 },
+	{ "America/Indiana/Indianapolis"      , 0x00A3F1 },
+	{ "America/Indiana/Knox"              , 0x00A682 },
+	{ "America/Indiana/Marengo"           , 0x00AA19 },
+	{ "America/Indiana/Petersburg"        , 0x00ACBF },
+	{ "America/Indiana/Tell_City"         , 0x00B20C },
+	{ "America/Indiana/Vevay"             , 0x00B4A5 },
+	{ "America/Indiana/Vincennes"         , 0x00B6E0 },
+	{ "America/Indiana/Winamac"           , 0x00B994 },
+	{ "America/Indianapolis"              , 0x00AFA2 },
+	{ "America/Inuvik"                    , 0x00BC4D },
+	{ "America/Iqaluit"                   , 0x00BF44 },
+	{ "America/Jamaica"                   , 0x00C266 },
+	{ "America/Jujuy"                     , 0x00C32B },
+	{ "America/Juneau"                    , 0x00C4D5 },
+	{ "America/Kentucky/Louisville"       , 0x00C853 },
+	{ "America/Kentucky/Monticello"       , 0x00CC71 },
+	{ "America/Knox_IN"                   , 0x00CFF6 },
+	{ "America/Kralendijk"                , 0x00D367 },
+	{ "America/La_Paz"                    , 0x00D3CD },
+	{ "America/Lima"                      , 0x00D434 },
+	{ "America/Los_Angeles"               , 0x00D4DC },
+	{ "America/Louisville"                , 0x00D8ED },
+	{ "America/Lower_Princes"             , 0x00DCE2 },
+	{ "America/Maceio"                    , 0x00DD48 },
+	{ "America/Managua"                   , 0x00DE82 },
+	{ "America/Manaus"                    , 0x00DF35 },
+	{ "America/Marigot"                   , 0x00E037 },
+	{ "America/Martinique"                , 0x00E08C },
+	{ "America/Matamoros"                 , 0x00E0F8 },
+	{ "America/Mazatlan"                  , 0x00E351 },
+	{ "America/Mendoza"                   , 0x00E5BE },
+	{ "America/Menominee"                 , 0x00E772 },
+	{ "America/Merida"                    , 0x00EAF3 },
+	{ "America/Metlakatla"                , 0x00ED2E },
+	{ "America/Mexico_City"               , 0x00EE68 },
+	{ "America/Miquelon"                  , 0x00F0E3 },
+	{ "America/Moncton"                   , 0x00F355 },
+	{ "America/Monterrey"                 , 0x00F7EC },
+	{ "America/Montevideo"                , 0x00FA4F },
+	{ "America/Montreal"                  , 0x00FD61 },
+	{ "America/Montserrat"                , 0x010251 },
+	{ "America/Nassau"                    , 0x0102A6 },
+	{ "America/New_York"                  , 0x0105EB },
+	{ "America/Nipigon"                   , 0x010AF6 },
+	{ "America/Nome"                      , 0x010E47 },
+	{ "America/Noronha"                   , 0x0111C5 },
+	{ "America/North_Dakota/Beulah"       , 0x0112F5 },
+	{ "America/North_Dakota/Center"       , 0x011689 },
+	{ "America/North_Dakota/New_Salem"    , 0x011A1D },
+	{ "America/Ojinaga"                   , 0x011DC6 },
+	{ "America/Panama"                    , 0x012027 },
+	{ "America/Pangnirtung"               , 0x01207C },
+	{ "America/Paramaribo"                , 0x0123B2 },
+	{ "America/Phoenix"                   , 0x012444 },
+	{ "America/Port-au-Prince"            , 0x012502 },
+	{ "America/Port_of_Spain"             , 0x012821 },
+	{ "America/Porto_Acre"                , 0x012722 },
+	{ "America/Porto_Velho"               , 0x012876 },
+	{ "America/Puerto_Rico"               , 0x01296C },
+	{ "America/Rainy_River"               , 0x0129D7 },
+	{ "America/Rankin_Inlet"              , 0x012D0F },
+	{ "America/Recife"                    , 0x012FF5 },
+	{ "America/Regina"                    , 0x01311F },
+	{ "America/Resolute"                  , 0x0132DD },
+	{ "America/Rio_Branco"                , 0x0135CE },
+	{ "America/Rosario"                   , 0x0136D1 },
+	{ "America/Santa_Isabel"              , 0x013877 },
+	{ "America/Santarem"                  , 0x013C1A },
+	{ "America/Santiago"                  , 0x013D1F },
+	{ "America/Santo_Domingo"             , 0x0140C8 },
+	{ "America/Sao_Paulo"                 , 0x01418E },
+	{ "America/Scoresbysund"              , 0x01449D },
+	{ "America/Shiprock"                  , 0x01478B },
+	{ "America/Sitka"                     , 0x014B04 },
+	{ "America/St_Barthelemy"             , 0x014E8C },
+	{ "America/St_Johns"                  , 0x014EE1 },
+	{ "America/St_Kitts"                  , 0x015434 },
+	{ "America/St_Lucia"                  , 0x015489 },
+	{ "America/St_Thomas"                 , 0x0154DE },
+	{ "America/St_Vincent"                , 0x015533 },
+	{ "America/Swift_Current"             , 0x015588 },
+	{ "America/Tegucigalpa"               , 0x0156A9 },
+	{ "America/Thule"                     , 0x015728 },
+	{ "America/Thunder_Bay"               , 0x01596F },
+	{ "America/Tijuana"                   , 0x015CB8 },
+	{ "America/Toronto"                   , 0x016051 },
+	{ "America/Tortola"                   , 0x016571 },
+	{ "America/Vancouver"                 , 0x0165C6 },
+	{ "America/Virgin"                    , 0x016A03 },
+	{ "America/Whitehorse"                , 0x016A58 },
+	{ "America/Winnipeg"                  , 0x016D75 },
+	{ "America/Yakutat"                   , 0x0171B5 },
+	{ "America/Yellowknife"               , 0x017520 },
+	{ "Antarctica/Casey"                  , 0x017830 },
+	{ "Antarctica/Davis"                  , 0x0178CD },
+	{ "Antarctica/DumontDUrville"         , 0x01796E },
+	{ "Antarctica/Macquarie"              , 0x017A00 },
+	{ "Antarctica/Mawson"                 , 0x017C47 },
+	{ "Antarctica/McMurdo"                , 0x017CC3 },
+	{ "Antarctica/Palmer"                 , 0x01806E },
+	{ "Antarctica/Rothera"                , 0x01838A },
+	{ "Antarctica/South_Pole"             , 0x018400 },
+	{ "Antarctica/Syowa"                  , 0x01877E },
+	{ "Antarctica/Vostok"                 , 0x0187EC },
+	{ "Arctic/Longyearbyen"               , 0x01885D },
+	{ "Asia/Aden"                         , 0x018B8F },
+	{ "Asia/Almaty"                       , 0x018BE4 },
+	{ "Asia/Amman"                        , 0x018D63 },
+	{ "Asia/Anadyr"                       , 0x018F35 },
+	{ "Asia/Aqtau"                        , 0x01911A },
+	{ "Asia/Aqtobe"                       , 0x019319 },
+	{ "Asia/Ashgabat"                     , 0x0194D1 },
+	{ "Asia/Ashkhabad"                    , 0x0195EE },
+	{ "Asia/Baghdad"                      , 0x01970B },
+	{ "Asia/Bahrain"                      , 0x019880 },
+	{ "Asia/Baku"                         , 0x0198E6 },
+	{ "Asia/Bangkok"                      , 0x019BCE },
+	{ "Asia/Beirut"                       , 0x019C23 },
+	{ "Asia/Bishkek"                      , 0x019F30 },
+	{ "Asia/Brunei"                       , 0x01A0DC },
+	{ "Asia/Calcutta"                     , 0x01A13E },
+	{ "Asia/Choibalsan"                   , 0x01A1B7 },
+	{ "Asia/Chongqing"                    , 0x01A330 },
+	{ "Asia/Chungking"                    , 0x01A41F },
+	{ "Asia/Colombo"                      , 0x01A4CE },
+	{ "Asia/Dacca"                        , 0x01A56A },
+	{ "Asia/Damascus"                     , 0x01A610 },
+	{ "Asia/Dhaka"                        , 0x01A960 },
+	{ "Asia/Dili"                         , 0x01AA06 },
+	{ "Asia/Dubai"                        , 0x01AA90 },
+	{ "Asia/Dushanbe"                     , 0x01AAE5 },
+	{ "Asia/Gaza"                         , 0x01ABE8 },
+	{ "Asia/Harbin"                       , 0x01AF3B },
+	{ "Asia/Hebron"                       , 0x01B022 },
+	{ "Asia/Ho_Chi_Minh"                  , 0x01B37E },
+	{ "Asia/Hong_Kong"                    , 0x01B3F6 },
+	{ "Asia/Hovd"                         , 0x01B5B8 },
+	{ "Asia/Irkutsk"                      , 0x01B730 },
+	{ "Asia/Istanbul"                     , 0x01B916 },
+	{ "Asia/Jakarta"                      , 0x01BD03 },
+	{ "Asia/Jayapura"                     , 0x01BDAD },
+	{ "Asia/Jerusalem"                    , 0x01BE49 },
+	{ "Asia/Kabul"                        , 0x01C178 },
+	{ "Asia/Kamchatka"                    , 0x01C1C9 },
+	{ "Asia/Karachi"                      , 0x01C3A5 },
+	{ "Asia/Kashgar"                      , 0x01C45A },
+	{ "Asia/Kathmandu"                    , 0x01C52B },
+	{ "Asia/Katmandu"                     , 0x01C591 },
+	{ "Asia/Khandyga"                     , 0x01C5F7 },
+	{ "Asia/Kolkata"                      , 0x01C81C },
+	{ "Asia/Krasnoyarsk"                  , 0x01C895 },
+	{ "Asia/Kuala_Lumpur"                 , 0x01CA7D },
+	{ "Asia/Kuching"                      , 0x01CB3A },
+	{ "Asia/Kuwait"                       , 0x01CC28 },
+	{ "Asia/Macao"                        , 0x01CC7D },
+	{ "Asia/Macau"                        , 0x01CDB8 },
+	{ "Asia/Magadan"                      , 0x01CEF3 },
+	{ "Asia/Makassar"                     , 0x01D0D5 },
+	{ "Asia/Manila"                       , 0x01D19A },
+	{ "Asia/Muscat"                       , 0x01D21F },
+	{ "Asia/Nicosia"                      , 0x01D274 },
+	{ "Asia/Novokuznetsk"                 , 0x01D55C },
+	{ "Asia/Novosibirsk"                  , 0x01D75E },
+	{ "Asia/Omsk"                         , 0x01D949 },
+	{ "Asia/Oral"                         , 0x01DB30 },
+	{ "Asia/Phnom_Penh"                   , 0x01DD00 },
+	{ "Asia/Pontianak"                    , 0x01DD78 },
+	{ "Asia/Pyongyang"                    , 0x01DE3A },
+	{ "Asia/Qatar"                        , 0x01DEA7 },
+	{ "Asia/Qyzylorda"                    , 0x01DF0D },
+	{ "Asia/Rangoon"                      , 0x01E0E3 },
+	{ "Asia/Riyadh"                       , 0x01E15B },
+	{ "Asia/Saigon"                       , 0x01E1B0 },
+	{ "Asia/Sakhalin"                     , 0x01E228 },
+	{ "Asia/Samarkand"                    , 0x01E41F },
+	{ "Asia/Seoul"                        , 0x01E555 },
+	{ "Asia/Shanghai"                     , 0x01E5F9 },
+	{ "Asia/Singapore"                    , 0x01E6D9 },
+	{ "Asia/Taipei"                       , 0x01E790 },
+	{ "Asia/Tashkent"                     , 0x01E8A8 },
+	{ "Asia/Tbilisi"                      , 0x01E9D9 },
+	{ "Asia/Tehran"                       , 0x01EB93 },
+	{ "Asia/Tel_Aviv"                     , 0x01EE01 },
+	{ "Asia/Thimbu"                       , 0x01F130 },
+	{ "Asia/Thimphu"                      , 0x01F196 },
+	{ "Asia/Tokyo"                        , 0x01F1FC },
+	{ "Asia/Ujung_Pandang"                , 0x01F285 },
+	{ "Asia/Ulaanbaatar"                  , 0x01F302 },
+	{ "Asia/Ulan_Bator"                   , 0x01F45D },
+	{ "Asia/Urumqi"                       , 0x01F5AA },
+	{ "Asia/Ust-Nera"                     , 0x01F671 },
+	{ "Asia/Vientiane"                    , 0x01F876 },
+	{ "Asia/Vladivostok"                  , 0x01F8EE },
+	{ "Asia/Yakutsk"                      , 0x01FADA },
+	{ "Asia/Yekaterinburg"                , 0x01FCBF },
+	{ "Asia/Yerevan"                      , 0x01FECA },
+	{ "Atlantic/Azores"                   , 0x0200CA },
+	{ "Atlantic/Bermuda"                  , 0x0205CD },
+	{ "Atlantic/Canary"                   , 0x0208AE },
+	{ "Atlantic/Cape_Verde"               , 0x020B84 },
+	{ "Atlantic/Faeroe"                   , 0x020BFD },
+	{ "Atlantic/Faroe"                    , 0x020EA1 },
+	{ "Atlantic/Jan_Mayen"                , 0x021145 },
+	{ "Atlantic/Madeira"                  , 0x021477 },
+	{ "Atlantic/Reykjavik"                , 0x021980 },
+	{ "Atlantic/South_Georgia"            , 0x021B39 },
+	{ "Atlantic/St_Helena"                , 0x021D4B },
+	{ "Atlantic/Stanley"                  , 0x021B7D },
+	{ "Australia/ACT"                     , 0x021DA0 },
+	{ "Australia/Adelaide"                , 0x0220BD },
+	{ "Australia/Brisbane"                , 0x0223E9 },
+	{ "Australia/Broken_Hill"             , 0x0224B0 },
+	{ "Australia/Canberra"                , 0x0227EE },
+	{ "Australia/Currie"                  , 0x022B0B },
+	{ "Australia/Darwin"                  , 0x022E3E },
+	{ "Australia/Eucla"                   , 0x022EC4 },
+	{ "Australia/Hobart"                  , 0x022F99 },
+	{ "Australia/LHI"                     , 0x0232F7 },
+	{ "Australia/Lindeman"                , 0x023592 },
+	{ "Australia/Lord_Howe"               , 0x023673 },
+	{ "Australia/Melbourne"               , 0x02391E },
+	{ "Australia/North"                   , 0x023C43 },
+	{ "Australia/NSW"                     , 0x023CB7 },
+	{ "Australia/Perth"                   , 0x023FD4 },
+	{ "Australia/Queensland"              , 0x0240AC },
+	{ "Australia/South"                   , 0x024158 },
+	{ "Australia/Sydney"                  , 0x024475 },
+	{ "Australia/Tasmania"                , 0x0247B2 },
+	{ "Australia/Victoria"                , 0x024AF7 },
+	{ "Australia/West"                    , 0x024E14 },
+	{ "Australia/Yancowinna"              , 0x024ECA },
+	{ "Brazil/Acre"                       , 0x0251EC },
+	{ "Brazil/DeNoronha"                  , 0x0252EB },
+	{ "Brazil/East"                       , 0x02540B },
+	{ "Brazil/West"                       , 0x0256E8 },
+	{ "Canada/Atlantic"                   , 0x0257E0 },
+	{ "Canada/Central"                    , 0x025CC8 },
+	{ "Canada/East-Saskatchewan"          , 0x0265D2 },
+	{ "Canada/Eastern"                    , 0x0260E2 },
+	{ "Canada/Mountain"                   , 0x02675B },
+	{ "Canada/Newfoundland"               , 0x026AD1 },
+	{ "Canada/Pacific"                    , 0x026FFC },
+	{ "Canada/Saskatchewan"               , 0x027415 },
+	{ "Canada/Yukon"                      , 0x02759E },
+	{ "CET"                               , 0x0278A1 },
+	{ "Chile/Continental"                 , 0x027BAA },
+	{ "Chile/EasterIsland"                , 0x027F45 },
+	{ "CST6CDT"                           , 0x028287 },
+	{ "Cuba"                              , 0x0285D8 },
+	{ "EET"                               , 0x02894B },
+	{ "Egypt"                             , 0x028BFE },
+	{ "Eire"                              , 0x028EC1 },
+	{ "EST"                               , 0x0293D2 },
+	{ "EST5EDT"                           , 0x029416 },
+	{ "Etc/GMT"                           , 0x029767 },
+	{ "Etc/GMT+0"                         , 0x029833 },
+	{ "Etc/GMT+1"                         , 0x0298BD },
+	{ "Etc/GMT+10"                        , 0x02994A },
+	{ "Etc/GMT+11"                        , 0x0299D8 },
+	{ "Etc/GMT+12"                        , 0x029A66 },
+	{ "Etc/GMT+2"                         , 0x029B81 },
+	{ "Etc/GMT+3"                         , 0x029C0D },
+	{ "Etc/GMT+4"                         , 0x029C99 },
+	{ "Etc/GMT+5"                         , 0x029D25 },
+	{ "Etc/GMT+6"                         , 0x029DB1 },
+	{ "Etc/GMT+7"                         , 0x029E3D },
+	{ "Etc/GMT+8"                         , 0x029EC9 },
+	{ "Etc/GMT+9"                         , 0x029F55 },
+	{ "Etc/GMT-0"                         , 0x0297EF },
+	{ "Etc/GMT-1"                         , 0x029877 },
+	{ "Etc/GMT-10"                        , 0x029903 },
+	{ "Etc/GMT-11"                        , 0x029991 },
+	{ "Etc/GMT-12"                        , 0x029A1F },
+	{ "Etc/GMT-13"                        , 0x029AAD },
+	{ "Etc/GMT-14"                        , 0x029AF4 },
+	{ "Etc/GMT-2"                         , 0x029B3B },
+	{ "Etc/GMT-3"                         , 0x029BC7 },
+	{ "Etc/GMT-4"                         , 0x029C53 },
+	{ "Etc/GMT-5"                         , 0x029CDF },
+	{ "Etc/GMT-6"                         , 0x029D6B },
+	{ "Etc/GMT-7"                         , 0x029DF7 },
+	{ "Etc/GMT-8"                         , 0x029E83 },
+	{ "Etc/GMT-9"                         , 0x029F0F },
+	{ "Etc/GMT0"                          , 0x0297AB },
+	{ "Etc/Greenwich"                     , 0x029F9B },
+	{ "Etc/UCT"                           , 0x029FDF },
+	{ "Etc/Universal"                     , 0x02A023 },
+	{ "Etc/UTC"                           , 0x02A067 },
+	{ "Etc/Zulu"                          , 0x02A0AB },
+	{ "Europe/Amsterdam"                  , 0x02A0EF },
+	{ "Europe/Andorra"                    , 0x02A52D },
+	{ "Europe/Athens"                     , 0x02A7A9 },
+	{ "Europe/Belfast"                    , 0x02AAEC },
+	{ "Europe/Belgrade"                   , 0x02B023 },
+	{ "Europe/Berlin"                     , 0x02B2EC },
+	{ "Europe/Bratislava"                 , 0x02B650 },
+	{ "Europe/Brussels"                   , 0x02B982 },
+	{ "Europe/Bucharest"                  , 0x02BDB9 },
+	{ "Europe/Budapest"                   , 0x02C0E3 },
+	{ "Europe/Busingen"                   , 0x02C456 },
+	{ "Europe/Chisinau"                   , 0x02C70D },
+	{ "Europe/Copenhagen"                 , 0x02CA9B },
+	{ "Europe/Dublin"                     , 0x02CDA5 },
+	{ "Europe/Gibraltar"                  , 0x02D2B6 },
+	{ "Europe/Guernsey"                   , 0x02D70D },
+	{ "Europe/Helsinki"                   , 0x02DC44 },
+	{ "Europe/Isle_of_Man"                , 0x02DEFA },
+	{ "Europe/Istanbul"                   , 0x02E431 },
+	{ "Europe/Jersey"                     , 0x02E81E },
+	{ "Europe/Kaliningrad"                , 0x02ED55 },
+	{ "Europe/Kiev"                       , 0x02EFBB },
+	{ "Europe/Lisbon"                     , 0x02F2D2 },
+	{ "Europe/Ljubljana"                  , 0x02F7D6 },
+	{ "Europe/London"                     , 0x02FA9F },
+	{ "Europe/Luxembourg"                 , 0x02FFD6 },
+	{ "Europe/Madrid"                     , 0x03042C },
+	{ "Europe/Malta"                      , 0x0307F2 },
+	{ "Europe/Mariehamn"                  , 0x030BAB },
+	{ "Europe/Minsk"                      , 0x030E61 },
+	{ "Europe/Monaco"                     , 0x03106F },
+	{ "Europe/Moscow"                     , 0x0314AA },
+	{ "Europe/Nicosia"                    , 0x0316FB },
+	{ "Europe/Oslo"                       , 0x0319E3 },
+	{ "Europe/Paris"                      , 0x031D15 },
+	{ "Europe/Podgorica"                  , 0x03215B },
+	{ "Europe/Prague"                     , 0x032424 },
+	{ "Europe/Riga"                       , 0x032756 },
+	{ "Europe/Rome"                       , 0x032A9B },
+	{ "Europe/Samara"                     , 0x032E5E },
+	{ "Europe/San_Marino"                 , 0x033091 },
+	{ "Europe/Sarajevo"                   , 0x033454 },
+	{ "Europe/Simferopol"                 , 0x03371D },
+	{ "Europe/Skopje"                     , 0x033A48 },
+	{ "Europe/Sofia"                      , 0x033D11 },
+	{ "Europe/Stockholm"                  , 0x034019 },
+	{ "Europe/Tallinn"                    , 0x0342C8 },
+	{ "Europe/Tirane"                     , 0x034602 },
+	{ "Europe/Tiraspol"                   , 0x034908 },
+	{ "Europe/Uzhgorod"                   , 0x034C96 },
+	{ "Europe/Vaduz"                      , 0x034FAD },
+	{ "Europe/Vatican"                    , 0x03525C },
+	{ "Europe/Vienna"                     , 0x03561F },
+	{ "Europe/Vilnius"                    , 0x03594C },
+	{ "Europe/Volgograd"                  , 0x035C8B },
+	{ "Europe/Warsaw"                     , 0x035E8B },
+	{ "Europe/Zagreb"                     , 0x03626C },
+	{ "Europe/Zaporozhye"                 , 0x036535 },
+	{ "Europe/Zurich"                     , 0x036876 },
+	{ "Factory"                           , 0x036B25 },
+	{ "GB"                                , 0x036B96 },
+	{ "GB-Eire"                           , 0x0370CD },
+	{ "GMT"                               , 0x037604 },
+	{ "GMT+0"                             , 0x0376D0 },
+	{ "GMT-0"                             , 0x03768C },
+	{ "GMT0"                              , 0x037648 },
+	{ "Greenwich"                         , 0x037714 },
+	{ "Hongkong"                          , 0x037758 },
+	{ "HST"                               , 0x03791A },
+	{ "Iceland"                           , 0x03795E },
+	{ "Indian/Antananarivo"               , 0x037B17 },
+	{ "Indian/Chagos"                     , 0x037B8B },
+	{ "Indian/Christmas"                  , 0x037BED },
+	{ "Indian/Cocos"                      , 0x037C31 },
+	{ "Indian/Comoro"                     , 0x037C75 },
+	{ "Indian/Kerguelen"                  , 0x037CCA },
+	{ "Indian/Mahe"                       , 0x037D1F },
+	{ "Indian/Maldives"                   , 0x037D74 },
+	{ "Indian/Mauritius"                  , 0x037DC9 },
+	{ "Indian/Mayotte"                    , 0x037E3F },
+	{ "Indian/Reunion"                    , 0x037E94 },
+	{ "Iran"                              , 0x037EE9 },
+	{ "Israel"                            , 0x038157 },
+	{ "Jamaica"                           , 0x038486 },
+	{ "Japan"                             , 0x03854B },
+	{ "Kwajalein"                         , 0x0385D4 },
+	{ "Libya"                             , 0x038637 },
+	{ "MET"                               , 0x038830 },
+	{ "Mexico/BajaNorte"                  , 0x038B39 },
+	{ "Mexico/BajaSur"                    , 0x038EA2 },
+	{ "Mexico/General"                    , 0x0390E7 },
+	{ "MST"                               , 0x039345 },
+	{ "MST7MDT"                           , 0x039389 },
+	{ "Navajo"                            , 0x0396DA },
+	{ "NZ"                                , 0x039A53 },
+	{ "NZ-CHAT"                           , 0x039DD1 },
+	{ "Pacific/Apia"                      , 0x03A0B9 },
+	{ "Pacific/Auckland"                  , 0x03A255 },
+	{ "Pacific/Chatham"                   , 0x03A5E1 },
+	{ "Pacific/Chuuk"                     , 0x03A8D8 },
+	{ "Pacific/Easter"                    , 0x03A931 },
+	{ "Pacific/Efate"                     , 0x03AC8F },
+	{ "Pacific/Enderbury"                 , 0x03AD55 },
+	{ "Pacific/Fakaofo"                   , 0x03ADC3 },
+	{ "Pacific/Fiji"                      , 0x03AE14 },
+	{ "Pacific/Funafuti"                  , 0x03AFA7 },
+	{ "Pacific/Galapagos"                 , 0x03AFEB },
+	{ "Pacific/Gambier"                   , 0x03B063 },
+	{ "Pacific/Guadalcanal"               , 0x03B0C8 },
+	{ "Pacific/Guam"                      , 0x03B11D },
+	{ "Pacific/Honolulu"                  , 0x03B173 },
+	{ "Pacific/Johnston"                  , 0x03B1EA },
+	{ "Pacific/Kiritimati"                , 0x03B269 },
+	{ "Pacific/Kosrae"                    , 0x03B2D4 },
+	{ "Pacific/Kwajalein"                 , 0x03B331 },
+	{ "Pacific/Majuro"                    , 0x03B39D },
+	{ "Pacific/Marquesas"                 , 0x03B3FC },
+	{ "Pacific/Midway"                    , 0x03B463 },
+	{ "Pacific/Nauru"                     , 0x03B4ED },
+	{ "Pacific/Niue"                      , 0x03B565 },
+	{ "Pacific/Norfolk"                   , 0x03B5C3 },
+	{ "Pacific/Noumea"                    , 0x03B618 },
+	{ "Pacific/Pago_Pago"                 , 0x03B6A8 },
+	{ "Pacific/Palau"                     , 0x03B731 },
+	{ "Pacific/Pitcairn"                  , 0x03B775 },
+	{ "Pacific/Pohnpei"                   , 0x03B7CA },
+	{ "Pacific/Ponape"                    , 0x03B81F },
+	{ "Pacific/Port_Moresby"              , 0x03B864 },
+	{ "Pacific/Rarotonga"                 , 0x03B8A8 },
+	{ "Pacific/Saipan"                    , 0x03B984 },
+	{ "Pacific/Samoa"                     , 0x03B9E7 },
+	{ "Pacific/Tahiti"                    , 0x03BA70 },
+	{ "Pacific/Tarawa"                    , 0x03BAD5 },
+	{ "Pacific/Tongatapu"                 , 0x03BB29 },
+	{ "Pacific/Truk"                      , 0x03BBB5 },
+	{ "Pacific/Wake"                      , 0x03BBFA },
+	{ "Pacific/Wallis"                    , 0x03BC4A },
+	{ "Pacific/Yap"                       , 0x03BC8E },
+	{ "Poland"                            , 0x03BCD3 },
+	{ "Portugal"                          , 0x03C0B4 },
+	{ "PRC"                               , 0x03C5B0 },
+	{ "PST8PDT"                           , 0x03C661 },
+	{ "ROC"                               , 0x03C9B2 },
+	{ "ROK"                               , 0x03CACA },
+	{ "Singapore"                         , 0x03CB6E },
+	{ "Turkey"                            , 0x03CC25 },
+	{ "UCT"                               , 0x03D012 },
+	{ "Universal"                         , 0x03D056 },
+	{ "US/Alaska"                         , 0x03D09A },
+	{ "US/Aleutian"                       , 0x03D403 },
+	{ "US/Arizona"                        , 0x03D769 },
+	{ "US/Central"                        , 0x03D7F7 },
+	{ "US/East-Indiana"                   , 0x03E201 },
+	{ "US/Eastern"                        , 0x03DD02 },
+	{ "US/Hawaii"                         , 0x03E46B },
+	{ "US/Indiana-Starke"                 , 0x03E4DC },
+	{ "US/Michigan"                       , 0x03E84D },
+	{ "US/Mountain"                       , 0x03EB84 },
+	{ "US/Pacific"                        , 0x03EEFD },
+	{ "US/Pacific-New"                    , 0x03F302 },
+	{ "US/Samoa"                          , 0x03F707 },
+	{ "UTC"                               , 0x03F790 },
+	{ "W-SU"                              , 0x03FA87 },
+	{ "WET"                               , 0x03F7D4 },
+	{ "Zulu"                              , 0x03FCC1 },
 };
 /* This is a generated file, do not modify */
-const unsigned char timelib_timezone_db_data_builtin[261525] = {
+const unsigned char timelib_timezone_db_data_builtin[261381] = {
 
 
 /* Africa/Abidjan */
@@ -945,7 +945,7 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* Africa/Juba */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x53, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x11, 0xB6, 0xA3, 0xDA, 0xE0, 
+0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x11, 0xB6, 0xA3, 0xDA, 0x00, 
 0x00, 0x9E, 0x17, 0xE0, 0x01, 0x7A, 0x34, 0x50, 0x02, 0x7D, 0xF9, 0xE0, 0x03, 0x5B, 0x67, 0xD0, 
 0x04, 0x60, 0x7E, 0xE0, 0x05, 0x3D, 0xEC, 0xD0, 0x06, 0x40, 0x60, 0xE0, 0x07, 0x1F, 0x20, 0x50, 
 0x08, 0x20, 0x42, 0xE0, 0x09, 0x00, 0x53, 0xD0, 0x0A, 0x00, 0x24, 0xE0, 0x0A, 0xE1, 0x87, 0x50, 
@@ -956,7 +956,7 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x1A, 0xF1, 0x8B, 0xE0, 0x1B, 0xD0, 0x4B, 0x50, 0x1C, 0xD1, 0x6D, 0xE0, 0x1D, 0xB1, 0x7E, 0xD0, 
 0x38, 0x80, 0x45, 0x20, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 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, 0x00, 0x00, 0x1D, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 
+0x02, 0x01, 0x02, 0x01, 0x02, 0x03, 0x00, 0x00, 0x1E, 0x80, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 
 0x01, 0x04, 0x00, 0x00, 0x1C, 0x20, 0x00, 0x09, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x0D, 0x4C, 0x4D, 
 0x54, 0x00, 0x43, 0x41, 0x53, 0x54, 0x00, 0x43, 0x41, 0x54, 0x00, 0x45, 0x41, 0x54, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0xBA, 0xC8, 0x01, 0x42, 0xE0, 0x40, 0x00, 
@@ -1390,8 +1390,8 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* America/Anguilla */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x35, 0x20, 
-0x01, 0xFF, 0xFF, 0xC4, 0xE0, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x33, 0xAC, 
+0x01, 0xFF, 0xFF, 0xC6, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA5, 0x19, 0xA0, 0x00, 0xB2, 0x6D, 
 0x15, 0x00, 0x00, 0x00, 0x00, 
 
@@ -1407,7 +1407,7 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* America/Araguaina */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x42, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0D, 0x96, 0xAA, 0x74, 0x30, 
+0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0D, 0x96, 0xAA, 0x74, 0x30, 
 0xB8, 0x0F, 0x49, 0xE0, 0xB8, 0xFD, 0x40, 0xA0, 0xB9, 0xF1, 0x34, 0x30, 0xBA, 0xDE, 0x74, 0x20, 
 0xDA, 0x38, 0xAE, 0x30, 0xDA, 0xEB, 0xFA, 0x30, 0xDC, 0x19, 0xE1, 0xB0, 0xDC, 0xB9, 0x59, 0x20, 
 0xDD, 0xFB, 0x15, 0x30, 0xDE, 0x9B, 0xDE, 0x20, 0xDF, 0xDD, 0x9A, 0x30, 0xE0, 0x54, 0x33, 0x20, 
@@ -1420,29 +1420,14 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x34, 0x38, 0x54, 0x30, 0x34, 0xF8, 0xC1, 0x20, 0x36, 0x20, 0x1F, 0x30, 0x36, 0xCF, 0x68, 0xA0, 
 0x37, 0xF6, 0xC6, 0xB0, 0x38, 0xB8, 0x85, 0x20, 0x39, 0xDF, 0xE3, 0x30, 0x3A, 0x8F, 0x2C, 0xA0, 
 0x3B, 0xC8, 0xFF, 0xB0, 0x3C, 0x6F, 0x0E, 0xA0, 0x3D, 0xC4, 0x91, 0x30, 0x3E, 0x4E, 0xF0, 0xA0, 
-0x50, 0x83, 0x65, 0x30, 0x51, 0x20, 0x39, 0xA0, 0x52, 0x63, 0x47, 0x30, 0x53, 0x00, 0x1B, 0xA0, 
-0x54, 0x43, 0x29, 0x30, 0x54, 0xE9, 0x38, 0x20, 0x56, 0x23, 0x0B, 0x30, 0x56, 0xC9, 0x1A, 0x20, 
-0x58, 0x02, 0xED, 0x30, 0x58, 0xA8, 0xFC, 0x20, 0x59, 0xE2, 0xCF, 0x30, 0x5A, 0x88, 0xDE, 0x20, 
-0x5B, 0xCB, 0xEB, 0xB0, 0x5C, 0x68, 0xC0, 0x20, 0x5D, 0xAB, 0xCD, 0xB0, 0x5E, 0x48, 0xA2, 0x20, 
-0x5F, 0x8B, 0xAF, 0xB0, 0x60, 0x31, 0xBE, 0xA0, 0x61, 0x6B, 0x91, 0xB0, 0x62, 0x11, 0xA0, 0xA0, 
-0x63, 0x4B, 0x73, 0xB0, 0x63, 0xFA, 0xBD, 0x20, 0x65, 0x2B, 0x55, 0xB0, 0x65, 0xD1, 0x64, 0xA0, 
-0x67, 0x14, 0x72, 0x30, 0x67, 0xB1, 0x46, 0xA0, 0x68, 0xF4, 0x54, 0x30, 0x69, 0x9A, 0x63, 0x20, 
-0x6A, 0xD4, 0x36, 0x30, 0x6B, 0x7A, 0x45, 0x20, 0x6C, 0xB4, 0x18, 0x30, 0x6D, 0x5A, 0x27, 0x20, 
-0x6E, 0x93, 0xFA, 0x30, 0x6F, 0x3A, 0x09, 0x20, 0x70, 0x7D, 0x16, 0xB0, 0x71, 0x19, 0xEB, 0x20, 
-0x72, 0x5C, 0xF8, 0xB0, 0x72, 0xF9, 0xCD, 0x20, 0x74, 0x3C, 0xDA, 0xB0, 0x74, 0xD9, 0xAF, 0x20, 
-0x76, 0x1C, 0xBC, 0xB0, 0x76, 0xC2, 0xCB, 0xA0, 0x77, 0xFC, 0x9E, 0xB0, 0x78, 0xAB, 0xE8, 0x20, 
-0x79, 0xDC, 0x80, 0xB0, 0x7A, 0x82, 0x8F, 0xA0, 0x7B, 0xC5, 0x9D, 0x30, 0x7C, 0x62, 0x71, 0xA0, 
-0x7D, 0xA5, 0x7F, 0x30, 0x7E, 0x4B, 0x8E, 0x20, 0x7F, 0x85, 0x61, 0x30, 0x02, 0x01, 0x02, 0x01, 
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
+0x50, 0x83, 0x65, 0x30, 0x51, 0x20, 0x39, 0xA0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 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, 0xD2, 0xD0, 0x00, 0x00, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 
-0x00, 0x09, 0x4C, 0x4D, 0x54, 0x00, 0x42, 0x52, 0x53, 0x54, 0x00, 0x42, 0x52, 0x54, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x57, 0xC0, 0x00, 0xC9, 0x1C, 0x60, 0x00, 0x00, 0x00, 
-0x09, 0x54, 0x6F, 0x63, 0x61, 0x6E, 0x74, 0x69, 0x6E, 0x73, 
+0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0xFF, 0xFF, 0xD2, 0xD0, 0x00, 
+0x00, 0xFF, 0xFF, 0xE3, 0xE0, 0x01, 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x09, 0x4C, 0x4D, 0x54, 
+0x00, 0x42, 0x52, 0x53, 0x54, 0x00, 0x42, 0x52, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x7E, 0x57, 0xC0, 0x00, 0xC9, 0x1C, 0x60, 0x00, 0x00, 0x00, 0x09, 0x54, 0x6F, 0x63, 0x61, 
+0x6E, 0x74, 0x69, 0x6E, 0x73, 
 
 /* America/Argentina/Buenos_Aires */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -1767,7 +1752,7 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
 0x01, 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, 0x05, 
-0x06, 0x05, 0x04, 0x06, 0x04, 0x05, 0x04, 0x03, 0x06, 0x05, 0x06, 0x05, 0x06, 0xFF, 0xFF, 0xC3, 
+0x06, 0x05, 0x04, 0x06, 0x04, 0x05, 0x04, 0x03, 0x06, 0x05, 0x06, 0x05, 0x04, 0xFF, 0xFF, 0xC3, 
 0xD0, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x08, 0xFF, 
 0xFF, 0xE3, 0xE0, 0x01, 0x08, 0xFF, 0xFF, 0xD5, 0xD0, 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 
 0x0D, 0xFF, 0xFF, 0xD5, 0xD0, 0x01, 0x12, 0x43, 0x4D, 0x54, 0x00, 0x41, 0x52, 0x54, 0x00, 0x41, 
@@ -1839,8 +1824,8 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* America/Aruba */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x57, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x93, 0x1E, 0x2F, 0x38, 
-0xF6, 0x98, 0xEC, 0x48, 0x01, 0x02, 0xFF, 0xFF, 0xBE, 0x48, 0x00, 0x00, 0xFF, 0xFF, 0xC0, 0xB8, 
+0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x93, 0x1E, 0x2E, 0x23, 
+0xF6, 0x98, 0xEC, 0x48, 0x01, 0x02, 0xFF, 0xFF, 0xBF, 0x5D, 0x00, 0x00, 0xFF, 0xFF, 0xC0, 0xB8, 
 0x00, 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x08, 0x4C, 0x4D, 0x54, 0x00, 0x41, 0x4E, 0x54, 0x00, 
 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9C, 0x67, 0x10, 0x00, 0xA7, 
 0xE5, 0xC5, 0x00, 0x00, 0x00, 0x00, 
@@ -2414,8 +2399,8 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* America/Cayman */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x4B, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x0F, 0xB5, 0x00, 
-0x01, 0xFF, 0xFF, 0xB8, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x04, 0x4B, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x0F, 0xB4, 0xFF, 
+0x01, 0xFF, 0xFF, 0xB8, 0x01, 0x00, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x04, 0x4B, 0x4D, 0x54, 
 0x00, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA6, 0xC7, 0x50, 0x00, 0x96, 0x7A, 
 0x22, 0x00, 0x00, 0x00, 0x00, 
 
@@ -2889,8 +2874,8 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* America/Dominica */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x44, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xF4, 0x34, 0x4C, 
-0x01, 0xFF, 0xFF, 0xC6, 0x70, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x33, 0xAC, 
+0x01, 0xFF, 0xFF, 0xC6, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xAC, 0xD0, 0x00, 0xB4, 0xF8, 
 0x20, 0x00, 0x00, 0x00, 0x00, 
 
@@ -3292,7 +3277,7 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* America/Grand_Turk */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x54, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x93, 0x0F, 0xB5, 0x00, 
+0x00, 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x93, 0x0F, 0xB4, 0xFF, 
 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, 
@@ -3330,23 +3315,23 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 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, 0xB8, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 
+0xFF, 0xB8, 0x01, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x04, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 
 0x08, 0x4B, 0x4D, 0x54, 0x00, 0x45, 0x44, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0xAA, 0x15, 0xAA, 0x00, 0xA6, 0x1E, 0x0A, 0x00, 0x00, 0x00, 0x00, 
 
 /* America/Grenada */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x47, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xF4, 0x34, 0x64, 
-0x01, 0xFF, 0xFF, 0xC6, 0x1C, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x33, 0xAC, 
+0x01, 0xFF, 0xFF, 0xC6, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9B, 0xB7, 0x48, 0x00, 0xB4, 0x6F, 
 0x68, 0x00, 0x00, 0x00, 0x00, 
 
 /* America/Guadeloupe */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x47, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xD5, 0xE1, 0xB0, 
-0x01, 0xFF, 0xFF, 0xC6, 0x50, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x33, 0xAC, 
+0x01, 0xFF, 0xFF, 0xC6, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA2, 0x19, 0x65, 0x00, 0xB4, 0xC4, 
 0x0A, 0x00, 0x00, 0x00, 0x00, 
 
@@ -4057,17 +4042,17 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* America/Jamaica */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x4A, 0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x93, 0x0F, 0xB5, 0x00, 
+0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x93, 0x0F, 0xB4, 0xFF, 
 0x08, 0x20, 0xC1, 0x70, 0x09, 0x10, 0xA4, 0x60, 0x09, 0xAD, 0x94, 0xF0, 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, 
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
-0x01, 0x02, 0x01, 0x02, 0x01, 0xFF, 0xFF, 0xB8, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 
+0x01, 0x02, 0x01, 0x02, 0x01, 0xFF, 0xFF, 0xB8, 0x01, 0x00, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 
 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0x4B, 0x4D, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x45, 
-0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0xCB, 0x80, 0x00, 0x9D, 0x78, 
-0x80, 0x00, 0x00, 0x00, 0x00, 
+0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0xBF, 0x05, 0x00, 0x9D, 0x7B, 
+0x1A, 0x00, 0x00, 0x00, 0x00, 
 
 /* America/Jujuy */
 0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -4573,8 +4558,8 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* America/Marigot */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x4D, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xD5, 0xE1, 0xB0, 
-0x01, 0xFF, 0xFF, 0xC6, 0x50, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x33, 0xAC, 
+0x01, 0xFF, 0xFF, 0xC6, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0xE5, 0x8A, 0x00, 0xB2, 0x66, 
 0x92, 0x00, 0x00, 0x00, 0x00, 
 
@@ -5071,7 +5056,7 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x00, 0x00, 
 
 /* America/Montreal */
-0x50, 0x48, 0x50, 0x31, 0x01, 0x43, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0x9C, 0xBD, 0x01, 0xF0, 
 0x9C, 0xE4, 0x64, 0xC0, 0x9E, 0xB8, 0x93, 0x70, 0x9F, 0xBA, 0xEB, 0x60, 0xA0, 0x87, 0x58, 0xF8, 
@@ -5149,16 +5134,14 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x00, 0x01, 0x00, 0x01, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x04, 
 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0x45, 0x44, 0x54, 0x00, 
 0x45, 0x53, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00, 0x45, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0xCE, 0xC8, 0x32, 0x00, 0xA2, 0x67, 0x85, 0x00, 0x00, 0x00, 0x26, 
-0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x51, 
-0x75, 0x65, 0x62, 0x65, 0x63, 0x20, 0x2D, 0x20, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6C, 0x6F, 0x63, 
-0x61, 0x74, 0x69, 0x6F, 0x6E, 0x73, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00, 
+
 
 /* America/Montserrat */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x4D, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xF4, 0x35, 0x10, 
-0x01, 0xFF, 0xFF, 0xC5, 0xAC, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x33, 0xAC, 
+0x01, 0xFF, 0xFF, 0xC6, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA2, 0xD6, 0x32, 0x00, 0xB3, 0xB9, 
 0x1D, 0x00, 0x00, 0x00, 0x00, 
 
@@ -5741,9 +5724,10 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0xFB, 0xE8, 0x58, 0x00, 0x00, 0x01, 0x00, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x01, 0xFF, 0xFF, 
 0xAB, 0xA0, 0x01, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x08, 
 0x4D, 0x44, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x57, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0xBC, 0x5E, 0x01, 0x00, 0x67, 0xA5, 0xDA, 0x00, 0x00, 0x00, 0x20, 0x4D, 0x6F, 
+0x00, 0x00, 0x00, 0xBC, 0x5E, 0x01, 0x00, 0x67, 0xA5, 0xDA, 0x00, 0x00, 0x00, 0x30, 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, 0x41, 0x72, 0x69, 0x7A, 0x6F, 0x6E, 0x61, 
+0x54, 0x69, 0x6D, 0x65, 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, 
 
 /* America/Port-au-Prince */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x48, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -6344,7 +6328,7 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x74, 0x6F, 0x71, 0x71, 0x6F, 0x72, 0x74, 0x6F, 0x6F, 0x72, 0x6D, 0x69, 0x69, 0x74, 
 
 /* America/Shiprock */
-0x50, 0x48, 0x50, 0x31, 0x01, 0x55, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x9D, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0x9E, 0xA6, 0x3A, 0x90, 
 0x9F, 0xBB, 0x07, 0x80, 0xA0, 0x86, 0x1C, 0x90, 0xA1, 0x9A, 0xE9, 0x80, 0xA2, 0x65, 0xFE, 0x90, 
@@ -6398,9 +6382,8 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0xFF, 0xFF, 0xAB, 
 0xA0, 0x01, 0x00, 0xFF, 0xFF, 0x9D, 0x90, 0x00, 0x04, 0xFF, 0xFF, 0xAB, 0xA0, 0x01, 0x08, 0xFF, 
 0xFF, 0xAB, 0xA0, 0x01, 0x0C, 0x4D, 0x44, 0x54, 0x00, 0x4D, 0x53, 0x54, 0x00, 0x4D, 0x57, 0x54, 
-0x00, 0x4D, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0xC1, 0x75, 
-0x9B, 0x00, 0x6C, 0xD0, 0xE1, 0x00, 0x00, 0x00, 0x16, 0x4D, 0x6F, 0x75, 0x6E, 0x74, 0x61, 0x69, 
-0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x4E, 0x61, 0x76, 0x61, 0x6A, 0x6F, 
+0x00, 0x4D, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x89, 0x54, 
+0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00, 
 
 /* America/Sitka */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x55, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -6464,8 +6447,8 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* America/St_Barthelemy */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x42, 0x4C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xD5, 0xE1, 0xB0, 
-0x01, 0xFF, 0xFF, 0xC6, 0x50, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x33, 0xAC, 
+0x01, 0xFF, 0xFF, 0xC6, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA4, 0x9D, 0xED, 0x00, 0xB2, 0xC1, 
 0xB8, 0x00, 0x00, 0x00, 0x00, 
 
@@ -6560,32 +6543,32 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* America/St_Kitts */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x4B, 0x4E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x34, 0xCC, 
-0x01, 0xFF, 0xFF, 0xC5, 0x34, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x33, 0xAC, 
+0x01, 0xFF, 0xFF, 0xC6, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA3, 0xBA, 0x10, 0x00, 0xB2, 0xF5, 
 0xCD, 0x00, 0x00, 0x00, 0x00, 
 
 /* America/St_Lucia */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x4C, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x92, 0xE6, 0xC7, 0xB0, 
-0x01, 0xFF, 0xFF, 0xC6, 0xD0, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x43, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x33, 0xAC, 
+0x01, 0xFF, 0xFF, 0xC6, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9E, 0xB7, 0x82, 0x00, 0xB5, 0x94, 
 0x60, 0x00, 0x00, 0x00, 0x00, 
 
 /* America/St_Thomas */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x56, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xF4, 0x37, 0x60, 
-0x01, 0xFF, 0xFF, 0xC3, 0x20, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x33, 0xAC, 
+0x01, 0xFF, 0xFF, 0xC6, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA5, 0x54, 0x38, 0x00, 0xAF, 0x93, 
 0xEA, 0x00, 0x00, 0x00, 0x00, 
 
 /* America/St_Vincent */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x56, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x92, 0xE6, 0xC7, 0xE8, 
-0x01, 0xFF, 0xFF, 0xC6, 0x98, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4B, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x33, 0xAC, 
+0x01, 0xFF, 0xFF, 0xC6, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9D, 0x64, 0xF8, 0x00, 0xB5, 0x39, 
 0x3A, 0x00, 0x00, 0x00, 0x00, 
 
@@ -6853,16 +6836,17 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x00, 0x01, 0x00, 0x01, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 0x04, 
 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x0C, 0x45, 0x44, 0x54, 0x00, 
 0x45, 0x53, 0x54, 0x00, 0x45, 0x57, 0x54, 0x00, 0x45, 0x50, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0xCB, 0xEF, 0x08, 0x00, 0x99, 0x87, 0x62, 0x00, 0x00, 0x00, 0x27, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0xCB, 0xEF, 0x08, 0x00, 0x99, 0x87, 0x62, 0x00, 0x00, 0x00, 0x30, 
 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6E, 0x20, 0x54, 0x69, 0x6D, 0x65, 0x20, 0x2D, 0x20, 0x4F, 
-0x6E, 0x74, 0x61, 0x72, 0x69, 0x6F, 0x20, 0x2D, 0x20, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6C, 0x6F, 
-0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x73, 
+0x6E, 0x74, 0x61, 0x72, 0x69, 0x6F, 0x20, 0x26, 0x20, 0x51, 0x75, 0x65, 0x62, 0x65, 0x63, 0x20, 
+0x2D, 0x20, 0x6D, 0x6F, 0x73, 0x74, 0x20, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x73, 
+
 
 /* America/Tortola */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x56, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xF4, 0x37, 0x14, 
-0x01, 0xFF, 0xFF, 0xC3, 0x6C, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x33, 0xAC, 
+0x01, 0xFF, 0xFF, 0xC6, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA5, 0x7B, 0x48, 0x00, 0xB0, 0x0F, 
 0x9D, 0x00, 0x00, 0x00, 0x00, 
 
@@ -6939,8 +6923,8 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* America/Virgin */
 0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x91, 0xF4, 0x37, 0x60, 
-0x01, 0xFF, 0xFF, 0xC3, 0x20, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
+0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x08, 0x93, 0x37, 0x33, 0xAC, 
+0x01, 0xFF, 0xFF, 0xC6, 0x54, 0x00, 0x00, 0xFF, 0xFF, 0xC7, 0xC0, 0x00, 0x04, 0x4C, 0x4D, 0x54, 
 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 
 0x80, 0x00, 0x00, 0x00, 0x00, 
 
@@ -7264,54 +7248,64 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 
 /* Antarctica/McMurdo */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0E, 0xE5, 0xA9, 0xE9, 0x00, 
-0x09, 0x18, 0xFD, 0xE0, 0x09, 0xAC, 0xA5, 0xE0, 0x0A, 0xEF, 0xA5, 0x60, 0x0B, 0x9E, 0xFC, 0xE0, 
-0x0C, 0xD8, 0xC1, 0xE0, 0x0D, 0x7E, 0xDE, 0xE0, 0x0E, 0xB8, 0xA3, 0xE0, 0x0F, 0x5E, 0xC0, 0xE0, 
-0x10, 0x98, 0x85, 0xE0, 0x11, 0x3E, 0xA2, 0xE0, 0x12, 0x78, 0x67, 0xE0, 0x13, 0x1E, 0x84, 0xE0, 
-0x14, 0x58, 0x49, 0xE0, 0x14, 0xFE, 0x66, 0xE0, 0x16, 0x38, 0x2B, 0xE0, 0x16, 0xE7, 0x83, 0x60, 
-0x18, 0x21, 0x48, 0x60, 0x18, 0xC7, 0x65, 0x60, 0x1A, 0x01, 0x2A, 0x60, 0x1A, 0xA7, 0x47, 0x60, 
-0x1B, 0xE1, 0x0C, 0x60, 0x1C, 0x87, 0x29, 0x60, 0x1D, 0xC0, 0xEE, 0x60, 0x1E, 0x67, 0x0B, 0x60, 
-0x1F, 0xA0, 0xD0, 0x60, 0x20, 0x46, 0xED, 0x60, 0x21, 0x80, 0xB2, 0x60, 0x22, 0x30, 0x09, 0xE0, 
-0x23, 0x69, 0xCE, 0xE0, 0x24, 0x0F, 0xEB, 0xE0, 0x25, 0x2E, 0x01, 0x60, 0x26, 0x02, 0x42, 0xE0, 
-0x27, 0x0D, 0xE3, 0x60, 0x27, 0xE2, 0x24, 0xE0, 0x28, 0xED, 0xC5, 0x60, 0x29, 0xC2, 0x06, 0xE0, 
-0x2A, 0xCD, 0xA7, 0x60, 0x2B, 0xAB, 0x23, 0x60, 0x2C, 0xAD, 0x89, 0x60, 0x2D, 0x8B, 0x05, 0x60, 
-0x2E, 0x8D, 0x6B, 0x60, 0x2F, 0x6A, 0xE7, 0x60, 0x30, 0x6D, 0x4D, 0x60, 0x31, 0x4A, 0xC9, 0x60, 
-0x32, 0x56, 0x69, 0xE0, 0x33, 0x2A, 0xAB, 0x60, 0x34, 0x36, 0x4B, 0xE0, 0x35, 0x0A, 0x8D, 0x60, 
-0x36, 0x16, 0x2D, 0xE0, 0x36, 0xF3, 0xA9, 0xE0, 0x37, 0xF6, 0x0F, 0xE0, 0x38, 0xD3, 0x8B, 0xE0, 
-0x39, 0xD5, 0xF1, 0xE0, 0x3A, 0xB3, 0x6D, 0xE0, 0x3B, 0xBF, 0x0E, 0x60, 0x3C, 0x93, 0x4F, 0xE0, 
-0x3D, 0x9E, 0xF0, 0x60, 0x3E, 0x73, 0x31, 0xE0, 0x3F, 0x7E, 0xD2, 0x60, 0x40, 0x5C, 0x4E, 0x60, 
-0x41, 0x5E, 0xB4, 0x60, 0x42, 0x3C, 0x30, 0x60, 0x43, 0x3E, 0x96, 0x60, 0x44, 0x1C, 0x12, 0x60, 
-0x45, 0x1E, 0x78, 0x60, 0x45, 0xFB, 0xF4, 0x60, 0x46, 0xFE, 0x5A, 0x60, 0x47, 0xF7, 0x85, 0xE0, 
-0x48, 0xDE, 0x3C, 0x60, 0x49, 0xD7, 0x67, 0xE0, 0x4A, 0xBE, 0x1E, 0x60, 0x4B, 0xB7, 0x49, 0xE0, 
-0x4C, 0x9E, 0x00, 0x60, 0x4D, 0x97, 0x2B, 0xE0, 0x4E, 0x7D, 0xE2, 0x60, 0x4F, 0x77, 0x0D, 0xE0, 
-0x50, 0x66, 0xFE, 0xE0, 0x51, 0x60, 0x2A, 0x60, 0x52, 0x46, 0xE0, 0xE0, 0x53, 0x40, 0x0C, 0x60, 
-0x54, 0x26, 0xC2, 0xE0, 0x55, 0x1F, 0xEE, 0x60, 0x56, 0x06, 0xA4, 0xE0, 0x56, 0xFF, 0xD0, 0x60, 
-0x57, 0xE6, 0x86, 0xE0, 0x58, 0xDF, 0xB2, 0x60, 0x59, 0xC6, 0x68, 0xE0, 0x5A, 0xBF, 0x94, 0x60, 
-0x5B, 0xAF, 0x85, 0x60, 0x5C, 0xA8, 0xB0, 0xE0, 0x5D, 0x8F, 0x67, 0x60, 0x5E, 0x88, 0x92, 0xE0, 
-0x5F, 0x6F, 0x49, 0x60, 0x60, 0x68, 0x74, 0xE0, 0x61, 0x4F, 0x2B, 0x60, 0x62, 0x48, 0x56, 0xE0, 
-0x63, 0x2F, 0x0D, 0x60, 0x64, 0x28, 0x38, 0xE0, 0x65, 0x0E, 0xEF, 0x60, 0x66, 0x11, 0x55, 0x60, 
-0x66, 0xF8, 0x0B, 0xE0, 0x67, 0xF1, 0x37, 0x60, 0x68, 0xD7, 0xED, 0xE0, 0x69, 0xD1, 0x19, 0x60, 
-0x6A, 0xB7, 0xCF, 0xE0, 0x6B, 0xB0, 0xFB, 0x60, 0x6C, 0x97, 0xB1, 0xE0, 0x6D, 0x90, 0xDD, 0x60, 
-0x6E, 0x77, 0x93, 0xE0, 0x6F, 0x70, 0xBF, 0x60, 0x70, 0x60, 0xB0, 0x60, 0x71, 0x59, 0xDB, 0xE0, 
-0x72, 0x40, 0x92, 0x60, 0x73, 0x39, 0xBD, 0xE0, 0x74, 0x20, 0x74, 0x60, 0x75, 0x19, 0x9F, 0xE0, 
-0x76, 0x00, 0x56, 0x60, 0x76, 0xF9, 0x81, 0xE0, 0x77, 0xE0, 0x38, 0x60, 0x78, 0xD9, 0x63, 0xE0, 
-0x79, 0xC0, 0x1A, 0x60, 0x7A, 0xB9, 0x45, 0xE0, 0x7B, 0xA9, 0x36, 0xE0, 0x7C, 0xA2, 0x62, 0x60, 
-0x7D, 0x89, 0x18, 0xE0, 0x7E, 0x82, 0x44, 0x60, 0x7F, 0x68, 0xFA, 0xE0, 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, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x9B, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0F, 0xB0, 0xB4, 0xB2, 0xE8, 
+0xB1, 0x51, 0x87, 0x58, 0xB2, 0x78, 0xE5, 0x68, 0xB3, 0x43, 0xE5, 0x60, 0xB4, 0x58, 0xC7, 0x68, 
+0xB5, 0x23, 0xC7, 0x60, 0xB6, 0x38, 0xA9, 0x68, 0xB7, 0x03, 0xA9, 0x60, 0xB8, 0x18, 0x8B, 0x68, 
+0xB8, 0xEC, 0xC5, 0xE0, 0xB9, 0xF8, 0x6D, 0x68, 0xBA, 0xCC, 0xA7, 0xE0, 0xBB, 0xD8, 0x4F, 0x68, 
+0xBC, 0xE3, 0xE8, 0xE0, 0xBD, 0xAE, 0xF6, 0xE8, 0xBE, 0xC3, 0xCA, 0xE0, 0xBF, 0x8E, 0xD8, 0xE8, 
+0xC0, 0xA3, 0xAC, 0xE0, 0xC1, 0x6E, 0xBA, 0xE8, 0xC2, 0x83, 0x8E, 0xE0, 0xC3, 0x4E, 0x9C, 0xE8, 
+0xC4, 0x63, 0x70, 0xE0, 0xC5, 0x2E, 0x7E, 0xE8, 0xC6, 0x4C, 0x8D, 0x60, 0xC7, 0x0E, 0x60, 0xE8, 
+0xC8, 0x2C, 0x6F, 0x60, 0xC8, 0xF7, 0x7D, 0x68, 0xD2, 0xDA, 0x9A, 0x40, 0x09, 0x18, 0xFD, 0xE0, 
+0x09, 0xAC, 0xA5, 0xE0, 0x0A, 0xEF, 0xA5, 0x60, 0x0B, 0x9E, 0xFC, 0xE0, 0x0C, 0xD8, 0xC1, 0xE0, 
+0x0D, 0x7E, 0xDE, 0xE0, 0x0E, 0xB8, 0xA3, 0xE0, 0x0F, 0x5E, 0xC0, 0xE0, 0x10, 0x98, 0x85, 0xE0, 
+0x11, 0x3E, 0xA2, 0xE0, 0x12, 0x78, 0x67, 0xE0, 0x13, 0x1E, 0x84, 0xE0, 0x14, 0x58, 0x49, 0xE0, 
+0x14, 0xFE, 0x66, 0xE0, 0x16, 0x38, 0x2B, 0xE0, 0x16, 0xE7, 0x83, 0x60, 0x18, 0x21, 0x48, 0x60, 
+0x18, 0xC7, 0x65, 0x60, 0x1A, 0x01, 0x2A, 0x60, 0x1A, 0xA7, 0x47, 0x60, 0x1B, 0xE1, 0x0C, 0x60, 
+0x1C, 0x87, 0x29, 0x60, 0x1D, 0xC0, 0xEE, 0x60, 0x1E, 0x67, 0x0B, 0x60, 0x1F, 0xA0, 0xD0, 0x60, 
+0x20, 0x46, 0xED, 0x60, 0x21, 0x80, 0xB2, 0x60, 0x22, 0x30, 0x09, 0xE0, 0x23, 0x69, 0xCE, 0xE0, 
+0x24, 0x0F, 0xEB, 0xE0, 0x25, 0x2E, 0x01, 0x60, 0x26, 0x02, 0x42, 0xE0, 0x27, 0x0D, 0xE3, 0x60, 
+0x27, 0xE2, 0x24, 0xE0, 0x28, 0xED, 0xC5, 0x60, 0x29, 0xC2, 0x06, 0xE0, 0x2A, 0xCD, 0xA7, 0x60, 
+0x2B, 0xAB, 0x23, 0x60, 0x2C, 0xAD, 0x89, 0x60, 0x2D, 0x8B, 0x05, 0x60, 0x2E, 0x8D, 0x6B, 0x60, 
+0x2F, 0x6A, 0xE7, 0x60, 0x30, 0x6D, 0x4D, 0x60, 0x31, 0x4A, 0xC9, 0x60, 0x32, 0x56, 0x69, 0xE0, 
+0x33, 0x2A, 0xAB, 0x60, 0x34, 0x36, 0x4B, 0xE0, 0x35, 0x0A, 0x8D, 0x60, 0x36, 0x16, 0x2D, 0xE0, 
+0x36, 0xF3, 0xA9, 0xE0, 0x37, 0xF6, 0x0F, 0xE0, 0x38, 0xD3, 0x8B, 0xE0, 0x39, 0xD5, 0xF1, 0xE0, 
+0x3A, 0xB3, 0x6D, 0xE0, 0x3B, 0xBF, 0x0E, 0x60, 0x3C, 0x93, 0x4F, 0xE0, 0x3D, 0x9E, 0xF0, 0x60, 
+0x3E, 0x73, 0x31, 0xE0, 0x3F, 0x7E, 0xD2, 0x60, 0x40, 0x5C, 0x4E, 0x60, 0x41, 0x5E, 0xB4, 0x60, 
+0x42, 0x3C, 0x30, 0x60, 0x43, 0x3E, 0x96, 0x60, 0x44, 0x1C, 0x12, 0x60, 0x45, 0x1E, 0x78, 0x60, 
+0x45, 0xFB, 0xF4, 0x60, 0x46, 0xFE, 0x5A, 0x60, 0x47, 0xF7, 0x85, 0xE0, 0x48, 0xDE, 0x3C, 0x60, 
+0x49, 0xD7, 0x67, 0xE0, 0x4A, 0xBE, 0x1E, 0x60, 0x4B, 0xB7, 0x49, 0xE0, 0x4C, 0x9E, 0x00, 0x60, 
+0x4D, 0x97, 0x2B, 0xE0, 0x4E, 0x7D, 0xE2, 0x60, 0x4F, 0x77, 0x0D, 0xE0, 0x50, 0x66, 0xFE, 0xE0, 
+0x51, 0x60, 0x2A, 0x60, 0x52, 0x46, 0xE0, 0xE0, 0x53, 0x40, 0x0C, 0x60, 0x54, 0x26, 0xC2, 0xE0, 
+0x55, 0x1F, 0xEE, 0x60, 0x56, 0x06, 0xA4, 0xE0, 0x56, 0xFF, 0xD0, 0x60, 0x57, 0xE6, 0x86, 0xE0, 
+0x58, 0xDF, 0xB2, 0x60, 0x59, 0xC6, 0x68, 0xE0, 0x5A, 0xBF, 0x94, 0x60, 0x5B, 0xAF, 0x85, 0x60, 
+0x5C, 0xA8, 0xB0, 0xE0, 0x5D, 0x8F, 0x67, 0x60, 0x5E, 0x88, 0x92, 0xE0, 0x5F, 0x6F, 0x49, 0x60, 
+0x60, 0x68, 0x74, 0xE0, 0x61, 0x4F, 0x2B, 0x60, 0x62, 0x48, 0x56, 0xE0, 0x63, 0x2F, 0x0D, 0x60, 
+0x64, 0x28, 0x38, 0xE0, 0x65, 0x0E, 0xEF, 0x60, 0x66, 0x11, 0x55, 0x60, 0x66, 0xF8, 0x0B, 0xE0, 
+0x67, 0xF1, 0x37, 0x60, 0x68, 0xD7, 0xED, 0xE0, 0x69, 0xD1, 0x19, 0x60, 0x6A, 0xB7, 0xCF, 0xE0, 
+0x6B, 0xB0, 0xFB, 0x60, 0x6C, 0x97, 0xB1, 0xE0, 0x6D, 0x90, 0xDD, 0x60, 0x6E, 0x77, 0x93, 0xE0, 
+0x6F, 0x70, 0xBF, 0x60, 0x70, 0x60, 0xB0, 0x60, 0x71, 0x59, 0xDB, 0xE0, 0x72, 0x40, 0x92, 0x60, 
+0x73, 0x39, 0xBD, 0xE0, 0x74, 0x20, 0x74, 0x60, 0x75, 0x19, 0x9F, 0xE0, 0x76, 0x00, 0x56, 0x60, 
+0x76, 0xF9, 0x81, 0xE0, 0x77, 0xE0, 0x38, 0x60, 0x78, 0xD9, 0x63, 0xE0, 0x79, 0xC0, 0x1A, 0x60, 
+0x7A, 0xB9, 0x45, 0xE0, 0x7B, 0xA9, 0x36, 0xE0, 0x7C, 0xA2, 0x62, 0x60, 0x7D, 0x89, 0x18, 0xE0, 
+0x7E, 0x82, 0x44, 0x60, 0x7F, 0x68, 0xFA, 0xE0, 0x00, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xB6, 0xD0, 0x01, 0x04, 0x00, 0x00, 0xA8, 0xC0, 0x00, 0x09, 0x00, 0x00, 
-0xA8, 0xC0, 0x00, 0x09, 0x7A, 0x7A, 0x7A, 0x00, 0x4E, 0x5A, 0x44, 0x54, 0x00, 0x4E, 0x5A, 0x53, 
-0x54, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x90, 0x9A, 0x02, 0x10, 
-0xDE, 0xA0, 0x00, 0x00, 0x00, 0x1C, 0x4D, 0x63, 0x4D, 0x75, 0x72, 0x64, 0x6F, 0x20, 0x53, 0x74, 
-0x61, 0x74, 0x69, 0x6F, 0x6E, 0x2C, 0x20, 0x52, 0x6F, 0x73, 0x73, 0x20, 0x49, 0x73, 0x6C, 0x61, 
-0x6E, 0x64, 
+0x02, 0x01, 0x02, 0x05, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 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, 0xAF, 0xC8, 0x01, 0x00, 0x00, 0x00, 0xA1, 0xB8, 0x00, 0x05, 0x00, 
+0x00, 0xA8, 0xC0, 0x01, 0x00, 0x00, 0x00, 0xB6, 0xD0, 0x01, 0x0A, 0x00, 0x00, 0xA8, 0xC0, 0x00, 
+0x00, 0x00, 0x00, 0xA8, 0xC0, 0x00, 0x00, 0x4E, 0x5A, 0x53, 0x54, 0x00, 0x4E, 0x5A, 0x4D, 0x54, 
+0x00, 0x4E, 0x5A, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x12, 0x90, 0x9A, 0x02, 0x10, 0xDE, 0xA0, 0x00, 0x00, 0x00, 0x2D, 0x4D, 0x63, 
+0x4D, 0x75, 0x72, 0x64, 0x6F, 0x2C, 0x20, 0x53, 0x6F, 0x75, 0x74, 0x68, 0x20, 0x50, 0x6F, 0x6C, 
+0x65, 0x2C, 0x20, 0x53, 0x63, 0x6F, 0x74, 0x74, 0x20, 0x28, 0x4E, 0x65, 0x77, 0x20, 0x5A, 0x65, 
+0x61, 0x6C, 0x61, 0x6E, 0x64, 0x20, 0x74, 0x69, 0x6D, 0x65, 0x29, 
 
 /* Antarctica/Palmer */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -7376,55 +7370,62 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x49, 0x73, 0x6C, 0x61, 0x6E, 0x64, 
 
 /* Antarctica/South_Pole */
-0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0E, 0xE5, 0xA9, 0xE9, 0x00, 
-0x09, 0x18, 0xFD, 0xE0, 0x09, 0xAC, 0xA5, 0xE0, 0x0A, 0xEF, 0xA5, 0x60, 0x0B, 0x9E, 0xFC, 0xE0, 
-0x0C, 0xD8, 0xC1, 0xE0, 0x0D, 0x7E, 0xDE, 0xE0, 0x0E, 0xB8, 0xA3, 0xE0, 0x0F, 0x5E, 0xC0, 0xE0, 
-0x10, 0x98, 0x85, 0xE0, 0x11, 0x3E, 0xA2, 0xE0, 0x12, 0x78, 0x67, 0xE0, 0x13, 0x1E, 0x84, 0xE0, 
-0x14, 0x58, 0x49, 0xE0, 0x14, 0xFE, 0x66, 0xE0, 0x16, 0x38, 0x2B, 0xE0, 0x16, 0xE7, 0x83, 0x60, 
-0x18, 0x21, 0x48, 0x60, 0x18, 0xC7, 0x65, 0x60, 0x1A, 0x01, 0x2A, 0x60, 0x1A, 0xA7, 0x47, 0x60, 
-0x1B, 0xE1, 0x0C, 0x60, 0x1C, 0x87, 0x29, 0x60, 0x1D, 0xC0, 0xEE, 0x60, 0x1E, 0x67, 0x0B, 0x60, 
-0x1F, 0xA0, 0xD0, 0x60, 0x20, 0x46, 0xED, 0x60, 0x21, 0x80, 0xB2, 0x60, 0x22, 0x30, 0x09, 0xE0, 
-0x23, 0x69, 0xCE, 0xE0, 0x24, 0x0F, 0xEB, 0xE0, 0x25, 0x2E, 0x01, 0x60, 0x26, 0x02, 0x42, 0xE0, 
-0x27, 0x0D, 0xE3, 0x60, 0x27, 0xE2, 0x24, 0xE0, 0x28, 0xED, 0xC5, 0x60, 0x29, 0xC2, 0x06, 0xE0, 
-0x2A, 0xCD, 0xA7, 0x60, 0x2B, 0xAB, 0x23, 0x60, 0x2C, 0xAD, 0x89, 0x60, 0x2D, 0x8B, 0x05, 0x60, 
-0x2E, 0x8D, 0x6B, 0x60, 0x2F, 0x6A, 0xE7, 0x60, 0x30, 0x6D, 0x4D, 0x60, 0x31, 0x4A, 0xC9, 0x60, 
-0x32, 0x56, 0x69, 0xE0, 0x33, 0x2A, 0xAB, 0x60, 0x34, 0x36, 0x4B, 0xE0, 0x35, 0x0A, 0x8D, 0x60, 
-0x36, 0x16, 0x2D, 0xE0, 0x36, 0xF3, 0xA9, 0xE0, 0x37, 0xF6, 0x0F, 0xE0, 0x38, 0xD3, 0x8B, 0xE0, 
-0x39, 0xD5, 0xF1, 0xE0, 0x3A, 0xB3, 0x6D, 0xE0, 0x3B, 0xBF, 0x0E, 0x60, 0x3C, 0x93, 0x4F, 0xE0, 
-0x3D, 0x9E, 0xF0, 0x60, 0x3E, 0x73, 0x31, 0xE0, 0x3F, 0x7E, 0xD2, 0x60, 0x40, 0x5C, 0x4E, 0x60, 
-0x41, 0x5E, 0xB4, 0x60, 0x42, 0x3C, 0x30, 0x60, 0x43, 0x3E, 0x96, 0x60, 0x44, 0x1C, 0x12, 0x60, 
-0x45, 0x1E, 0x78, 0x60, 0x45, 0xFB, 0xF4, 0x60, 0x46, 0xFE, 0x5A, 0x60, 0x47, 0xF7, 0x85, 0xE0, 
-0x48, 0xDE, 0x3C, 0x60, 0x49, 0xD7, 0x67, 0xE0, 0x4A, 0xBE, 0x1E, 0x60, 0x4B, 0xB7, 0x49, 0xE0, 
-0x4C, 0x9E, 0x00, 0x60, 0x4D, 0x97, 0x2B, 0xE0, 0x4E, 0x7D, 0xE2, 0x60, 0x4F, 0x77, 0x0D, 0xE0, 
-0x50, 0x66, 0xFE, 0xE0, 0x51, 0x60, 0x2A, 0x60, 0x52, 0x46, 0xE0, 0xE0, 0x53, 0x40, 0x0C, 0x60, 
-0x54, 0x26, 0xC2, 0xE0, 0x55, 0x1F, 0xEE, 0x60, 0x56, 0x06, 0xA4, 0xE0, 0x56, 0xFF, 0xD0, 0x60, 
-0x57, 0xE6, 0x86, 0xE0, 0x58, 0xDF, 0xB2, 0x60, 0x59, 0xC6, 0x68, 0xE0, 0x5A, 0xBF, 0x94, 0x60, 
-0x5B, 0xAF, 0x85, 0x60, 0x5C, 0xA8, 0xB0, 0xE0, 0x5D, 0x8F, 0x67, 0x60, 0x5E, 0x88, 0x92, 0xE0, 
-0x5F, 0x6F, 0x49, 0x60, 0x60, 0x68, 0x74, 0xE0, 0x61, 0x4F, 0x2B, 0x60, 0x62, 0x48, 0x56, 0xE0, 
-0x63, 0x2F, 0x0D, 0x60, 0x64, 0x28, 0x38, 0xE0, 0x65, 0x0E, 0xEF, 0x60, 0x66, 0x11, 0x55, 0x60, 
-0x66, 0xF8, 0x0B, 0xE0, 0x67, 0xF1, 0x37, 0x60, 0x68, 0xD7, 0xED, 0xE0, 0x69, 0xD1, 0x19, 0x60, 
-0x6A, 0xB7, 0xCF, 0xE0, 0x6B, 0xB0, 0xFB, 0x60, 0x6C, 0x97, 0xB1, 0xE0, 0x6D, 0x90, 0xDD, 0x60, 
-0x6E, 0x77, 0x93, 0xE0, 0x6F, 0x70, 0xBF, 0x60, 0x70, 0x60, 0xB0, 0x60, 0x71, 0x59, 0xDB, 0xE0, 
-0x72, 0x40, 0x92, 0x60, 0x73, 0x39, 0xBD, 0xE0, 0x74, 0x20, 0x74, 0x60, 0x75, 0x19, 0x9F, 0xE0, 
-0x76, 0x00, 0x56, 0x60, 0x76, 0xF9, 0x81, 0xE0, 0x77, 0xE0, 0x38, 0x60, 0x78, 0xD9, 0x63, 0xE0, 
-0x79, 0xC0, 0x1A, 0x60, 0x7A, 0xB9, 0x45, 0xE0, 0x7B, 0xA9, 0x36, 0xE0, 0x7C, 0xA2, 0x62, 0x60, 
-0x7D, 0x89, 0x18, 0xE0, 0x7E, 0x82, 0x44, 0x60, 0x7F, 0x68, 0xFA, 0xE0, 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, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
+0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 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, 0x9B, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0F, 0xB0, 0xB4, 0xB2, 0xE8, 
+0xB1, 0x51, 0x87, 0x58, 0xB2, 0x78, 0xE5, 0x68, 0xB3, 0x43, 0xE5, 0x60, 0xB4, 0x58, 0xC7, 0x68, 
+0xB5, 0x23, 0xC7, 0x60, 0xB6, 0x38, 0xA9, 0x68, 0xB7, 0x03, 0xA9, 0x60, 0xB8, 0x18, 0x8B, 0x68, 
+0xB8, 0xEC, 0xC5, 0xE0, 0xB9, 0xF8, 0x6D, 0x68, 0xBA, 0xCC, 0xA7, 0xE0, 0xBB, 0xD8, 0x4F, 0x68, 
+0xBC, 0xE3, 0xE8, 0xE0, 0xBD, 0xAE, 0xF6, 0xE8, 0xBE, 0xC3, 0xCA, 0xE0, 0xBF, 0x8E, 0xD8, 0xE8, 
+0xC0, 0xA3, 0xAC, 0xE0, 0xC1, 0x6E, 0xBA, 0xE8, 0xC2, 0x83, 0x8E, 0xE0, 0xC3, 0x4E, 0x9C, 0xE8, 
+0xC4, 0x63, 0x70, 0xE0, 0xC5, 0x2E, 0x7E, 0xE8, 0xC6, 0x4C, 0x8D, 0x60, 0xC7, 0x0E, 0x60, 0xE8, 
+0xC8, 0x2C, 0x6F, 0x60, 0xC8, 0xF7, 0x7D, 0x68, 0xD2, 0xDA, 0x9A, 0x40, 0x09, 0x18, 0xFD, 0xE0, 
+0x09, 0xAC, 0xA5, 0xE0, 0x0A, 0xEF, 0xA5, 0x60, 0x0B, 0x9E, 0xFC, 0xE0, 0x0C, 0xD8, 0xC1, 0xE0, 
+0x0D, 0x7E, 0xDE, 0xE0, 0x0E, 0xB8, 0xA3, 0xE0, 0x0F, 0x5E, 0xC0, 0xE0, 0x10, 0x98, 0x85, 0xE0, 
+0x11, 0x3E, 0xA2, 0xE0, 0x12, 0x78, 0x67, 0xE0, 0x13, 0x1E, 0x84, 0xE0, 0x14, 0x58, 0x49, 0xE0, 
+0x14, 0xFE, 0x66, 0xE0, 0x16, 0x38, 0x2B, 0xE0, 0x16, 0xE7, 0x83, 0x60, 0x18, 0x21, 0x48, 0x60, 
+0x18, 0xC7, 0x65, 0x60, 0x1A, 0x01, 0x2A, 0x60, 0x1A, 0xA7, 0x47, 0x60, 0x1B, 0xE1, 0x0C, 0x60, 
+0x1C, 0x87, 0x29, 0x60, 0x1D, 0xC0, 0xEE, 0x60, 0x1E, 0x67, 0x0B, 0x60, 0x1F, 0xA0, 0xD0, 0x60, 
+0x20, 0x46, 0xED, 0x60, 0x21, 0x80, 0xB2, 0x60, 0x22, 0x30, 0x09, 0xE0, 0x23, 0x69, 0xCE, 0xE0, 
+0x24, 0x0F, 0xEB, 0xE0, 0x25, 0x2E, 0x01, 0x60, 0x26, 0x02, 0x42, 0xE0, 0x27, 0x0D, 0xE3, 0x60, 
+0x27, 0xE2, 0x24, 0xE0, 0x28, 0xED, 0xC5, 0x60, 0x29, 0xC2, 0x06, 0xE0, 0x2A, 0xCD, 0xA7, 0x60, 
+0x2B, 0xAB, 0x23, 0x60, 0x2C, 0xAD, 0x89, 0x60, 0x2D, 0x8B, 0x05, 0x60, 0x2E, 0x8D, 0x6B, 0x60, 
+0x2F, 0x6A, 0xE7, 0x60, 0x30, 0x6D, 0x4D, 0x60, 0x31, 0x4A, 0xC9, 0x60, 0x32, 0x56, 0x69, 0xE0, 
+0x33, 0x2A, 0xAB, 0x60, 0x34, 0x36, 0x4B, 0xE0, 0x35, 0x0A, 0x8D, 0x60, 0x36, 0x16, 0x2D, 0xE0, 
+0x36, 0xF3, 0xA9, 0xE0, 0x37, 0xF6, 0x0F, 0xE0, 0x38, 0xD3, 0x8B, 0xE0, 0x39, 0xD5, 0xF1, 0xE0, 
+0x3A, 0xB3, 0x6D, 0xE0, 0x3B, 0xBF, 0x0E, 0x60, 0x3C, 0x93, 0x4F, 0xE0, 0x3D, 0x9E, 0xF0, 0x60, 
+0x3E, 0x73, 0x31, 0xE0, 0x3F, 0x7E, 0xD2, 0x60, 0x40, 0x5C, 0x4E, 0x60, 0x41, 0x5E, 0xB4, 0x60, 
+0x42, 0x3C, 0x30, 0x60, 0x43, 0x3E, 0x96, 0x60, 0x44, 0x1C, 0x12, 0x60, 0x45, 0x1E, 0x78, 0x60, 
+0x45, 0xFB, 0xF4, 0x60, 0x46, 0xFE, 0x5A, 0x60, 0x47, 0xF7, 0x85, 0xE0, 0x48, 0xDE, 0x3C, 0x60, 
+0x49, 0xD7, 0x67, 0xE0, 0x4A, 0xBE, 0x1E, 0x60, 0x4B, 0xB7, 0x49, 0xE0, 0x4C, 0x9E, 0x00, 0x60, 
+0x4D, 0x97, 0x2B, 0xE0, 0x4E, 0x7D, 0xE2, 0x60, 0x4F, 0x77, 0x0D, 0xE0, 0x50, 0x66, 0xFE, 0xE0, 
+0x51, 0x60, 0x2A, 0x60, 0x52, 0x46, 0xE0, 0xE0, 0x53, 0x40, 0x0C, 0x60, 0x54, 0x26, 0xC2, 0xE0, 
+0x55, 0x1F, 0xEE, 0x60, 0x56, 0x06, 0xA4, 0xE0, 0x56, 0xFF, 0xD0, 0x60, 0x57, 0xE6, 0x86, 0xE0, 
+0x58, 0xDF, 0xB2, 0x60, 0x59, 0xC6, 0x68, 0xE0, 0x5A, 0xBF, 0x94, 0x60, 0x5B, 0xAF, 0x85, 0x60, 
+0x5C, 0xA8, 0xB0, 0xE0, 0x5D, 0x8F, 0x67, 0x60, 0x5E, 0x88, 0x92, 0xE0, 0x5F, 0x6F, 0x49, 0x60, 
+0x60, 0x68, 0x74, 0xE0, 0x61, 0x4F, 0x2B, 0x60, 0x62, 0x48, 0x56, 0xE0, 0x63, 0x2F, 0x0D, 0x60, 
+0x64, 0x28, 0x38, 0xE0, 0x65, 0x0E, 0xEF, 0x60, 0x66, 0x11, 0x55, 0x60, 0x66, 0xF8, 0x0B, 0xE0, 
+0x67, 0xF1, 0x37, 0x60, 0x68, 0xD7, 0xED, 0xE0, 0x69, 0xD1, 0x19, 0x60, 0x6A, 0xB7, 0xCF, 0xE0, 
+0x6B, 0xB0, 0xFB, 0x60, 0x6C, 0x97, 0xB1, 0xE0, 0x6D, 0x90, 0xDD, 0x60, 0x6E, 0x77, 0x93, 0xE0, 
+0x6F, 0x70, 0xBF, 0x60, 0x70, 0x60, 0xB0, 0x60, 0x71, 0x59, 0xDB, 0xE0, 0x72, 0x40, 0x92, 0x60, 
+0x73, 0x39, 0xBD, 0xE0, 0x74, 0x20, 0x74, 0x60, 0x75, 0x19, 0x9F, 0xE0, 0x76, 0x00, 0x56, 0x60, 
+0x76, 0xF9, 0x81, 0xE0, 0x77, 0xE0, 0x38, 0x60, 0x78, 0xD9, 0x63, 0xE0, 0x79, 0xC0, 0x1A, 0x60, 
+0x7A, 0xB9, 0x45, 0xE0, 0x7B, 0xA9, 0x36, 0xE0, 0x7C, 0xA2, 0x62, 0x60, 0x7D, 0x89, 0x18, 0xE0, 
+0x7E, 0x82, 0x44, 0x60, 0x7F, 0x68, 0xFA, 0xE0, 0x00, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
-0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0xB6, 0xD0, 0x01, 0x04, 0x00, 0x00, 0xA8, 0xC0, 0x00, 0x09, 0x00, 0x00, 
-0xA8, 0xC0, 0x00, 0x09, 0x7A, 0x7A, 0x7A, 0x00, 0x4E, 0x5A, 0x44, 0x54, 0x00, 0x4E, 0x5A, 0x53, 
-0x54, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x12, 
-0xA8, 0x80, 0x00, 0x00, 0x00, 0x22, 0x41, 0x6D, 0x75, 0x6E, 0x64, 0x73, 0x65, 0x6E, 0x2D, 0x53, 
-0x63, 0x6F, 0x74, 0x74, 0x20, 0x53, 0x74, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x2C, 0x20, 0x53, 0x6F, 
-0x75, 0x74, 0x68, 0x20, 0x50, 0x6F, 0x6C, 0x65, 
+0x02, 0x01, 0x02, 0x05, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
+0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 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, 0xAF, 0xC8, 0x01, 0x00, 0x00, 0x00, 0xA1, 0xB8, 0x00, 0x05, 0x00, 
+0x00, 0xA8, 0xC0, 0x01, 0x00, 0x00, 0x00, 0xB6, 0xD0, 0x01, 0x0A, 0x00, 0x00, 0xA8, 0xC0, 0x00, 
+0x00, 0x00, 0x00, 0xA8, 0xC0, 0x00, 0x00, 0x4E, 0x5A, 0x53, 0x54, 0x00, 0x4E, 0x5A, 0x4D, 0x54, 
+0x00, 0x4E, 0x5A, 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00, 
 
 /* Antarctica/Syowa */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x51, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -7535,8 +7536,8 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 
 /* Asia/Amman */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x4A, 0x4F, 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, 0x0D, 0xB6, 0xA3, 0xD6, 0xD0, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x11, 0xB6, 0xA3, 0xD6, 0xD0, 
 0x06, 0x72, 0x79, 0xE0, 0x07, 0x0C, 0xAB, 0x50, 0x08, 0x24, 0x37, 0x60, 0x08, 0xED, 0xDE, 0xD0, 
 0x0A, 0x05, 0x6A, 0xE0, 0x0A, 0xCF, 0x12, 0x50, 0x0B, 0xE7, 0xEF, 0xE0, 0x0C, 0xDA, 0x75, 0xD0, 
 0x0D, 0xC9, 0x23, 0x60, 0x0E, 0x92, 0xCA, 0xD0, 0x0F, 0xA9, 0x05, 0x60, 0x10, 0x72, 0xAC, 0xD0, 
@@ -7553,31 +7554,17 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x42, 0x4C, 0x72, 0xE0, 0x43, 0x3C, 0x63, 0xE0, 0x44, 0x2C, 0x54, 0xE0, 0x45, 0x41, 0x2F, 0xE0, 
 0x46, 0x0C, 0x36, 0xE0, 0x47, 0x21, 0x11, 0xE0, 0x47, 0xEC, 0x18, 0xE0, 0x49, 0x0A, 0x2E, 0x60, 
 0x49, 0xCB, 0xFA, 0xE0, 0x4A, 0xEA, 0x10, 0x60, 0x4B, 0xAB, 0xDC, 0xE0, 0x4C, 0xC9, 0xF2, 0x60, 
-0x4D, 0x94, 0xF9, 0x60, 0x4E, 0xA9, 0xD4, 0x60, 0x4F, 0x74, 0xDB, 0x60, 0x52, 0x69, 0x98, 0x60, 
-0x53, 0x34, 0x9F, 0x60, 0x54, 0x52, 0xB4, 0xE0, 0x55, 0x14, 0x81, 0x60, 0x56, 0x32, 0x96, 0xE0, 
-0x56, 0xFD, 0x9D, 0xE0, 0x58, 0x12, 0x78, 0xE0, 0x58, 0xDD, 0x7F, 0xE0, 0x59, 0xF2, 0x5A, 0xE0, 
-0x5A, 0xBD, 0x61, 0xE0, 0x5B, 0xD2, 0x3C, 0xE0, 0x5C, 0x9D, 0x43, 0xE0, 0x5D, 0xB2, 0x1E, 0xE0, 
-0x5E, 0x7D, 0x25, 0xE0, 0x5F, 0x9B, 0x3B, 0x60, 0x60, 0x5D, 0x07, 0xE0, 0x61, 0x7B, 0x1D, 0x60, 
-0x62, 0x46, 0x24, 0x60, 0x63, 0x5A, 0xFF, 0x60, 0x64, 0x26, 0x06, 0x60, 0x65, 0x3A, 0xE1, 0x60, 
-0x66, 0x05, 0xE8, 0x60, 0x67, 0x1A, 0xC3, 0x60, 0x67, 0xE5, 0xCA, 0x60, 0x69, 0x03, 0xDF, 0xE0, 
-0x69, 0xC5, 0xAC, 0x60, 0x6A, 0xE3, 0xC1, 0xE0, 0x6B, 0xA5, 0x8E, 0x60, 0x6C, 0xC3, 0xA3, 0xE0, 
-0x6D, 0x8E, 0xAA, 0xE0, 0x6E, 0xA3, 0x85, 0xE0, 0x6F, 0x6E, 0x8C, 0xE0, 0x70, 0x83, 0x67, 0xE0, 
-0x71, 0x4E, 0x6E, 0xE0, 0x72, 0x63, 0x49, 0xE0, 0x73, 0x2E, 0x50, 0xE0, 0x74, 0x4C, 0x66, 0x60, 
-0x75, 0x0E, 0x32, 0xE0, 0x76, 0x2C, 0x48, 0x60, 0x76, 0xF7, 0x4F, 0x60, 0x78, 0x0C, 0x2A, 0x60, 
-0x78, 0xD7, 0x31, 0x60, 0x79, 0xEC, 0x0C, 0x60, 0x7A, 0xB7, 0x13, 0x60, 0x7B, 0xCB, 0xEE, 0x60, 
-0x7C, 0x96, 0xF5, 0x60, 0x7D, 0xB5, 0x0A, 0xE0, 0x7E, 0x76, 0xD7, 0x60, 0x7F, 0x94, 0xEC, 0xE0, 
+0x4D, 0x94, 0xF9, 0x60, 0x4E, 0xA9, 0xD4, 0x60, 0x4F, 0x74, 0xDB, 0x60, 0x50, 0x89, 0xB6, 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, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 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, 0x01, 
-0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 
-0x03, 0x01, 0x03, 0x01, 0x03, 0x00, 0x00, 0x21, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x2A, 0x30, 0x01, 
+0x03, 0x01, 0x03, 0x01, 0x05, 0x00, 0x00, 0x21, 0xB0, 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, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x45, 0x53, 0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 
-0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBA, 0x14, 0xB8, 0x01, 0x49, 
-0x7C, 0xF5, 0x00, 0x00, 0x00, 0x00, 
+0x30, 0x01, 0x04, 0x00, 0x00, 0x2A, 0x30, 0x00, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x45, 0x45, 0x53, 
+0x54, 0x00, 0x45, 0x45, 0x54, 0x00, 0x41, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBA, 0x14, 0xB8, 0x01, 0x49, 0x7C, 0xF5, 0x00, 0x00, 
+0x00, 0x00, 
 
 /* Asia/Anadyr */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x52, 0x55, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -8060,13 +8047,13 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* Asia/Dili */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x54, 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, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x10, 0x92, 0xE6, 0x18, 0xC4, 
+0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x11, 0x92, 0xE6, 0x18, 0xC4, 
 0xCB, 0x99, 0x32, 0xF0, 0xD2, 0x56, 0xEE, 0x70, 0x0B, 0xEA, 0x30, 0x70, 0x39, 0xC3, 0x99, 0x00, 
 0x01, 0x02, 0x03, 0x04, 0x03, 0x00, 0x00, 0x75, 0xBC, 0x00, 0x00, 0x00, 0x00, 0x70, 0x80, 0x00, 
 0x04, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x08, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x04, 0x00, 0x00, 0x70, 
-0x80, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x54, 0x4C, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x43, 
-0x49, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, 0x48, 
-0x68, 0x01, 0xD2, 0x48, 0x7D, 0x00, 0x00, 0x00, 0x00, 
+0x80, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x54, 0x4C, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x57, 
+0x49, 0x54, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7C, 
+0x48, 0x68, 0x01, 0xD2, 0x48, 0x7D, 0x00, 0x00, 0x00, 0x00, 
 
 /* Asia/Dubai */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x41, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -8122,19 +8109,19 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x45, 0x12, 0xFD, 0x50, 0x46, 0x0E, 0xD9, 0xE0, 0x46, 0xE8, 0x6F, 0x70, 0x47, 0xEC, 0x18, 0xE0, 
 0x48, 0xB7, 0x11, 0xD0, 0x49, 0xCB, 0xFA, 0xE0, 0x4A, 0xA0, 0x3C, 0x60, 0x4B, 0xAD, 0x2E, 0x9C, 
 0x4C, 0x61, 0xBD, 0xD0, 0x4D, 0x94, 0xF9, 0x9C, 0x4E, 0x35, 0xC2, 0x50, 0x4F, 0x74, 0xDB, 0x60, 
-0x50, 0x5B, 0x91, 0xE0, 0x51, 0x54, 0xBD, 0x60, 0x52, 0x44, 0xAE, 0x60, 0x53, 0x34, 0x9F, 0x60, 
-0x54, 0x24, 0x90, 0x60, 0x55, 0x14, 0x81, 0x60, 0x56, 0x04, 0x72, 0x60, 0x56, 0xFD, 0x9D, 0xE0, 
-0x57, 0xE4, 0x54, 0x60, 0x58, 0xDD, 0x7F, 0xE0, 0x59, 0xC4, 0x36, 0x60, 0x5A, 0xBD, 0x61, 0xE0, 
-0x5B, 0xA4, 0x18, 0x60, 0x5C, 0x9D, 0x43, 0xE0, 0x5D, 0x8D, 0x34, 0xE0, 0x5E, 0x7D, 0x25, 0xE0, 
-0x5F, 0x6D, 0x16, 0xE0, 0x60, 0x5D, 0x07, 0xE0, 0x61, 0x4C, 0xF8, 0xE0, 0x62, 0x46, 0x24, 0x60, 
-0x63, 0x2C, 0xDA, 0xE0, 0x64, 0x26, 0x06, 0x60, 0x65, 0x0C, 0xBC, 0xE0, 0x66, 0x05, 0xE8, 0x60, 
-0x66, 0xF5, 0xD9, 0x60, 0x67, 0xE5, 0xCA, 0x60, 0x68, 0xD5, 0xBB, 0x60, 0x69, 0xC5, 0xAC, 0x60, 
-0x6A, 0xB5, 0x9D, 0x60, 0x6B, 0xA5, 0x8E, 0x60, 0x6C, 0x95, 0x7F, 0x60, 0x6D, 0x8E, 0xAA, 0xE0, 
-0x6E, 0x75, 0x61, 0x60, 0x6F, 0x6E, 0x8C, 0xE0, 0x70, 0x55, 0x43, 0x60, 0x71, 0x4E, 0x6E, 0xE0, 
-0x72, 0x3E, 0x5F, 0xE0, 0x73, 0x2E, 0x50, 0xE0, 0x74, 0x1E, 0x41, 0xE0, 0x75, 0x0E, 0x32, 0xE0, 
-0x75, 0xFE, 0x23, 0xE0, 0x76, 0xF7, 0x4F, 0x60, 0x77, 0xDE, 0x05, 0xE0, 0x78, 0xD7, 0x31, 0x60, 
-0x79, 0xBD, 0xE7, 0xE0, 0x7A, 0xB7, 0x13, 0x60, 0x7B, 0x9D, 0xC9, 0xE0, 0x7C, 0x96, 0xF5, 0x60, 
-0x7D, 0x86, 0xE6, 0x60, 0x7E, 0x76, 0xD7, 0x60, 0x7F, 0x66, 0xC8, 0x60, 0x00, 0x01, 0x00, 0x01, 
+0x50, 0x5B, 0x91, 0xE0, 0x51, 0x54, 0xBD, 0x60, 0x52, 0x44, 0xA0, 0x50, 0x53, 0x34, 0x9F, 0x60, 
+0x54, 0x24, 0x82, 0x50, 0x55, 0x14, 0x81, 0x60, 0x56, 0x04, 0x64, 0x50, 0x56, 0xFD, 0x9D, 0xE0, 
+0x57, 0xE4, 0x46, 0x50, 0x58, 0xDD, 0x7F, 0xE0, 0x59, 0xC4, 0x28, 0x50, 0x5A, 0xBD, 0x61, 0xE0, 
+0x5B, 0xA4, 0x0A, 0x50, 0x5C, 0x9D, 0x43, 0xE0, 0x5D, 0x8D, 0x26, 0xD0, 0x5E, 0x7D, 0x25, 0xE0, 
+0x5F, 0x6D, 0x08, 0xD0, 0x60, 0x5D, 0x07, 0xE0, 0x61, 0x4C, 0xEA, 0xD0, 0x62, 0x46, 0x24, 0x60, 
+0x63, 0x2C, 0xCC, 0xD0, 0x64, 0x26, 0x06, 0x60, 0x65, 0x0C, 0xAE, 0xD0, 0x66, 0x05, 0xE8, 0x60, 
+0x66, 0xF5, 0xCB, 0x50, 0x67, 0xE5, 0xCA, 0x60, 0x68, 0xD5, 0xAD, 0x50, 0x69, 0xC5, 0xAC, 0x60, 
+0x6A, 0xB5, 0x8F, 0x50, 0x6B, 0xA5, 0x8E, 0x60, 0x6C, 0x95, 0x71, 0x50, 0x6D, 0x8E, 0xAA, 0xE0, 
+0x6E, 0x75, 0x53, 0x50, 0x6F, 0x6E, 0x8C, 0xE0, 0x70, 0x55, 0x35, 0x50, 0x71, 0x4E, 0x6E, 0xE0, 
+0x72, 0x3E, 0x51, 0xD0, 0x73, 0x2E, 0x50, 0xE0, 0x74, 0x1E, 0x33, 0xD0, 0x75, 0x0E, 0x32, 0xE0, 
+0x75, 0xFE, 0x15, 0xD0, 0x76, 0xF7, 0x4F, 0x60, 0x77, 0xDD, 0xF7, 0xD0, 0x78, 0xD7, 0x31, 0x60, 
+0x79, 0xBD, 0xD9, 0xD0, 0x7A, 0xB7, 0x13, 0x60, 0x7B, 0x9D, 0xBB, 0xD0, 0x7C, 0x96, 0xF5, 0x60, 
+0x7D, 0x86, 0xD8, 0x50, 0x7E, 0x76, 0xD7, 0x60, 0x7F, 0x66, 0xBA, 0x50, 0x00, 0x01, 0x00, 0x01, 
 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
@@ -8196,19 +8183,19 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x48, 0xBB, 0x06, 0x50, 0x49, 0xCB, 0xFA, 0xE0, 0x4A, 0xA0, 0x3C, 0x60, 0x4B, 0xAB, 0xDC, 0xE0, 
 0x4C, 0x61, 0xBD, 0xD0, 0x4D, 0x94, 0xF9, 0x9C, 0x4E, 0x35, 0xC2, 0x50, 0x4E, 0x5C, 0x0B, 0xE0, 
 0x4E, 0x84, 0xDC, 0x50, 0x4F, 0x74, 0xDB, 0x60, 0x50, 0x5B, 0x91, 0xE0, 0x51, 0x54, 0xBD, 0x60, 
-0x52, 0x44, 0xAE, 0x60, 0x53, 0x34, 0x9F, 0x60, 0x54, 0x24, 0x90, 0x60, 0x55, 0x14, 0x81, 0x60, 
-0x56, 0x04, 0x72, 0x60, 0x56, 0xFD, 0x9D, 0xE0, 0x57, 0xE4, 0x54, 0x60, 0x58, 0xDD, 0x7F, 0xE0, 
-0x59, 0xC4, 0x36, 0x60, 0x5A, 0xBD, 0x61, 0xE0, 0x5B, 0xA4, 0x18, 0x60, 0x5C, 0x9D, 0x43, 0xE0, 
-0x5D, 0x8D, 0x34, 0xE0, 0x5E, 0x7D, 0x25, 0xE0, 0x5F, 0x6D, 0x16, 0xE0, 0x60, 0x5D, 0x07, 0xE0, 
-0x61, 0x4C, 0xF8, 0xE0, 0x62, 0x46, 0x24, 0x60, 0x63, 0x2C, 0xDA, 0xE0, 0x64, 0x26, 0x06, 0x60, 
-0x65, 0x0C, 0xBC, 0xE0, 0x66, 0x05, 0xE8, 0x60, 0x66, 0xF5, 0xD9, 0x60, 0x67, 0xE5, 0xCA, 0x60, 
-0x68, 0xD5, 0xBB, 0x60, 0x69, 0xC5, 0xAC, 0x60, 0x6A, 0xB5, 0x9D, 0x60, 0x6B, 0xA5, 0x8E, 0x60, 
-0x6C, 0x95, 0x7F, 0x60, 0x6D, 0x8E, 0xAA, 0xE0, 0x6E, 0x75, 0x61, 0x60, 0x6F, 0x6E, 0x8C, 0xE0, 
-0x70, 0x55, 0x43, 0x60, 0x71, 0x4E, 0x6E, 0xE0, 0x72, 0x3E, 0x5F, 0xE0, 0x73, 0x2E, 0x50, 0xE0, 
-0x74, 0x1E, 0x41, 0xE0, 0x75, 0x0E, 0x32, 0xE0, 0x75, 0xFE, 0x23, 0xE0, 0x76, 0xF7, 0x4F, 0x60, 
-0x77, 0xDE, 0x05, 0xE0, 0x78, 0xD7, 0x31, 0x60, 0x79, 0xBD, 0xE7, 0xE0, 0x7A, 0xB7, 0x13, 0x60, 
-0x7B, 0x9D, 0xC9, 0xE0, 0x7C, 0x96, 0xF5, 0x60, 0x7D, 0x86, 0xE6, 0x60, 0x7E, 0x76, 0xD7, 0x60, 
-0x7F, 0x66, 0xC8, 0x60, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x02, 0x01, 
+0x52, 0x44, 0xA0, 0x50, 0x53, 0x34, 0x9F, 0x60, 0x54, 0x24, 0x82, 0x50, 0x55, 0x14, 0x81, 0x60, 
+0x56, 0x04, 0x64, 0x50, 0x56, 0xFD, 0x9D, 0xE0, 0x57, 0xE4, 0x46, 0x50, 0x58, 0xDD, 0x7F, 0xE0, 
+0x59, 0xC4, 0x28, 0x50, 0x5A, 0xBD, 0x61, 0xE0, 0x5B, 0xA4, 0x0A, 0x50, 0x5C, 0x9D, 0x43, 0xE0, 
+0x5D, 0x8D, 0x26, 0xD0, 0x5E, 0x7D, 0x25, 0xE0, 0x5F, 0x6D, 0x08, 0xD0, 0x60, 0x5D, 0x07, 0xE0, 
+0x61, 0x4C, 0xEA, 0xD0, 0x62, 0x46, 0x24, 0x60, 0x63, 0x2C, 0xCC, 0xD0, 0x64, 0x26, 0x06, 0x60, 
+0x65, 0x0C, 0xAE, 0xD0, 0x66, 0x05, 0xE8, 0x60, 0x66, 0xF5, 0xCB, 0x50, 0x67, 0xE5, 0xCA, 0x60, 
+0x68, 0xD5, 0xAD, 0x50, 0x69, 0xC5, 0xAC, 0x60, 0x6A, 0xB5, 0x8F, 0x50, 0x6B, 0xA5, 0x8E, 0x60, 
+0x6C, 0x95, 0x71, 0x50, 0x6D, 0x8E, 0xAA, 0xE0, 0x6E, 0x75, 0x53, 0x50, 0x6F, 0x6E, 0x8C, 0xE0, 
+0x70, 0x55, 0x35, 0x50, 0x71, 0x4E, 0x6E, 0xE0, 0x72, 0x3E, 0x51, 0xD0, 0x73, 0x2E, 0x50, 0xE0, 
+0x74, 0x1E, 0x33, 0xD0, 0x75, 0x0E, 0x32, 0xE0, 0x75, 0xFE, 0x15, 0xD0, 0x76, 0xF7, 0x4F, 0x60, 
+0x77, 0xDD, 0xF7, 0xD0, 0x78, 0xD7, 0x31, 0x60, 0x79, 0xBD, 0xD9, 0xD0, 0x7A, 0xB7, 0x13, 0x60, 
+0x7B, 0x9D, 0xBB, 0xD0, 0x7C, 0x96, 0xF5, 0x60, 0x7D, 0x86, 0xD8, 0x50, 0x7E, 0x76, 0xD7, 0x60, 
+0x7F, 0x66, 0xBA, 0x50, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 
 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x03, 0x04, 0x01, 0x02, 
@@ -8397,7 +8384,7 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0xDA, 0xFF, 0x26, 0x00, 0xF4, 0xB5, 0xBE, 0x88, 0x01, 0x02, 0x03, 0x02, 0x04, 0x02, 0x05, 0x00, 
 0x00, 0x64, 0x20, 0x00, 0x00, 0x00, 0x00, 0x67, 0x20, 0x00, 0x04, 0x00, 0x00, 0x69, 0x78, 0x00, 
 0x09, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x0D, 0x00, 0x00, 0x70, 0x80, 0x00, 0x09, 0x00, 0x00, 0x62, 
-0x70, 0x00, 0x09, 0x4A, 0x4D, 0x54, 0x00, 0x4A, 0x41, 0x56, 0x54, 0x00, 0x57, 0x49, 0x54, 0x00, 
+0x70, 0x00, 0x09, 0x42, 0x4D, 0x54, 0x00, 0x4A, 0x41, 0x56, 0x54, 0x00, 0x57, 0x49, 0x42, 0x00, 
 0x4A, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x7F, 0xEB, 0x65, 0x01, 0xB5, 0x9F, 0x40, 0x00, 0x00, 0x00, 0x0E, 0x4A, 0x61, 0x76, 0x61, 
 0x20, 0x26, 0x20, 0x53, 0x75, 0x6D, 0x61, 0x74, 0x72, 0x61, 
@@ -8408,7 +8395,7 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0xBA, 0x16, 0xC1, 0x98, 
 0xD0, 0x58, 0xB9, 0xF0, 0xF4, 0xB5, 0xA2, 0x68, 0x01, 0x02, 0x01, 0x00, 0x00, 0x83, 0xE8, 0x00, 
 0x00, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x04, 0x00, 0x00, 0x85, 0x98, 0x00, 0x08, 0x4C, 0x4D, 0x54, 
-0x00, 0x45, 0x49, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x57, 0x49, 0x54, 0x00, 0x43, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x85, 0x76, 0xAA, 0x01, 0xE9, 0x59, 0x70, 0x00, 0x00, 0x00, 0x31, 0x77, 0x65, 0x73, 0x74, 0x20, 
 0x4E, 0x65, 0x77, 0x20, 0x47, 0x75, 0x69, 0x6E, 0x65, 0x61, 0x20, 0x28, 0x49, 0x72, 0x69, 0x61, 
 0x6E, 0x20, 0x4A, 0x61, 0x79, 0x61, 0x29, 0x20, 0x26, 0x20, 0x4D, 0x61, 0x6C, 0x75, 0x6B, 0x75, 
@@ -8754,17 +8741,17 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* Asia/Makassar */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x49, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xA1, 0xF2, 0x5D, 0x90, 
+0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x11, 0xA1, 0xF2, 0x5D, 0x90, 
 0xBA, 0x16, 0xD5, 0x90, 0xCB, 0x88, 0x1D, 0x80, 0xD2, 0x56, 0xEE, 0x70, 0x01, 0x02, 0x03, 0x02, 
 0x00, 0x00, 0x6F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x6F, 0xF0, 0x00, 0x04, 0x00, 0x00, 0x70, 0x80, 
-0x00, 0x08, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x4D, 0x54, 0x00, 
-0x43, 0x49, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x81, 0x85, 0x8D, 0x01, 0xC8, 0xD9, 0x1F, 0x00, 0x00, 0x00, 0x48, 0x65, 0x61, 0x73, 0x74, 
-0x20, 0x26, 0x20, 0x73, 0x6F, 0x75, 0x74, 0x68, 0x20, 0x42, 0x6F, 0x72, 0x6E, 0x65, 0x6F, 0x2C, 
-0x20, 0x53, 0x75, 0x6C, 0x61, 0x77, 0x65, 0x73, 0x69, 0x20, 0x28, 0x43, 0x65, 0x6C, 0x65, 0x62, 
-0x65, 0x73, 0x29, 0x2C, 0x20, 0x42, 0x61, 0x6C, 0x69, 0x2C, 0x20, 0x4E, 0x75, 0x73, 0x61, 0x20, 
-0x54, 0x65, 0x6E, 0x67, 0x61, 0x72, 0x72, 0x61, 0x2C, 0x20, 0x77, 0x65, 0x73, 0x74, 0x20, 0x54, 
-0x69, 0x6D, 0x6F, 0x72, 
+0x00, 0x08, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x4D, 0x54, 0x00, 
+0x57, 0x49, 0x54, 0x41, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x81, 0x85, 0x8D, 0x01, 0xC8, 0xD9, 0x1F, 0x00, 0x00, 0x00, 0x48, 0x65, 0x61, 0x73, 
+0x74, 0x20, 0x26, 0x20, 0x73, 0x6F, 0x75, 0x74, 0x68, 0x20, 0x42, 0x6F, 0x72, 0x6E, 0x65, 0x6F, 
+0x2C, 0x20, 0x53, 0x75, 0x6C, 0x61, 0x77, 0x65, 0x73, 0x69, 0x20, 0x28, 0x43, 0x65, 0x6C, 0x65, 
+0x62, 0x65, 0x73, 0x29, 0x2C, 0x20, 0x42, 0x61, 0x6C, 0x69, 0x2C, 0x20, 0x4E, 0x75, 0x73, 0x61, 
+0x20, 0x54, 0x65, 0x6E, 0x67, 0x61, 0x72, 0x72, 0x61, 0x2C, 0x20, 0x77, 0x65, 0x73, 0x74, 0x20, 
+0x54, 0x69, 0x6D, 0x6F, 0x72, 
 
 /* Asia/Manila */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x50, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -8980,17 +8967,17 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* Asia/Pontianak */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x49, 0x44, 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, 0x08, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x14, 0x8B, 0xFF, 0x8E, 0x00, 
+0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x15, 0x8B, 0xFF, 0x8E, 0x00, 
 0xBA, 0x16, 0xDF, 0x00, 0xCB, 0x79, 0xA4, 0x08, 0xD2, 0x56, 0xEE, 0x70, 0xD7, 0x3C, 0xC6, 0x08, 
 0xDA, 0xFF, 0x26, 0x00, 0xF4, 0xB5, 0xBE, 0x88, 0x21, 0xDA, 0x74, 0x80, 0x01, 0x02, 0x03, 0x02, 
 0x04, 0x02, 0x05, 0x06, 0x00, 0x00, 0x66, 0x80, 0x00, 0x00, 0x00, 0x00, 0x66, 0x80, 0x00, 0x04, 
 0x00, 0x00, 0x69, 0x78, 0x00, 0x08, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x0C, 0x00, 0x00, 0x70, 0x80, 
 0x00, 0x08, 0x00, 0x00, 0x70, 0x80, 0x00, 0x10, 0x00, 0x00, 0x62, 0x70, 0x00, 0x08, 0x4C, 0x4D, 
-0x54, 0x00, 0x50, 0x4D, 0x54, 0x00, 0x57, 0x49, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x43, 0x49, 
-0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x89, 0x47, 0x3A, 0x01, 0xB9, 0x7C, 0xD5, 0x00, 0x00, 0x00, 0x15, 0x77, 0x65, 0x73, 0x74, 
-0x20, 0x26, 0x20, 0x63, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x42, 0x6F, 0x72, 0x6E, 0x65, 
-0x6F, 
+0x54, 0x00, 0x50, 0x4D, 0x54, 0x00, 0x57, 0x49, 0x42, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x57, 0x49, 
+0x54, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x89, 0x47, 0x3A, 0x01, 0xB9, 0x7C, 0xD5, 0x00, 0x00, 0x00, 0x15, 0x77, 0x65, 0x73, 
+0x74, 0x20, 0x26, 0x20, 0x63, 0x65, 0x6E, 0x74, 0x72, 0x61, 0x6C, 0x20, 0x42, 0x6F, 0x72, 0x6E, 
+0x65, 0x6F, 
 
 /* Asia/Pyongyang */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x4B, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -9368,12 +9355,12 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* Asia/Ujung_Pandang */
 0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0xA1, 0xF2, 0x5D, 0x90, 
+0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x11, 0xA1, 0xF2, 0x5D, 0x90, 
 0xBA, 0x16, 0xD5, 0x90, 0xCB, 0x88, 0x1D, 0x80, 0xD2, 0x56, 0xEE, 0x70, 0x01, 0x02, 0x03, 0x02, 
 0x00, 0x00, 0x6F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x6F, 0xF0, 0x00, 0x04, 0x00, 0x00, 0x70, 0x80, 
-0x00, 0x08, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x0C, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x4D, 0x54, 0x00, 
-0x43, 0x49, 0x54, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x08, 0x00, 0x00, 0x7E, 0x90, 0x00, 0x0D, 0x4C, 0x4D, 0x54, 0x00, 0x4D, 0x4D, 0x54, 0x00, 
+0x57, 0x49, 0x54, 0x41, 0x00, 0x4A, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 0x00, 0x00, 0x00, 0x00, 
 
 /* Asia/Ulaanbaatar */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x4D, 0x4E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -15346,8 +15333,9 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 
 /* Europe/Vaduz */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x4C, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x09, 0x15, 0x23, 0xEB, 0x90, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x09, 0xCA, 0x17, 0x6A, 0x00, 
+0xCA, 0xE2, 0x71, 0x00, 0xCB, 0xF7, 0x4C, 0x00, 0xCC, 0xC2, 0x53, 0x00, 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, 0x1E, 0x8C, 0x90, 0x10, 0x1F, 0x7C, 0x81, 0x10, 0x20, 0x6C, 0x72, 0x10, 
@@ -15376,17 +15364,17 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x74, 0x45, 0xF9, 0x10, 0x75, 0x11, 0x00, 0x10, 0x76, 0x2F, 0x15, 0x90, 0x76, 0xF0, 0xE2, 0x10, 
 0x78, 0x0E, 0xF7, 0x90, 0x78, 0xD0, 0xC4, 0x10, 0x79, 0xEE, 0xD9, 0x90, 0x7A, 0xB0, 0xA6, 0x10, 
 0x7B, 0xCE, 0xBB, 0x90, 0x7C, 0x99, 0xC2, 0x90, 0x7D, 0xAE, 0x9D, 0x90, 0x7E, 0x79, 0xA4, 0x90, 
-0x7F, 0x8E, 0x7F, 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, 0x01, 0x02, 
-0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
-0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
-0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 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, 0x0E, 0x10, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x20, 
-0x01, 0x04, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00, 0x43, 0x45, 0x54, 0x00, 0x43, 0x45, 0x53, 0x54, 
-0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0xD1, 0x46, 0x38, 0x01, 0x21, 0x2D, 0xF2, 0x00, 
-0x00, 0x00, 0x00, 
+0x7F, 0x8E, 0x7F, 0x90, 0x00, 0x01, 0x00, 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, 
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 
+0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 
+0x00, 0x00, 0x0E, 0x10, 0x00, 0x05, 0x00, 0x00, 0x1C, 0x20, 0x01, 0x00, 0x00, 0x00, 0x0E, 0x10, 
+0x00, 0x05, 0x43, 0x45, 0x53, 0x54, 0x00, 0x43, 0x45, 0x54, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 
+0x00, 0x01, 0x01, 0x00, 0xD1, 0x46, 0x38, 0x01, 0x21, 0x2D, 0xF2, 0x00, 0x00, 0x00, 0x00, 
 
 /* Europe/Vatican */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x56, 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -16278,14 +16266,14 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 /* Jamaica */
 0x50, 0x48, 0x50, 0x31, 0x00, 0x3F, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 
-0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x93, 0x0F, 0xB5, 0x00, 
+0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x93, 0x0F, 0xB4, 0xFF, 
 0x08, 0x20, 0xC1, 0x70, 0x09, 0x10, 0xA4, 0x60, 0x09, 0xAD, 0x94, 0xF0, 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, 
 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
-0x01, 0x02, 0x01, 0x02, 0x01, 0xFF, 0xFF, 0xB8, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 
+0x01, 0x02, 0x01, 0x02, 0x01, 0xFF, 0xFF, 0xB8, 0x01, 0x00, 0x00, 0xFF, 0xFF, 0xB9, 0xB0, 0x00, 
 0x04, 0xFF, 0xFF, 0xC7, 0xC0, 0x01, 0x08, 0x4B, 0x4D, 0x54, 0x00, 0x45, 0x53, 0x54, 0x00, 0x45, 
 0x44, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 
 0x80, 0x00, 0x00, 0x00, 0x00, 
@@ -16999,19 +16987,19 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x36, 0x3B, 0x17, 0xE0, 0x36, 0xD7, 0xFA, 0x60, 0x38, 0x24, 0x34, 0x60, 0x38, 0xB7, 0xDC, 0x60, 
 0x4B, 0x11, 0x2C, 0xE0, 0x4B, 0xAE, 0x0F, 0x60, 0x4C, 0xC2, 0xEA, 0x60, 0x4D, 0x72, 0x41, 0xE0, 
 0x4E, 0xA2, 0xCC, 0x60, 0x4F, 0x1A, 0xC4, 0xE0, 0x50, 0x82, 0xAE, 0x60, 0x50, 0xFA, 0xA6, 0xE0, 
-0x52, 0x62, 0x90, 0x60, 0x52, 0xDA, 0x88, 0xE0, 0x54, 0x42, 0x72, 0x60, 0x54, 0xBA, 0x6A, 0xE0, 
-0x56, 0x22, 0x54, 0x60, 0x56, 0xA3, 0x87, 0x60, 0x58, 0x0B, 0x70, 0xE0, 0x58, 0x83, 0x69, 0x60, 
+0x52, 0x6B, 0xCA, 0xE0, 0x52, 0xDA, 0x88, 0xE0, 0x54, 0x4B, 0xAC, 0xE0, 0x54, 0xBA, 0x6A, 0xE0, 
+0x56, 0x2B, 0x8E, 0xE0, 0x56, 0xA3, 0x87, 0x60, 0x58, 0x0B, 0x70, 0xE0, 0x58, 0x83, 0x69, 0x60, 
 0x59, 0xEB, 0x52, 0xE0, 0x5A, 0x63, 0x4B, 0x60, 0x5B, 0xCB, 0x34, 0xE0, 0x5C, 0x43, 0x2D, 0x60, 
-0x5D, 0xAB, 0x16, 0xE0, 0x5E, 0x23, 0x0F, 0x60, 0x5F, 0x8A, 0xF8, 0xE0, 0x60, 0x0C, 0x2B, 0xE0, 
+0x5D, 0xB4, 0x51, 0x60, 0x5E, 0x23, 0x0F, 0x60, 0x5F, 0x94, 0x33, 0x60, 0x60, 0x0C, 0x2B, 0xE0, 
 0x61, 0x74, 0x15, 0x60, 0x61, 0xEC, 0x0D, 0xE0, 0x63, 0x53, 0xF7, 0x60, 0x63, 0xCB, 0xEF, 0xE0, 
-0x65, 0x33, 0xD9, 0x60, 0x65, 0xAB, 0xD1, 0xE0, 0x67, 0x13, 0xBB, 0x60, 0x67, 0x8B, 0xB3, 0xE0, 
-0x68, 0xF3, 0x9D, 0x60, 0x69, 0x6B, 0x95, 0xE0, 0x6A, 0xD3, 0x7F, 0x60, 0x6B, 0x54, 0xB2, 0x60, 
+0x65, 0x33, 0xD9, 0x60, 0x65, 0xAB, 0xD1, 0xE0, 0x67, 0x1C, 0xF5, 0xE0, 0x67, 0x8B, 0xB3, 0xE0, 
+0x68, 0xFC, 0xD7, 0xE0, 0x69, 0x6B, 0x95, 0xE0, 0x6A, 0xDC, 0xB9, 0xE0, 0x6B, 0x54, 0xB2, 0x60, 
 0x6C, 0xBC, 0x9B, 0xE0, 0x6D, 0x34, 0x94, 0x60, 0x6E, 0x9C, 0x7D, 0xE0, 0x6F, 0x14, 0x76, 0x60, 
-0x70, 0x7C, 0x5F, 0xE0, 0x70, 0xF4, 0x58, 0x60, 0x72, 0x5C, 0x41, 0xE0, 0x72, 0xD4, 0x3A, 0x60, 
-0x74, 0x3C, 0x23, 0xE0, 0x74, 0xB4, 0x1C, 0x60, 0x76, 0x25, 0x40, 0x60, 0x76, 0x9D, 0x38, 0xE0, 
+0x70, 0x7C, 0x5F, 0xE0, 0x70, 0xF4, 0x58, 0x60, 0x72, 0x65, 0x7C, 0x60, 0x72, 0xD4, 0x3A, 0x60, 
+0x74, 0x45, 0x5E, 0x60, 0x74, 0xB4, 0x1C, 0x60, 0x76, 0x25, 0x40, 0x60, 0x76, 0x9D, 0x38, 0xE0, 
 0x78, 0x05, 0x22, 0x60, 0x78, 0x7D, 0x1A, 0xE0, 0x79, 0xE5, 0x04, 0x60, 0x7A, 0x5C, 0xFC, 0xE0, 
-0x7B, 0xC4, 0xE6, 0x60, 0x7C, 0x3C, 0xDE, 0xE0, 0x7D, 0xA4, 0xC8, 0x60, 0x7E, 0x1C, 0xC0, 0xE0, 
-0x7F, 0x84, 0xAA, 0x60, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
+0x7B, 0xC4, 0xE6, 0x60, 0x7C, 0x3C, 0xDE, 0xE0, 0x7D, 0xAE, 0x02, 0xE0, 0x7E, 0x1C, 0xC0, 0xE0, 
+0x7F, 0x8D, 0xE4, 0xE0, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 
@@ -17074,11 +17062,13 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 
 /* Pacific/Johnston */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x55, 0x4D, 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, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0xFF, 0xFF, 0x73, 0x60, 
-0x00, 0x00, 0x48, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 0xA2, 0xE3, 0x38, 0x00, 0x0F, 0xFF, 0x0D, 
-0x00, 0x00, 0x00, 0x0E, 0x4A, 0x6F, 0x68, 0x6E, 0x73, 0x74, 0x6F, 0x6E, 0x20, 0x41, 0x74, 0x6F, 
-0x6C, 0x6C, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0xBB, 0x05, 0x43, 0x48, 
+0xBB, 0x21, 0x71, 0x58, 0xCB, 0x89, 0x3D, 0xC8, 0xD2, 0x61, 0x49, 0x38, 0xD5, 0x8D, 0x73, 0x48, 
+0x01, 0x00, 0x01, 0x00, 0x02, 0xFF, 0xFF, 0x6C, 0x58, 0x00, 0x00, 0xFF, 0xFF, 0x7A, 0x68, 0x01, 
+0x04, 0xFF, 0xFF, 0x73, 0x60, 0x00, 0x00, 0x48, 0x53, 0x54, 0x00, 0x48, 0x44, 0x54, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA2, 0xE3, 0x38, 0x00, 0x0F, 0xFF, 0x0D, 0x00, 0x00, 0x00, 
+0x0E, 0x4A, 0x6F, 0x68, 0x6E, 0x73, 0x74, 0x6F, 0x6E, 0x20, 0x41, 0x74, 0x6F, 0x6C, 0x6C, 
 
 /* Pacific/Kiritimati */
 0x50, 0x48, 0x50, 0x31, 0x01, 0x4B, 0x49, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
@@ -18410,4 +18400,4 @@ const unsigned char timelib_timezone_db_data_builtin[261525] = {
 0x00, 0x00, 0x55, 0x54, 0x43, 0x00, 0x00, 0x00, 0x00, 0x89, 0x54, 0x40, 0x01, 0x12, 0xA8, 0x80, 
 0x00, 0x00, 0x00, 0x00, };
 
-const timelib_tzdb timezonedb_builtin = { "2013.4", 579, timezonedb_idx_builtin, timelib_timezone_db_data_builtin };
+const timelib_tzdb timezonedb_builtin = { "2013.6", 579, timezonedb_idx_builtin, timelib_timezone_db_data_builtin };
-- 
cgit v1.2.1


From 0ad0a2f56ea5f9822297fec8e2816751b9a4f653 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Fri, 27 Sep 2013 17:46:14 +0200
Subject: Add information about which INI file is which inside respective files

---
 php.ini-development | 2 ++
 php.ini-production  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/php.ini-development b/php.ini-development
index ba20bd3fb8..b935f22eb5 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -83,6 +83,8 @@
 ; development version only in development environments as errors shown to
 ; application users can inadvertently leak otherwise secure information.
 
+; This is php.ini-development INI file.
+
 ;;;;;;;;;;;;;;;;;;;
 ; Quick Reference ;
 ;;;;;;;;;;;;;;;;;;;
diff --git a/php.ini-production b/php.ini-production
index db48a8fbc8..4ee7ac92ce 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -83,6 +83,8 @@
 ; development version only in development environments as errors shown to
 ; application users can inadvertently leak otherwise secure information.
 
+; This is php.ini-production INI file.
+
 ;;;;;;;;;;;;;;;;;;;
 ; Quick Reference ;
 ;;;;;;;;;;;;;;;;;;;
-- 
cgit v1.2.1


From d143c2b60f87f5cd221bd070bfde887374b74eb4 Mon Sep 17 00:00:00 2001
From: Stanislav Malyshev <stas@php.net>
Date: Sat, 28 Sep 2013 18:04:44 -0700
Subject: 5.4.20 release date

---
 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index e17632543c..37daabb18f 100644
--- a/NEWS
+++ b/NEWS
@@ -23,7 +23,7 @@ PHP                                                                        NEWS
   . Fixed bug #65721 (configure script broken in 5.5.4 and 5.4.20 when enabling
     imap). (ryotakatsuki at gmail dot com)
 
-?? ??? 2013, PHP 5.4.20
+19 Sep 2013, PHP 5.4.20
 
 - Core:
   . Fixed bug #60598 (cli/apache sapi segfault on objects manipulation).
-- 
cgit v1.2.1


From f0c926564c5f7de9462d9ca7bd75014b14a63f56 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikic@php.net>
Date: Sun, 29 Sep 2013 17:58:25 +0200
Subject: Fix bug #65322: compile time errors won't trigger auto loading

Also fixes duplicate bugs #54054 and #42098.

Furthermore this fixes incorrect error messages thrown from code
running inside an error handler when a compilation is in progress.
The error file and line are now correctly associated with the
file/line of the executor, rather than the compiler.
---
 NEWS                       |  3 +++
 Zend/tests/bug65322.phpt   | 22 ++++++++++++++++++++++
 Zend/tests/errmsg_045.phpt | 18 ++++++++++++++++++
 Zend/zend.c                |  4 +++-
 4 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 Zend/tests/bug65322.phpt
 create mode 100644 Zend/tests/errmsg_045.phpt

diff --git a/NEWS b/NEWS
index 37daabb18f..4dc7ef7c18 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2013, PHP 5.4.21
 
+- Core:
+  . Fixed bug #65322 (compile time errors won't trigger auto loading). (Nikita)
+
 - CLI server:
   . Fixed bug #65633 (built-in server treat some http headers as
     case-sensitive). (Adam)
diff --git a/Zend/tests/bug65322.phpt b/Zend/tests/bug65322.phpt
new file mode 100644
index 0000000000..aab163d915
--- /dev/null
+++ b/Zend/tests/bug65322.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Bug #65322: compile time errors won't trigger auto loading
+--FILE--
+<?php
+
+spl_autoload_register(function($class) {
+    var_dump($class);
+    class B {}
+});
+
+set_error_handler(function($_, $msg, $file) {
+    var_dump($msg, $file);
+    new B;
+});
+
+eval('class A { function a() {} function __construct() {} }');
+
+?>
+--EXPECTF--
+string(50) "Redefining already defined constructor for class A"
+string(%d) "%s(%d) : eval()'d code"
+string(1) "B"
diff --git a/Zend/tests/errmsg_045.phpt b/Zend/tests/errmsg_045.phpt
new file mode 100644
index 0000000000..b27f67ade4
--- /dev/null
+++ b/Zend/tests/errmsg_045.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Error message in error handler during compilation
+--FILE--
+<?php
+
+set_error_handler(function($_, $msg, $file) {
+	var_dump($msg, $file);
+	echo $undefined;
+});
+
+eval('class A { function a() {} function __construct() {} }');
+
+?>
+--EXPECTF--
+string(50) "Redefining already defined constructor for class A"
+string(%d) "%s(%d) : eval()'d code"
+
+Notice: Undefined variable: undefined in %s on line %d
diff --git a/Zend/zend.c b/Zend/zend.c
index 162922866b..0602c45042 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -1183,7 +1183,7 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */
 			 * such scripts recursivly, but some CG() variables may be
 			 * inconsistent. */
 
-			in_compilation = zend_is_compiling(TSRMLS_C);
+			in_compilation = CG(in_compilation);
 			if (in_compilation) {
 				saved_class_entry = CG(active_class_entry);
 				CG(active_class_entry) = NULL;
@@ -1195,6 +1195,7 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */
 				SAVE_STACK(declare_stack);
 				SAVE_STACK(list_stack);
 				SAVE_STACK(context_stack);
+				CG(in_compilation) = 0;
 			}
 
 			if (call_user_function_ex(CG(function_table), NULL, orig_user_error_handler, &retval, 5, params, 1, NULL TSRMLS_CC) == SUCCESS) {
@@ -1219,6 +1220,7 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */
 				RESTORE_STACK(declare_stack);
 				RESTORE_STACK(list_stack);
 				RESTORE_STACK(context_stack);
+				CG(in_compilation) = 1;
 			}
 
 			if (!EG(user_error_handler)) {
-- 
cgit v1.2.1


From e9e63f922303d852b6899cadd68d7ec73e8f6134 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Mon, 30 Sep 2013 11:23:33 +0200
Subject: fix memleak on resetting rebind_proc

---
 ext/ldap/ldap.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 3cfa2092e7..71d57d6d9b 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -2107,6 +2107,7 @@ PHP_FUNCTION(ldap_set_rebind_proc)
 		/* unregister rebind procedure */
 		if (ld->rebindproc != NULL) {
 			zval_dtor(ld->rebindproc);
+			FREE_ZVAL(ld->rebindproc);
 			ld->rebindproc = NULL;
 			ldap_set_rebind_proc(ld->link, NULL, NULL);
 		}
-- 
cgit v1.2.1


From 2b78edfba25afac8f34ca65e18f98d23a4b8bcce Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Mon, 30 Sep 2013 11:41:35 +0200
Subject: fix test

---
 ext/ldap/tests/ldap_search_variation6.phpt | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/ext/ldap/tests/ldap_search_variation6.phpt b/ext/ldap/tests/ldap_search_variation6.phpt
index a29e4524df..5139ebb77d 100644
--- a/ext/ldap/tests/ldap_search_variation6.phpt
+++ b/ext/ldap/tests/ldap_search_variation6.phpt
@@ -217,14 +217,26 @@ array(2) {
   [1]=>
   resource(%d) of type (ldap result)
 }
-NULL
-NULL
+array(1) {
+  ["count"]=>
+  int(0)
+}
+array(1) {
+  ["count"]=>
+  int(0)
+}
 array(2) {
   [0]=>
   resource(%d) of type (ldap result)
   [1]=>
   resource(%d) of type (ldap result)
 }
-NULL
-NULL
+array(1) {
+  ["count"]=>
+  int(0)
+}
+array(1) {
+  ["count"]=>
+  int(0)
+}
 ===DONE===
-- 
cgit v1.2.1


From 18b04b480ebc41841b2004cc11797eda40fb3958 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Tue, 1 Oct 2013 11:07:55 +0200
Subject: Fixed bug #61548

---
 NEWS                                  |   4 ++
 ext/standard/http_fopen_wrapper.c     |  61 +++++++++---------
 ext/standard/tests/http/bug61548.phpt | 118 ++++++++++++++++++++++++++++++++++
 3 files changed, 153 insertions(+), 30 deletions(-)
 create mode 100644 ext/standard/tests/http/bug61548.phpt

diff --git a/NEWS b/NEWS
index 4dc7ef7c18..9bb60327fa 100644
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,10 @@ PHP                                                                        NEWS
   . Fixed bug #65721 (configure script broken in 5.5.4 and 5.4.20 when enabling
     imap). (ryotakatsuki at gmail dot com)
 
+- Standard:
+  . Fixed bug #61548 (content-type must appear at the end of headers for 201 
+    Location to work in http). (Mike)
+
 19 Sep 2013, PHP 5.4.20
 
 - Core:
diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c
index b8676bbba4..4605e7494f 100644
--- a/ext/standard/http_fopen_wrapper.c
+++ b/ext/standard/http_fopen_wrapper.c
@@ -84,6 +84,30 @@
 #define HTTP_WRAPPER_HEADER_INIT    1
 #define HTTP_WRAPPER_REDIRECTED     2
 
+static inline void strip_header(char *header_bag, char *lc_header_bag,
+		const char *lc_header_name)
+{
+	char *lc_header_start = strstr(lc_header_bag, lc_header_name);
+	char *header_start = header_bag + (lc_header_start - lc_header_bag);
+
+	if (lc_header_start
+	&& (lc_header_start == lc_header_bag || *(lc_header_start-1) == '\n')
+	) {
+		char *lc_eol = strchr(lc_header_start, '\n');
+		char *eol = header_start + (lc_eol - lc_header_start);
+
+		if (lc_eol) {
+			size_t eollen = strlen(lc_eol);
+
+			memmove(lc_header_start, lc_eol+1, eollen);
+			memmove(header_start, eol+1, eollen);
+		} else {
+			*lc_header_start = '\0';
+			*header_start = '\0';
+		}
+	}
+}
+
 php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path, php_stream_context *context, int redirect_max, int flags STREAMS_DC TSRMLS_DC) /* {{{ */
 {
 	php_stream *stream = NULL;
@@ -425,40 +449,17 @@ finish:
 		if (tmp && strlen(tmp) > 0) {
 			char *s;
 
-			if (!header_init) { /* Remove post headers for redirects */
-				int l = strlen(tmp);
-				char *s2, *tmp_c = estrdup(tmp);
-				
-				php_strtolower(tmp_c, l);
-				if ((s = strstr(tmp_c, "content-length:"))) {
-					if ((s2 = memchr(s, '\n', tmp_c + l - s))) {
-						int b = tmp_c + l - 1 - s2;
-						memmove(tmp, tmp + (s2 + 1 - tmp_c), b);
-						memmove(tmp_c, s2 + 1, b);
-						
-					} else {
-						tmp[s - tmp_c] = *s = '\0';
-					}
-					l = strlen(tmp_c);
-				}
-				if ((s = strstr(tmp_c, "content-type:"))) {
-					if ((s2 = memchr(s, '\n', tmp_c + l - s))) {
-						memmove(tmp, tmp + (s2 + 1 - tmp_c), tmp_c + l - 1 - s2);
-					} else {
-						tmp[s - tmp_c] = '\0';
-					}
-				}
-
-				efree(tmp_c);
-				tmp_c = php_trim(tmp, strlen(tmp), NULL, 0, NULL, 3 TSRMLS_CC);
-				efree(tmp);
-				tmp = tmp_c;
-			}
-
 			user_headers = estrdup(tmp);
 
 			/* Make lowercase for easy comparison against 'standard' headers */
 			php_strtolower(tmp, strlen(tmp));
+
+			if (!header_init) {
+				/* strip POST headers on redirect */
+				strip_header(user_headers, tmp, "content-length:");
+				strip_header(user_headers, tmp, "content-type:");
+			}
+
 			if ((s = strstr(tmp, "user-agent:")) && 
 			    (s == tmp || *(s-1) == '\r' || *(s-1) == '\n' || 
 			                 *(s-1) == '\t' || *(s-1) == ' ')) {
diff --git a/ext/standard/tests/http/bug61548.phpt b/ext/standard/tests/http/bug61548.phpt
new file mode 100644
index 0000000000..138b15a338
--- /dev/null
+++ b/ext/standard/tests/http/bug61548.phpt
@@ -0,0 +1,118 @@
+--TEST--
+Bug #61548 (content-type must appear at the end of headers)
+--INI--
+allow_url_fopen=1
+--SKIPIF--
+<?php require 'server.inc'; http_server_skipif('tcp://127.0.0.1:12342'); ?>
+--FILE--
+<?php
+require 'server.inc';
+
+function do_test($header) {
+    $options = [
+        'http' => [
+			'method' => 'POST',
+			'header' => $header,
+            'follow_location' => true,
+        ],
+    ];
+
+    $ctx = stream_context_create($options);
+
+    $responses = [
+		"data://text/plain,HTTP/1.1 201\r\nLocation: /foo\r\n\r\n",
+		"data://text/plain,HTTP/1.1 200\r\nConnection: close\r\n\r\n",
+	];
+    $pid = http_server('tcp://127.0.0.1:12342', $responses, $output);
+
+    $fd = fopen('http://127.0.0.1:12342/', 'rb', false, $ctx);
+    fseek($output, 0, SEEK_SET);
+    echo stream_get_contents($output);
+
+    http_server_kill($pid);
+}
+
+do_test("First:1\nSecond:2\nContent-type: text/plain");
+do_test("First:1\nSecond:2\nContent-type: text/plain\n");
+do_test("First:1\nSecond:2\nContent-type: text/plain\nThird:");
+do_test("First:1\nContent-type:text/plain\nSecond:2");
+do_test("First:1\nContent-type:text/plain\nSecond:2\n");
+do_test("First:1\nContent-type:text/plain\nSecond:2\nThird:");
+
+?>
+Done
+--EXPECT--
+POST / HTTP/1.0
+Host: 127.0.0.1:12342
+First:1
+Second:2
+Content-type: text/plain
+
+GET /foo HTTP/1.0
+Host: 127.0.0.1:12342
+First:1
+Second:2
+
+
+POST / HTTP/1.0
+Host: 127.0.0.1:12342
+First:1
+Second:2
+Content-type: text/plain
+
+GET /foo HTTP/1.0
+Host: 127.0.0.1:12342
+First:1
+Second:2
+
+
+POST / HTTP/1.0
+Host: 127.0.0.1:12342
+First:1
+Second:2
+Content-type: text/plain
+Third:
+
+GET /foo HTTP/1.0
+Host: 127.0.0.1:12342
+First:1
+Second:2
+Third:
+
+POST / HTTP/1.0
+Host: 127.0.0.1:12342
+First:1
+Content-type:text/plain
+Second:2
+
+GET /foo HTTP/1.0
+Host: 127.0.0.1:12342
+First:1
+Second:2
+
+POST / HTTP/1.0
+Host: 127.0.0.1:12342
+First:1
+Content-type:text/plain
+Second:2
+
+GET /foo HTTP/1.0
+Host: 127.0.0.1:12342
+First:1
+Second:2
+
+POST / HTTP/1.0
+Host: 127.0.0.1:12342
+First:1
+Content-type:text/plain
+Second:2
+Third:
+
+GET /foo HTTP/1.0
+Host: 127.0.0.1:12342
+First:1
+Second:2
+Third:
+
+Done
+
-- 
cgit v1.2.1


From cd1cab3f4726751a0476ac8701ce09cc37cb36df Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Tue, 1 Oct 2013 17:01:03 +0200
Subject: fix bug #62396 'make test' crashes starting with 5.3.14 (missing
 gzencode())

---
 NEWS          |  5 +++++
 run-tests.php | 12 +++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 9bb60327fa..b889e66271 100644
--- a/NEWS
+++ b/NEWS
@@ -30,6 +30,11 @@ PHP                                                                        NEWS
   . Fixed bug #61548 (content-type must appear at the end of headers for 201 
     Location to work in http). (Mike)
 
+- Build system:
+  . Fixed bug #62396 ('make test' crashes starting with 5.3.14 (missing 
+    gzencode())). (Mike)
+
+
 19 Sep 2013, PHP 5.4.20
 
 - Core:
diff --git a/run-tests.php b/run-tests.php
index 935f821f4e..317f6077a3 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -455,7 +455,7 @@ $pass_options = '';
 $compression = 0;
 $output_file = $CUR_DIR . '/php_test_results_' . date('Ymd_Hi') . '.txt';
 
-if ($compression) {
+if ($compression && in_array("compress.zlib", stream_get_filters())) {
 	$output_file = 'compress.zlib://' . $output_file . '.gz';
 }
 
@@ -1545,6 +1545,16 @@ TEST $file
 			}
 		}
 	}
+	
+	if (!extension_loaded("zlib")
+	&& (	array_key_exists("GZIP_POST", $section_text) 
+		||	array_key_exists("DEFLATE_POST", $section_text))
+	) {
+		$message = "ext/zlib required";
+		show_result('SKIP', $tested, $tested_file, "reason: $message", $temp_filenames);
+		junit_mark_test_as('SKIP', $shortname, $tested, null, "<![CDATA[\n$message\n]]>");
+		return 'SKIPPED';
+	}
 
 	if (@count($section_text['REDIRECTTEST']) == 1) {
 		$test_files = array();
-- 
cgit v1.2.1


From b2f8f35a889e77c3123ade348907e73bf6d6689e Mon Sep 17 00:00:00 2001
From: Stanislav Malyshev <stas@php.net>
Date: Tue, 1 Oct 2013 22:25:56 -0700
Subject: 5.4.22-dev now

---
 NEWS               | 2 ++
 configure.in       | 2 +-
 main/php_version.h | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index b889e66271..9bef174d37 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? ??? 2013, PHP 5.4.22
+
 ?? ??? 2013, PHP 5.4.21
 
 - Core:
diff --git a/configure.in b/configure.in
index 30de2c3aaa..aa58df613b 100644
--- a/configure.in
+++ b/configure.in
@@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=4
-PHP_RELEASE_VERSION=21
+PHP_RELEASE_VERSION=22
 PHP_EXTRA_VERSION="-dev"
 PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
diff --git a/main/php_version.h b/main/php_version.h
index e30528ed51..3058fef613 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,7 +2,7 @@
 /* edit configure.in to change version number */
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 4
-#define PHP_RELEASE_VERSION 21
+#define PHP_RELEASE_VERSION 22
 #define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.4.21-dev"
-#define PHP_VERSION_ID 50421
+#define PHP_VERSION "5.4.22-dev"
+#define PHP_VERSION_ID 50422
-- 
cgit v1.2.1


From 9209c19f8f7eef807cb457b32d3ab517ff8dc178 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Wed, 2 Oct 2013 15:19:25 +0200
Subject: fix bug #65808 	the socket_connect() won't work with IPv6
 address

---
 NEWS                  |  4 ++++
 ext/sockets/sockets.c | 59 ++++++++++++++++++++++++++++++++++++---------------
 2 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/NEWS b/NEWS
index 9bef174d37..c2086c0791 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2013, PHP 5.4.22
 
+- Sockets:
+  . Fixed bug #65808 (the socket_connect() won't work with IPv6 address).
+    (Mike)
+
 ?? ??? 2013, PHP 5.4.21
 
 - Core:
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index d0d0294647..d094b3cc1d 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -607,6 +607,8 @@ static char *php_strerror(int error TSRMLS_DC) /* {{{ */
 /* }}} */
 
 #if HAVE_IPV6
+static int php_get_if_index_from_string(const char *val, unsigned *out TSRMLS_DC);
+
 /* Sets addr by hostname, or by ip in string form (AF_INET6) */
 static int php_set_inet6_addr(struct sockaddr_in6 *sin6, char *string, php_socket *php_sock TSRMLS_DC) /* {{{ */
 {
@@ -615,6 +617,7 @@ static int php_set_inet6_addr(struct sockaddr_in6 *sin6, char *string, php_socke
 	struct addrinfo hints;
 	struct addrinfo *addrinfo = NULL;
 #endif
+	char *scope = strchr(string, '%');
 
 	if (inet_pton(AF_INET6, string, &tmp)) {
 		memcpy(&(sin6->sin6_addr.s6_addr), &(tmp.s6_addr), sizeof(struct in6_addr));
@@ -649,6 +652,22 @@ static int php_set_inet6_addr(struct sockaddr_in6 *sin6, char *string, php_socke
 
 	}
 
+	if (scope++) {
+		long lval = 0;
+		double dval = 0;
+		unsigned scope_id = 0;
+
+		if (IS_LONG == is_numeric_string(scope, strlen(scope), &lval, &dval, 0)) {
+			if (lval > 0 && lval <= UINT_MAX) {
+				scope_id = lval;
+			}
+		} else {
+			php_get_if_index_from_string(scope, &scope_id TSRMLS_CC);
+		}
+
+		sin6->sin6_scope_id = scope_id;
+	}
+
 	return 1;
 }
 /* }}} */
@@ -714,6 +733,28 @@ static int php_set_inet46_addr(php_sockaddr_storage *ss, socklen_t *ss_len, char
 	return 0;
 }
 
+static int php_get_if_index_from_string(const char *val, unsigned *out TSRMLS_DC)
+{
+#if HAVE_IF_NAMETOINDEX
+	unsigned int ind;
+
+	ind = if_nametoindex(val);
+	if (ind == 0) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING,
+			"no interface with name \"%s\" could be found", val);
+		return FAILURE;
+	} else {
+		*out = ind;
+		return SUCCESS;
+	}
+#else
+	php_error_docref(NULL TSRMLS_CC, E_WARNING,
+			"this platform does not support looking up an interface by "
+			"name, an integer interface index must be supplied instead");
+	return FAILURE;
+#endif
+}
+
 static int php_get_if_index_from_zval(zval *val, unsigned *out TSRMLS_DC)
 {
 	int ret;
@@ -729,26 +770,10 @@ static int php_get_if_index_from_zval(zval *val, unsigned *out TSRMLS_DC)
 			ret = SUCCESS;
 		}
 	} else {
-#if HAVE_IF_NAMETOINDEX
-		unsigned int ind;
 		zval_add_ref(&val);
 		convert_to_string_ex(&val);
-		ind = if_nametoindex(Z_STRVAL_P(val));
-		if (ind == 0) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING,
-				"no interface with name \"%s\" could be found", Z_STRVAL_P(val));
-			ret = FAILURE;
-		} else {
-			*out = ind;
-			ret = SUCCESS;
-		}
+		ret = php_get_if_index_from_string(Z_STRVAL_P(val), out TSRMLS_CC);
 		zval_ptr_dtor(&val);
-#else
-		php_error_docref(NULL TSRMLS_CC, E_WARNING,
-				"this platform does not support looking up an interface by "
-				"name, an integer interface index must be supplied instead");
-		ret = FAILURE;
-#endif
 	}
 
 	return ret;
-- 
cgit v1.2.1


From fc3f8a8f54d8b3c864125bf32028d4550882839c Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Thu, 3 Oct 2013 13:28:41 +0200
Subject: fix bug #59613 (Crash with clone XMLReader)

---
 NEWS                              |  4 ++++
 ext/xmlreader/php_xmlreader.c     |  1 +
 ext/xmlreader/tests/bug51963.phpt | 22 ++++++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 ext/xmlreader/tests/bug51963.phpt

diff --git a/NEWS b/NEWS
index c2086c0791..c6961bd24f 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,10 @@ PHP                                                                        NEWS
   . Fixed bug #65808 (the socket_connect() won't work with IPv6 address).
     (Mike)
 
+- XMLReader:
+  . Fixed bug #59613 (Crash with clone XMLReader). (Mike)
+
+
 ?? ??? 2013, PHP 5.4.21
 
 - Core:
diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c
index f4c2643212..8b80320097 100644
--- a/ext/xmlreader/php_xmlreader.c
+++ b/ext/xmlreader/php_xmlreader.c
@@ -1320,6 +1320,7 @@ PHP_MINIT_FUNCTION(xmlreader)
 	xmlreader_object_handlers.read_property = xmlreader_read_property;
 	xmlreader_object_handlers.write_property = xmlreader_write_property;
 	xmlreader_object_handlers.get_property_ptr_ptr = xmlreader_get_property_ptr_ptr;
+	xmlreader_object_handlers.clone_obj = NULL;
 
 	INIT_CLASS_ENTRY(ce, "XMLReader", xmlreader_functions);
 	ce.create_object = xmlreader_objects_new;
diff --git a/ext/xmlreader/tests/bug51963.phpt b/ext/xmlreader/tests/bug51963.phpt
new file mode 100644
index 0000000000..af47f9750b
--- /dev/null
+++ b/ext/xmlreader/tests/bug51963.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Bug #59613 (Crash with clone XMLReader)
+--SKIPIF--
+<?php
+extension_loaded("xmlreader") or die("skip requires xmlreader");
+?>
+--FILE--
+<?php
+echo "Test\n";
+
+$xmlreader = new XMLReader();
+$xmlreader->xml("<a><b/></a>");
+
+$xmlreader->next();
+$xmlreader2 = clone $xmlreader;
+$xmlreader2->next();
+?>
+Done
+--EXPECTF--
+Test
+
+Fatal error: Trying to clone an uncloneable object of class XMLReader in %s on line %d
-- 
cgit v1.2.1


From dc3d360a0ff8c17cb2ce2030813d30b578249be9 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Thu, 3 Oct 2013 13:34:31 +0200
Subject: typo: really fix bug #51936 	Crash with clone xmlreader

---
 NEWS                              |  2 +-
 ext/xmlreader/tests/bug51936.phpt | 22 ++++++++++++++++++++++
 ext/xmlreader/tests/bug51963.phpt | 22 ----------------------
 3 files changed, 23 insertions(+), 23 deletions(-)
 create mode 100644 ext/xmlreader/tests/bug51936.phpt
 delete mode 100644 ext/xmlreader/tests/bug51963.phpt

diff --git a/NEWS b/NEWS
index c6961bd24f..ffde3012f9 100644
--- a/NEWS
+++ b/NEWS
@@ -7,7 +7,7 @@ PHP                                                                        NEWS
     (Mike)
 
 - XMLReader:
-  . Fixed bug #59613 (Crash with clone XMLReader). (Mike)
+  . Fixed bug #51936 (Crash with clone XMLReader). (Mike)
 
 
 ?? ??? 2013, PHP 5.4.21
diff --git a/ext/xmlreader/tests/bug51936.phpt b/ext/xmlreader/tests/bug51936.phpt
new file mode 100644
index 0000000000..4b5f1012e7
--- /dev/null
+++ b/ext/xmlreader/tests/bug51936.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Bug #51936 (Crash with clone XMLReader)
+--SKIPIF--
+<?php
+extension_loaded("xmlreader") or die("skip requires xmlreader");
+?>
+--FILE--
+<?php
+echo "Test\n";
+
+$xmlreader = new XMLReader();
+$xmlreader->xml("<a><b/></a>");
+
+$xmlreader->next();
+$xmlreader2 = clone $xmlreader;
+$xmlreader2->next();
+?>
+Done
+--EXPECTF--
+Test
+
+Fatal error: Trying to clone an uncloneable object of class XMLReader in %s on line %d
diff --git a/ext/xmlreader/tests/bug51963.phpt b/ext/xmlreader/tests/bug51963.phpt
deleted file mode 100644
index af47f9750b..0000000000
--- a/ext/xmlreader/tests/bug51963.phpt
+++ /dev/null
@@ -1,22 +0,0 @@
---TEST--
-Bug #59613 (Crash with clone XMLReader)
---SKIPIF--
-<?php
-extension_loaded("xmlreader") or die("skip requires xmlreader");
-?>
---FILE--
-<?php
-echo "Test\n";
-
-$xmlreader = new XMLReader();
-$xmlreader->xml("<a><b/></a>");
-
-$xmlreader->next();
-$xmlreader2 = clone $xmlreader;
-$xmlreader2->next();
-?>
-Done
---EXPECTF--
-Test
-
-Fatal error: Trying to clone an uncloneable object of class XMLReader in %s on line %d
-- 
cgit v1.2.1


From f6ff3a28d60c24dea2a05344d9b7eb823f09b4e5 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Fri, 4 Oct 2013 11:22:17 +0200
Subject: Fixed bug #64230 (XMLReader does not suppress errors)

---
 NEWS                              |  1 +
 ext/xmlreader/php_xmlreader.c     |  2 --
 ext/xmlreader/tests/bug64230.phpt | 50 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 ext/xmlreader/tests/bug64230.phpt

diff --git a/NEWS b/NEWS
index ffde3012f9..9963714679 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ PHP                                                                        NEWS
 
 - XMLReader:
   . Fixed bug #51936 (Crash with clone XMLReader). (Mike)
+  . Fixed bug #64230 (XMLReader does not suppress errors). (Mike)
 
 
 ?? ??? 2013, PHP 5.4.21
diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c
index 8b80320097..adf282120e 100644
--- a/ext/xmlreader/php_xmlreader.c
+++ b/ext/xmlreader/php_xmlreader.c
@@ -805,7 +805,6 @@ PHP_METHOD(xmlreader, read)
 	if (intern != NULL && intern->ptr != NULL) {
 		retval = xmlTextReaderRead(intern->ptr);
 		if (retval == -1) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occurred while reading");
 			RETURN_FALSE;
 		} else {
 			RETURN_BOOL(retval);
@@ -847,7 +846,6 @@ PHP_METHOD(xmlreader, next)
 			retval = xmlTextReaderNext(intern->ptr); 
 		}
 		if (retval == -1) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "An Error Occurred while reading");
 			RETURN_FALSE;
 		} else {
 			RETURN_BOOL(retval);
diff --git a/ext/xmlreader/tests/bug64230.phpt b/ext/xmlreader/tests/bug64230.phpt
new file mode 100644
index 0000000000..0b070925f3
--- /dev/null
+++ b/ext/xmlreader/tests/bug64230.phpt
@@ -0,0 +1,50 @@
+--TEST--
+Bug #64230 (XMLReader does not suppress errors)
+--SKIPIF--
+<?php
+extension_loaded("xmlreader") or die("skip requires xmlreader");
+?>
+--FILE--
+<?php
+echo "Test\n";
+
+function show_internal_errors() {
+	foreach (libxml_get_errors() as $error) {
+		printf("Internal: %s\n", $error->message);
+	}
+	libxml_clear_errors();
+}
+
+echo "Internal errors TRUE\n";
+libxml_use_internal_errors(true);
+
+$x = new XMLReader;
+$x->xml("<root att/>");
+$x->read();
+
+show_internal_errors();
+
+echo "Internal errors FALSE\n";
+libxml_use_internal_errors(false);
+
+$x = new XMLReader;
+$x->xml("<root att/>");
+$x->read();
+
+show_internal_errors();
+
+?>
+Done
+--EXPECTF--
+Test
+Internal errors TRUE
+Internal: Specification mandate value for attribute att
+
+Internal errors FALSE
+
+Warning: XMLReader::read(): %s: parser error : Specification mandate value for attribute att in %s on line %d
+
+Warning: XMLReader::read(): <root att/> in %s on line %d
+
+Warning: XMLReader::read():          ^ in %s on line %d
+Done
-- 
cgit v1.2.1


From e8ae795529eff83482797dff0d1a1de7f0a84c8d Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Fri, 4 Oct 2013 16:11:49 +0200
Subject: such a weird hack probably helps in finding regressions in the future

---
 ext/standard/tests/serialize/bug65806.phpt | 83 ++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 ext/standard/tests/serialize/bug65806.phpt

diff --git a/ext/standard/tests/serialize/bug65806.phpt b/ext/standard/tests/serialize/bug65806.phpt
new file mode 100644
index 0000000000..19fab95c64
--- /dev/null
+++ b/ext/standard/tests/serialize/bug65806.phpt
@@ -0,0 +1,83 @@
+--TEST--
+Bug #65806 (unserialize fails with object which is referenced multiple times)
+--FILE--
+<?php
+class myObjA {}
+class myObjB {
+    public $attrA;
+    public $attrB;
+}
+class myObjC {
+    public $attrC;
+    public $attrD;
+}
+class myList {
+    private $_serialized;
+    private $_obj;
+
+    public function __construct($obj)
+    {
+        $this->_obj = $obj;
+        $this->_serialized = serialize($this->_obj);
+    }
+    public function get()
+    {
+        return $this->_obj;
+    }
+    public function __sleep()
+    {
+        $this->_serialized = serialize($this->_obj);
+        return array(
+            "\0" . __CLASS__ . "\0_serialized",
+        );
+    }
+    public function __wakeup()
+    {
+		$this->_obj = unserialize($this->_serialized);
+	}
+}
+
+echo "SCRIPT START" . PHP_EOL;
+
+$objA = new myObjA();
+$objB = new myObjB();
+$objC = new myObjC();
+
+$objB->attrA = new ArrayIterator();
+$objB->attrB = $objA;
+
+$objC->attrC = $objB;
+$objC->attrD = $objA;
+
+$list = new myList($objC);
+
+echo 'check ' . check($list->get()) . PHP_EOL;
+
+echo "start serialize/unserialize" . PHP_EOL;
+$newList = unserialize(serialize($list));
+echo "finish serialize/unserialize" . PHP_EOL;
+
+//after unserialize the property myObjC::attrD is null instead of expected object
+echo 'check ' . check($newList->get()) . PHP_EOL;
+
+echo "SCRIPT END" . PHP_EOL ;
+
+function check(myObjC $obj) {
+
+    if (!is_object($obj->attrC)) {
+        return 'failed (myObjC::attrC => ' . var_export($obj->attrC, true) . ')';
+    }
+    if (!is_object($obj->attrD)) {
+        return 'failed (myObjC::attrD => ' . var_export($obj->attrD, true) . ')';
+    }
+    return 'successful';
+}
+?>
+--EXPECT--
+SCRIPT START
+check successful
+start serialize/unserialize
+finish serialize/unserialize
+check successful
+SCRIPT END
+
-- 
cgit v1.2.1


From 8973390541faaadfdfc0f838421f037060188e5e Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Fri, 4 Oct 2013 16:16:15 +0200
Subject: fix bug #64146 (serialize incorrectly saving objects when they are
 cloned)

---
 ext/standard/tests/serialize/bug64146.phpt | 60 ++++++++++++++++++++++++++++++
 ext/standard/var.c                         |  6 +--
 2 files changed, 62 insertions(+), 4 deletions(-)
 create mode 100644 ext/standard/tests/serialize/bug64146.phpt

diff --git a/ext/standard/tests/serialize/bug64146.phpt b/ext/standard/tests/serialize/bug64146.phpt
new file mode 100644
index 0000000000..18ae78d0ce
--- /dev/null
+++ b/ext/standard/tests/serialize/bug64146.phpt
@@ -0,0 +1,60 @@
+--TEST--
+Bug #64146 (serialize incorrectly saving objects when they are cloned)
+--FILE--
+<?php
+
+echo "Test\n";
+
+class A
+{
+    public $a = array();
+
+    public function __construct()
+    {
+        $this->a[] = new B(1);
+        $this->a[] = new B(2);
+    }
+}
+
+class B implements Serializable
+{
+    public $b;
+
+    public function __construct($c)
+    {
+        $this->b = new C($c);
+    }
+
+    public function serialize()
+    {
+        return serialize(clone $this->b);
+    }
+
+    public function unserialize($data)
+    {
+        $this->b = unserialize($data);
+    }
+}
+
+class C
+{
+    public $c;
+
+    public function __construct($c)
+    {
+        $this->c = $c;
+    }
+}
+
+$a = unserialize(serialize(new A()));
+
+print $a->a[0]->b->c . "\n";
+print $a->a[1]->b->c . "\n";
+
+?>
+Done
+--EXPECT--
+Test
+1
+2
+Done
diff --git a/ext/standard/var.c b/ext/standard/var.c
index f76a14cfa6..f71c4a4fdc 100644
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -549,11 +549,9 @@ static inline int php_add_var_hash(HashTable *var_hash, zval *var, void *var_old
 	char id[32], *p;
 	register int len;
 
-	/* relies on "(long)" being a perfect hash function for data pointers,
-	 * however the actual identity of an object has had to be determined
-	 * by its object handle since 5.0. */
 	if ((Z_TYPE_P(var) == IS_OBJECT) && Z_OBJ_HT_P(var)->get_class_entry) {
-		p = smart_str_print_long(id + sizeof(id) - 1, (long) Z_OBJ_HANDLE_P(var));
+		p = smart_str_print_long(id + sizeof(id) - 1,
+				(long) zend_objects_get_address(var TSRMLS_CC));
 		*(--p) = 'O';
 		len = id + sizeof(id) - 1 - p;
 	} else {
-- 
cgit v1.2.1


From 96cc419924c38874f9e2f2e5ccf3cd0430d90f43 Mon Sep 17 00:00:00 2001
From: Philip Hofstetter <phofstetter@sensational.ch>
Date: Wed, 2 Oct 2013 08:35:02 +0200
Subject: Fix bug #65667: ftp_nb_continue produces segfault

the idea behind ftp_nb_get is for it to be followed by multiple calls
to ftp_nb_continue in order to download a file piece-by-piece.

As such, it's unwise to close the stream used to write the downloaded
data to when the file hasn't been completely downloaded within the first
call to ftp_nb_get.

This regression was added in a93a462dcefd62e07963dd2da506fbb3409c88b5
and this patch restores the behavior that was seen pre-patch.
---
 NEWS                               |   3 +
 ext/ftp/php_ftp.c                  |   4 +-
 ext/ftp/tests/ftp_nb_continue.phpt | 182 +++++++++++++++++++++++++++++++++++++
 ext/ftp/tests/server.inc           |   7 ++
 4 files changed, 195 insertions(+), 1 deletion(-)
 create mode 100644 ext/ftp/tests/ftp_nb_continue.phpt

diff --git a/NEWS b/NEWS
index 9963714679..7a7cecacda 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2013, PHP 5.4.22
 
+- FTP:
+  . Fixed bug #65667 (ftp_nb_continue produces segfault). (Philip Hofstetter)
+
 - Sockets:
   . Fixed bug #65808 (the socket_connect() won't work with IPv6 address).
     (Mike)
diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c
index da22e0b63e..21e13ea460 100644
--- a/ext/ftp/php_ftp.c
+++ b/ext/ftp/php_ftp.c
@@ -968,7 +968,9 @@ PHP_FUNCTION(ftp_nb_get)
 		RETURN_LONG(PHP_FTP_FAILED);
 	}
 
-        php_stream_close(outstream);
+	if (ret == PHP_FTP_FINISHED){
+		php_stream_close(outstream);
+	}
 
 	RETURN_LONG(ret);
 }
diff --git a/ext/ftp/tests/ftp_nb_continue.phpt b/ext/ftp/tests/ftp_nb_continue.phpt
new file mode 100644
index 0000000000..1f70339913
--- /dev/null
+++ b/ext/ftp/tests/ftp_nb_continue.phpt
@@ -0,0 +1,182 @@
+--TEST--
+Testing whether ftp_nb_continue() fetches more data
+--SKIPIF--
+<?php
+require 'skipif.inc';
+?>
+--FILE--
+<?php
+require 'server.inc';
+
+$file = "mediumfile.txt";
+
+$ftp = ftp_connect('127.0.0.1', $port);
+ftp_login($ftp, 'user', 'pass');
+if (!$ftp) die("Couldn't connect to the server");
+
+$local_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . $file;
+touch($local_file);
+
+$r = ftp_nb_get($ftp, $local_file, $file, FTP_BINARY);
+while ($r == FTP_MOREDATA) {
+    $r = ftp_nb_continue($ftp);
+}
+ftp_close($ftp);
+
+echo file_get_contents($local_file);
+?>
+--CLEAN--
+<?php
+@unlink(dirname(__FILE__) . DIRECTORY_SEPARATOR . "mediumfile.txt");
+?>
+--EXPECT--
+This is line 0 of the test data.
+This is line 1 of the test data.
+This is line 2 of the test data.
+This is line 3 of the test data.
+This is line 4 of the test data.
+This is line 5 of the test data.
+This is line 6 of the test data.
+This is line 7 of the test data.
+This is line 8 of the test data.
+This is line 9 of the test data.
+This is line 10 of the test data.
+This is line 11 of the test data.
+This is line 12 of the test data.
+This is line 13 of the test data.
+This is line 14 of the test data.
+This is line 15 of the test data.
+This is line 16 of the test data.
+This is line 17 of the test data.
+This is line 18 of the test data.
+This is line 19 of the test data.
+This is line 20 of the test data.
+This is line 21 of the test data.
+This is line 22 of the test data.
+This is line 23 of the test data.
+This is line 24 of the test data.
+This is line 25 of the test data.
+This is line 26 of the test data.
+This is line 27 of the test data.
+This is line 28 of the test data.
+This is line 29 of the test data.
+This is line 30 of the test data.
+This is line 31 of the test data.
+This is line 32 of the test data.
+This is line 33 of the test data.
+This is line 34 of the test data.
+This is line 35 of the test data.
+This is line 36 of the test data.
+This is line 37 of the test data.
+This is line 38 of the test data.
+This is line 39 of the test data.
+This is line 40 of the test data.
+This is line 41 of the test data.
+This is line 42 of the test data.
+This is line 43 of the test data.
+This is line 44 of the test data.
+This is line 45 of the test data.
+This is line 46 of the test data.
+This is line 47 of the test data.
+This is line 48 of the test data.
+This is line 49 of the test data.
+This is line 50 of the test data.
+This is line 51 of the test data.
+This is line 52 of the test data.
+This is line 53 of the test data.
+This is line 54 of the test data.
+This is line 55 of the test data.
+This is line 56 of the test data.
+This is line 57 of the test data.
+This is line 58 of the test data.
+This is line 59 of the test data.
+This is line 60 of the test data.
+This is line 61 of the test data.
+This is line 62 of the test data.
+This is line 63 of the test data.
+This is line 64 of the test data.
+This is line 65 of the test data.
+This is line 66 of the test data.
+This is line 67 of the test data.
+This is line 68 of the test data.
+This is line 69 of the test data.
+This is line 70 of the test data.
+This is line 71 of the test data.
+This is line 72 of the test data.
+This is line 73 of the test data.
+This is line 74 of the test data.
+This is line 75 of the test data.
+This is line 76 of the test data.
+This is line 77 of the test data.
+This is line 78 of the test data.
+This is line 79 of the test data.
+This is line 80 of the test data.
+This is line 81 of the test data.
+This is line 82 of the test data.
+This is line 83 of the test data.
+This is line 84 of the test data.
+This is line 85 of the test data.
+This is line 86 of the test data.
+This is line 87 of the test data.
+This is line 88 of the test data.
+This is line 89 of the test data.
+This is line 90 of the test data.
+This is line 91 of the test data.
+This is line 92 of the test data.
+This is line 93 of the test data.
+This is line 94 of the test data.
+This is line 95 of the test data.
+This is line 96 of the test data.
+This is line 97 of the test data.
+This is line 98 of the test data.
+This is line 99 of the test data.
+This is line 100 of the test data.
+This is line 101 of the test data.
+This is line 102 of the test data.
+This is line 103 of the test data.
+This is line 104 of the test data.
+This is line 105 of the test data.
+This is line 106 of the test data.
+This is line 107 of the test data.
+This is line 108 of the test data.
+This is line 109 of the test data.
+This is line 110 of the test data.
+This is line 111 of the test data.
+This is line 112 of the test data.
+This is line 113 of the test data.
+This is line 114 of the test data.
+This is line 115 of the test data.
+This is line 116 of the test data.
+This is line 117 of the test data.
+This is line 118 of the test data.
+This is line 119 of the test data.
+This is line 120 of the test data.
+This is line 121 of the test data.
+This is line 122 of the test data.
+This is line 123 of the test data.
+This is line 124 of the test data.
+This is line 125 of the test data.
+This is line 126 of the test data.
+This is line 127 of the test data.
+This is line 128 of the test data.
+This is line 129 of the test data.
+This is line 130 of the test data.
+This is line 131 of the test data.
+This is line 132 of the test data.
+This is line 133 of the test data.
+This is line 134 of the test data.
+This is line 135 of the test data.
+This is line 136 of the test data.
+This is line 137 of the test data.
+This is line 138 of the test data.
+This is line 139 of the test data.
+This is line 140 of the test data.
+This is line 141 of the test data.
+This is line 142 of the test data.
+This is line 143 of the test data.
+This is line 144 of the test data.
+This is line 145 of the test data.
+This is line 146 of the test data.
+This is line 147 of the test data.
+This is line 148 of the test data.
+This is line 149 of the test data.
diff --git a/ext/ftp/tests/server.inc b/ext/ftp/tests/server.inc
index 7dc8fa08d9..bb0c1ff10b 100644
--- a/ext/ftp/tests/server.inc
+++ b/ext/ftp/tests/server.inc
@@ -368,6 +368,13 @@ if ($pid) {
                                         }
 					fputs($s, "226 Closing data Connection.\r\n");
                                         break;
+                case "mediumfile":
+					fputs($s, "150 File status okay; about to open data connection.\r\n");
+					for($i = 0; $i < 150; $i++){
+						fputs($fs, "This is line $i of the test data.\n");
+					}
+					fputs($s, "226 Closing data Connection.\r\n");
+
 				default:
 					fputs($s, "550 {$matches[1]}: No such file or directory \r\n");
 					break;
-- 
cgit v1.2.1


From 248afd1c3c0c923c15d7544b4a588396ad0c136e Mon Sep 17 00:00:00 2001
From: Felipe Pena <felipensp@gmail.com>
Date: Sat, 5 Oct 2013 12:52:32 -0300
Subject: - BFN

---
 NEWS | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/NEWS b/NEWS
index 7a7cecacda..fcf34c3fb9 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2013, PHP 5.4.22
 
+- CLI server:
+  . Fixed bug #65818 (Segfault with built-in webserver and chunked transfer 
+    encoding). (Felipe)
+
 - FTP:
   . Fixed bug #65667 (ftp_nb_continue produces segfault). (Philip Hofstetter)
 
-- 
cgit v1.2.1


From 3aaee86ee33af276d2e879f5a645cc6dc850de22 Mon Sep 17 00:00:00 2001
From: Felipe Pena <felipensp@gmail.com>
Date: Sat, 5 Oct 2013 12:52:55 -0300
Subject: - Fixed bug #65818 (Segfault with built-in webserver and chunked
 transfer encoding)

---
 sapi/cli/php_cli_server.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index 4da55acc6c..aa4b2cd622 100644
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -1589,6 +1589,7 @@ static int php_cli_server_client_read_request_on_body(php_http_parser *parser, c
 		}
 		client->request.content_len = 0;
 	}
+	client->request.content = perealloc(client->request.content, client->request.content_len + length, 1);
 	memmove(client->request.content + client->request.content_len, at, length);
 	client->request.content_len += length;
 	return 0;
-- 
cgit v1.2.1


From 690bbe170d9ed4597629e4e986575fbe0a2cb796 Mon Sep 17 00:00:00 2001
From: Stanley Sufficool <ssufficool@php.net>
Date: Sat, 5 Oct 2013 09:54:45 -0700
Subject: FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92
 FreeTDS <0.92 does not support DBSETLDBNAME option and therefore will not
 work with SQL Azure. Fallback to dbuse command in letter versions.

---
 ext/pdo_dblib/dblib_driver.c | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/ext/pdo_dblib/dblib_driver.c b/ext/pdo_dblib/dblib_driver.c
index 2aaf3975db..13444b89c3 100644
--- a/ext/pdo_dblib/dblib_driver.c
+++ b/ext/pdo_dblib/dblib_driver.c
@@ -350,9 +350,10 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
 
 	DBSETLAPP(H->login, vars[1].optval);
 
+/* DBSETLDBNAME is only available in FreeTDS 0.92 or above */
 #ifdef DBSETLDBNAME
 	if (vars[3].optval) {
-		DBSETLDBNAME(H->login, vars[3].optval);
+		if(FAIL == DBSETLDBNAME(H->login, vars[3].optval)) goto cleanup;
 	}
 #endif
 
@@ -362,6 +363,16 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
 		goto cleanup;
 	}
 
+/*
+ * FreeTDS < 0.92 does not support the DBSETLDBNAME option
+ * Send use database here after login (Will not work with SQL Azure)
+ */
+#ifndef DBSETLDBNAME
+	if (vars[3].optval) {
+		if(FAIL == dbuse(H->link, vars[3].optval)) goto gleanup;
+	}
+#endif
+
 #if PHP_DBLIB_IS_MSSQL
 	/* dblib do not return more than this length from text/image */
 	DBSETOPT(H->link, DBTEXTLIMIT, "2147483647");
@@ -377,23 +388,6 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
 	dbh->max_escaped_char_length = 2;
 	dbh->alloc_own_columns = 1;
 
-#if 0
-	/* Cache the supported data types from the servers systypes table */
-	if(dbcmd(H->link, "select usertype, name from systypes order by usertype") != FAIL) {
-		if(dbsqlexec(H->link) != FAIL) {
-			dbresults(H->link);
-			while (dbnextrow(H->link) == SUCCESS) {
-				val = dbdata(H->link, 1);					
-				add_index_string(pdo_dblib_datatypes, *val, dbdata(H->link, 2), 1);
-			}
-		}
-		/* Throw out any remaining resultsets */
-		dbcancel(H-link);
-	}
-#endif
-	
-
-
 cleanup:
 	for (i = 0; i < nvars; i++) {
 		if (vars[i].freeme) {
-- 
cgit v1.2.1


From 63f242178d33fa22346d2e976b06a76455dbd6ab Mon Sep 17 00:00:00 2001
From: Stanley Sufficool <ssufficool@php.net>
Date: Sat, 5 Oct 2013 20:59:20 -0700
Subject: FIX BUG #65219 - Typo correction

---
 ext/pdo_dblib/dblib_driver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/pdo_dblib/dblib_driver.c b/ext/pdo_dblib/dblib_driver.c
index 13444b89c3..daf5494d58 100644
--- a/ext/pdo_dblib/dblib_driver.c
+++ b/ext/pdo_dblib/dblib_driver.c
@@ -369,7 +369,7 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
  */
 #ifndef DBSETLDBNAME
 	if (vars[3].optval) {
-		if(FAIL == dbuse(H->link, vars[3].optval)) goto gleanup;
+		if(FAIL == dbuse(H->link, vars[3].optval)) goto cleanup;
 	}
 #endif
 
-- 
cgit v1.2.1


From b5a0f128718d93a236b450bb9b409477f0a97888 Mon Sep 17 00:00:00 2001
From: ArunSK <arunsk.tec@gmail.com>
Date: Mon, 7 Oct 2013 00:26:49 +0200
Subject: fixing a minor typo in CODING_STANDARDS document

---
 CODING_STANDARDS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CODING_STANDARDS b/CODING_STANDARDS
index 7413be453c..5ceacdc4dc 100644
--- a/CODING_STANDARDS
+++ b/CODING_STANDARDS
@@ -151,7 +151,7 @@ Naming Conventions
 
 7.  Classes should be given descriptive names. Avoid using abbreviations where
     possible. Each word in the class name should start with a capital letter,
-    without underscore delimiters (CampelCaps starting with a capital letter).
+    without underscore delimiters (CamelCaps starting with a capital letter).
     The class name should be prefixed with the name of the 'parent set' (e.g.
     the name of the extension)::
 
-- 
cgit v1.2.1


From b026993a74f452c5f6a689124b4ad4d7b3ac2491 Mon Sep 17 00:00:00 2001
From: Daniel Lowrey <rdlowrey@gmail.com>
Date: Mon, 7 Oct 2013 15:02:48 -0400
Subject: Fixed segfault when built with OpenSSL >= 1.0.1

(PR #481)
---
 ext/openssl/openssl.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index f1dfa5024a..a2cdfb5c16 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -4613,9 +4613,6 @@ SSL *php_SSL_new_from_context(SSL_CTX *ctx, php_stream *stream TSRMLS_DC) /* {{{
 
 	GET_VER_OPT_STRING("local_cert", certfile);
 	if (certfile) {
-		X509 *cert = NULL;
-		EVP_PKEY *key = NULL;
-		SSL *tmpssl;
 		char resolved_path_buff[MAXPATHLEN];
 		const char * private_key = NULL;
 
@@ -4642,7 +4639,11 @@ SSL *php_SSL_new_from_context(SSL_CTX *ctx, php_stream *stream TSRMLS_DC) /* {{{
 				}
 			}
 
-			tmpssl = SSL_new(ctx);
+#if OPENSSL_VERSION_NUMBER < 0x10001001L
+			/* Unnecessary as of OpenSSLv1.0.1 (will segfault if used with >= 10001001 ) */
+			X509 *cert = NULL;
+			EVP_PKEY *key = NULL;
+			SSL *tmpssl = SSL_new(ctx);
 			cert = SSL_get_certificate(tmpssl);
 
 			if (cert) {
@@ -4651,7 +4652,7 @@ SSL *php_SSL_new_from_context(SSL_CTX *ctx, php_stream *stream TSRMLS_DC) /* {{{
 				EVP_PKEY_free(key);
 			}
 			SSL_free(tmpssl);
-
+#endif
 			if (!SSL_CTX_check_private_key(ctx)) {
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Private key does not match certificate!");
 			}
-- 
cgit v1.2.1


From 22700890d4c332b76866c73a5a68c76f601257a6 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Wed, 9 Oct 2013 12:30:31 +0200
Subject: C89 compatibility

---
 ext/openssl/openssl.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index a2cdfb5c16..26792e2428 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -4640,18 +4640,20 @@ SSL *php_SSL_new_from_context(SSL_CTX *ctx, php_stream *stream TSRMLS_DC) /* {{{
 			}
 
 #if OPENSSL_VERSION_NUMBER < 0x10001001L
-			/* Unnecessary as of OpenSSLv1.0.1 (will segfault if used with >= 10001001 ) */
-			X509 *cert = NULL;
-			EVP_PKEY *key = NULL;
-			SSL *tmpssl = SSL_new(ctx);
-			cert = SSL_get_certificate(tmpssl);
-
-			if (cert) {
-				key = X509_get_pubkey(cert);
-				EVP_PKEY_copy_parameters(key, SSL_get_privatekey(tmpssl));
-				EVP_PKEY_free(key);
-			}
-			SSL_free(tmpssl);
+			do {
+				/* Unnecessary as of OpenSSLv1.0.1 (will segfault if used with >= 10001001 ) */
+				X509 *cert = NULL;
+				EVP_PKEY *key = NULL;
+				SSL *tmpssl = SSL_new(ctx);
+				cert = SSL_get_certificate(tmpssl);
+
+				if (cert) {
+					key = X509_get_pubkey(cert);
+					EVP_PKEY_copy_parameters(key, SSL_get_privatekey(tmpssl));
+					EVP_PKEY_free(key);
+				}
+				SSL_free(tmpssl);
+			} while (0);
 #endif
 			if (!SSL_CTX_check_private_key(ctx)) {
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Private key does not match certificate!");
-- 
cgit v1.2.1


From 960b4e81f316528fc554ec1bff7daf46faa7129f Mon Sep 17 00:00:00 2001
From: Felipe Pena <felipensp@gmail.com>
Date: Sat, 12 Oct 2013 18:06:20 -0300
Subject: - Fixed possible memory leak

---
 win32/readdir.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/win32/readdir.c b/win32/readdir.c
index 9525fc0d6b..0edd5764d4 100644
--- a/win32/readdir.c
+++ b/win32/readdir.c
@@ -45,6 +45,7 @@ DIR *opendir(const char *dir)
 
 	dp = (DIR *) malloc(sizeof(DIR));
 	if (dp == NULL) {
+		free(filespec);
 		return NULL;
 	}
 	dp->offset = 0;
-- 
cgit v1.2.1


From 7a038ccbe61c88b007a3a3ba1580185058792e91 Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Mon, 14 Oct 2013 14:18:43 +0200
Subject: fixed skeleton to produce the normalized ext version macros

See http://news.php.net/php.pecl.dev/11191 for more info.
---
 ext/skeleton/php_skeleton.h | 2 ++
 ext/skeleton/skeleton.c     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ext/skeleton/php_skeleton.h b/ext/skeleton/php_skeleton.h
index 495907bbd1..0716ae05e6 100644
--- a/ext/skeleton/php_skeleton.h
+++ b/ext/skeleton/php_skeleton.h
@@ -6,6 +6,8 @@
 extern zend_module_entry extname_module_entry;
 #define phpext_extname_ptr &extname_module_entry
 
+#define PHP_EXTNAME_VERSION "0.1.0" /* Replace with version number for your extension */
+
 #ifdef PHP_WIN32
 #	define PHP_EXTNAME_API __declspec(dllexport)
 #elif defined(__GNUC__) && __GNUC__ >= 4
diff --git a/ext/skeleton/skeleton.c b/ext/skeleton/skeleton.c
index ee4ea74e16..2e373442d8 100644
--- a/ext/skeleton/skeleton.c
+++ b/ext/skeleton/skeleton.c
@@ -41,7 +41,7 @@ zend_module_entry extname_module_entry = {
 	PHP_RSHUTDOWN(extname),	/* Replace with NULL if there's nothing to do at request end */
 	PHP_MINFO(extname),
 #if ZEND_MODULE_API_NO >= 20010901
-	"0.1", /* Replace with version number for your extension */
+	PHP_EXTNAME_VERSION,
 #endif
 	STANDARD_MODULE_PROPERTIES
 };
-- 
cgit v1.2.1


From 9ccde8a41571282521c677edf2b481a526ae03c9 Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Mon, 14 Oct 2013 16:07:26 +0200
Subject: added notes about the PECL site conformity

---
 README.EXTENSIONS                |  2 +-
 README.EXT_SKEL                  |  5 +++++
 README.SELF-CONTAINED-EXTENSIONS | 15 +++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/README.EXTENSIONS b/README.EXTENSIONS
index 51e3b730e7..7f06c0fb1b 100644
--- a/README.EXTENSIONS
+++ b/README.EXTENSIONS
@@ -30,7 +30,7 @@ zend_module_entry foo_module_entry = {
     PHP_RSHUTDOWN(foo),   /* per-request shutdown function */
     PHP_MINFO(foo),       /* information function */
 #if ZEND_MODULE_API_NO >= 20010901
-    FOO_VERSION,          /* extension version number (string) */
+    PHP_FOO_VERSION,          /* extension version number (string) */
 #endif
     STANDARD_MODULE_PROPERTIES
 };
diff --git a/README.EXT_SKEL b/README.EXT_SKEL
index b0db843a42..d44fcc5c6a 100644
--- a/README.EXT_SKEL
+++ b/README.EXT_SKEL
@@ -31,6 +31,11 @@ HOW TO USE IT
 
     ./buildconf; ./configure --enable-module_name; make
 
+  The definition of PHP_MODULE_NAME_VERSION will be present in the
+  php_module_name.h and injected into the zend_module_entry definition. This
+  is required by the PECL website for the version string conformity checks
+  against package.xml
+
   But if you already have planned the overall scheme of your module, what
   functions it will contain, their return types and the arguments they take
   (a very good idea) and don't want to bother yourself with creating function
diff --git a/README.SELF-CONTAINED-EXTENSIONS b/README.SELF-CONTAINED-EXTENSIONS
index e6a375331b..5287230e1a 100644
--- a/README.SELF-CONTAINED-EXTENSIONS
+++ b/README.SELF-CONTAINED-EXTENSIONS
@@ -153,3 +153,18 @@ ADDING SHARED MODULE SUPPORT TO A MODULE
         #ifdef COMPILE_DL_FOO
         ZEND_GET_MODULE(foo)
         #endif
+
+PECL SITE CONFORMITY
+
+  If you plan to release an extension to the PECL website, there are several
+  points to be regarded.
+
+ 1. Add LICENSE or COPYING to the package.xml
+
+ 2. The following should be defined in one of the extension header files
+
+        #define PHP_FOO_VERSION "1.2.3"
+
+    This macros has to be used within your foo_module_entry to indicate the
+    extension version.
+
-- 
cgit v1.2.1


From b0a36007abb522b6b1e3a6b3108eb726053b9d72 Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Mon, 14 Oct 2013 17:12:32 +0200
Subject: fix whitespaces

---
 README.EXTENSIONS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.EXTENSIONS b/README.EXTENSIONS
index 7f06c0fb1b..06d6cdd85f 100644
--- a/README.EXTENSIONS
+++ b/README.EXTENSIONS
@@ -30,7 +30,7 @@ zend_module_entry foo_module_entry = {
     PHP_RSHUTDOWN(foo),   /* per-request shutdown function */
     PHP_MINFO(foo),       /* information function */
 #if ZEND_MODULE_API_NO >= 20010901
-    PHP_FOO_VERSION,          /* extension version number (string) */
+    PHP_FOO_VERSION,      /* extension version number (string) */
 #endif
     STANDARD_MODULE_PROPERTIES
 };
-- 
cgit v1.2.1