Merge updates from trunk.

author: Joe Mistachkin <joe@mistachkin.com> 2015-05-17 19:49:44 (GMT)
committer: Joe Mistachkin <joe@mistachkin.com> 2015-05-17 19:49:44 (GMT)
commit: 2c15b241eada4c3508f40bc48287bfc3617bbd76 (patch)
tree: 2905f9e58003ed85727b6c497ff9b87b5b09d37b
parent: 797f5c18a178ccf6347e2f64c565216353e9e255 (diff)
parent: 25217a3ed35a8e8d7a9b5fd1c79a84ffbca0164b (diff)
download: tcl-2c15b241eada4c3508f40bc48287bfc3617bbd76.zip
tcl-2c15b241eada4c3508f40bc48287bfc3617bbd76.tar.gz
tcl-2c15b241eada4c3508f40bc48287bfc3617bbd76.tar.bz2
35 files changed, 1690 insertions, 1255 deletions
diff --git a/doc/next.n b/doc/next.n
index 7dacac2..1ea6eb9 100644
--- a/doc/next.n
+++ b/doc/next.n
@@ -96,9 +96,11 @@ forward to the proper implementation of the method (which it does by invoking
 the \fBnext\fR command as filters are inserted into the front of the method
 call chain) and is responsible for returning the result of \fBnext\fR.
 .PP
-Filters are not invoked when processing an invocation of the \fBunknown\fR
-method because of a failure to locate a method implementation, or when
-invoking either constructors or destructors.
+Filters are invoked when processing an invokation of the \fBunknown\fR
+method because of a failure to locate a method implementation, but \fInot\fR
+when invoking either constructors or destructors. (Note however that the
+\fBdestroy\fR method is a conventional method, and filters are invoked as
+normal when it is called.)
 .SH EXAMPLES
 .PP
 This example demonstrates how to use the \fBnext\fR command to call the
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 179ca17..a7ef199 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -2334,7 +2334,7 @@ UtfToUtfProc(
 
 	    *dst++ = *src++;
 	} else if (pureNullMode == 1 && UCHAR(*src) == 0xc0 &&
-		UCHAR(*(src+1)) == 0x80) {
+		(src + 1 < srcEnd) && UCHAR(*(src+1)) == 0x80) {
 	    /*
 	     * Convert 0xc080 to real nulls when we are in output mode.
 	     */
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index f2f475a..43c2b08 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -4946,6 +4946,7 @@ TEBCresume(
 	pc += pcAdjustment;
 	TEBC_YIELD();
 
+	TclPushTailcallPoint(interp);
 	oPtr = contextPtr->oPtr;
 	if (oPtr->flags & FILTER_HANDLING) {
 	    TclNRAddCallback(interp, FinalizeOONextFilter,
diff --git a/generic/tclIO.c b/generic/tclIO.c
index c4757ea..b97f57a 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -421,7 +421,11 @@ ChanRead(
      * Each read op must set the blocked and eof states anew, not let
      * the effect of prior reads leak through.
      */
+    if (GotFlag(chanPtr->state, CHANNEL_EOF)) {
+        chanPtr->state->inputEncodingFlags |= TCL_ENCODING_START;
+    }
     ResetFlag(chanPtr->state, CHANNEL_BLOCKED | CHANNEL_EOF);
+    chanPtr->state->inputEncodingFlags &= ~TCL_ENCODING_END;
     if (WillRead(chanPtr) < 0) {
         return -1;
     }
@@ -430,7 +434,11 @@ ChanRead(
 	    dst, dstSize, &result);
 
     /* Stop any flag leakage through stacked channel levels */
+    if (GotFlag(chanPtr->state, CHANNEL_EOF)) {
+        chanPtr->state->inputEncodingFlags |= TCL_ENCODING_START;
+    }
     ResetFlag(chanPtr->state, CHANNEL_BLOCKED | CHANNEL_EOF);
+    chanPtr->state->inputEncodingFlags &= ~TCL_ENCODING_END;
     if (bytesRead > 0) {
 	/*
 	 * If we get a short read, signal up that we may be BLOCKED.
@@ -2649,6 +2657,8 @@ FlushChannel(
      * the post-condition that on a successful return to caller we've
      * left space in the current output buffer for more writing (the flush
      * call was to make new room).
+     * If the channel is blocking, then yes, so we guarantee that 
+     * blocking flushes actually flush all pending data.
      * Otherwise, no.  Keep the current output buffer where it is so more
      * can be written to it, possibly filling it, to promote more efficient
      * buffer usage.
@@ -2656,7 +2666,8 @@ FlushChannel(
 
     bufPtr = statePtr->curOutPtr;
     if (bufPtr && BytesLeft(bufPtr) && /* Keep empties off queue */
-	    (statePtr->outQueueHead == NULL || IsBufferFull(bufPtr))) {
+	    (statePtr->outQueueHead == NULL || IsBufferFull(bufPtr)
+		    || !GotFlag(statePtr, CHANNEL_NONBLOCKING))) {
 	if (statePtr->outQueueHead == NULL) {
 	    statePtr->outQueueHead = bufPtr;
 	} else {
@@ -5739,7 +5750,11 @@ DoReadChars(
 
     /* Special handling for zero-char read request. */
     if (toRead == 0) {
+	if (GotFlag(statePtr, CHANNEL_EOF)) {
+	    statePtr->inputEncodingFlags |= TCL_ENCODING_START;
+	}
 	ResetFlag(statePtr, CHANNEL_BLOCKED|CHANNEL_EOF);
+	statePtr->inputEncodingFlags &= ~TCL_ENCODING_END;
 	UpdateInterest(chanPtr);
 	return 0;
     }
@@ -5752,7 +5767,11 @@ DoReadChars(
     TclChannelPreserve((Tcl_Channel)chanPtr);
 
     /* Must clear the BLOCKED|EOF flags here since we check before reading */
+    if (GotFlag(statePtr, CHANNEL_EOF)) {
+	statePtr->inputEncodingFlags |= TCL_ENCODING_START;
+    }
     ResetFlag(statePtr, CHANNEL_BLOCKED|CHANNEL_EOF);
+    statePtr->inputEncodingFlags &= ~TCL_ENCODING_END;
     for (copied = 0; (unsigned) toRead > 0; ) {
 	copiedNow = -1;
 	if (statePtr->inQueueHead != NULL) {
@@ -6004,12 +6023,24 @@ ReadChars(
 	/*
 	 * Perform the encoding transformation.  Read no more than
 	 * srcLen bytes, write no more than dstLimit bytes.
+	 *
+	 * Some trickiness with encoding flags here.  We do not want
+	 * the end of a buffer to be treated as the end of all input
+	 * when the presence of bytes in a next buffer are already
+	 * known to exist.  This is checked with an assert() because
+	 * so far no test case causing the assertion to be false has
+	 * been created.  The normal operations of channel reading
+	 * appear to cause EOF and TCL_ENCODING_END setting to appear
+	 * only in situations where there are no further bytes in
+	 * any buffers.
 	 */
 
+	assert(bufPtr->nextPtr == NULL || BytesLeft(bufPtr->nextPtr) == 0
+		|| (statePtr->inputEncodingFlags & TCL_ENCODING_END) == 0);
+
 	code = Tcl_ExternalToUtf(NULL, encoding, src, srcLen,
-		flags & (bufPtr->nextPtr ? ~0 : ~TCL_ENCODING_END),
-		&statePtr->inputEncodingState, dst, dstLimit, &srcRead,
-		&dstDecoded, &numChars);
+		flags, &statePtr->inputEncodingState,
+		dst, dstLimit, &srcRead, &dstDecoded, &numChars);
 
 	/*
 	 * Perform the translation transformation in place.  Read no more
@@ -6126,9 +6157,12 @@ ReadChars(
 		statePtr->inputEncodingFlags = savedIEFlags;
 		statePtr->inputEncodingState = savedState;
 
+		assert(bufPtr->nextPtr == NULL
+			|| BytesLeft(bufPtr->nextPtr) == 0 || 0 ==
+			(statePtr->inputEncodingFlags & TCL_ENCODING_END));
+
 		Tcl_ExternalToUtf(NULL, encoding, src, srcLen,
-		(statePtr->inputEncodingFlags | TCL_ENCODING_NO_TERMINATE)
-		& (bufPtr->nextPtr ? ~0 : ~TCL_ENCODING_END),
+		(statePtr->inputEncodingFlags | TCL_ENCODING_NO_TERMINATE),
 		&statePtr->inputEncodingState, buffer, TCL_UTF_MAX + 1,
 		&read, &decoded, &count);
 
@@ -6503,9 +6537,13 @@ Tcl_Ungets(
     /*
      * Clear the EOF flags, and clear the BLOCKED bit.
      */
-
+ 
+    if (GotFlag(statePtr, CHANNEL_EOF)) {
+	statePtr->inputEncodingFlags |= TCL_ENCODING_START;
+    }
     ResetFlag(statePtr,
 	    CHANNEL_BLOCKED | CHANNEL_STICKY_EOF | CHANNEL_EOF | INPUT_SAW_CR);
+    statePtr->inputEncodingFlags &= ~TCL_ENCODING_END;
 
     bufPtr = AllocChannelBuffer(len);
     memcpy(InsertPoint(bufPtr), str, (size_t) len);
@@ -6875,8 +6913,12 @@ Tcl_Seek(
      * point. Also clear CR related flags.
      */
 
+    if (GotFlag(statePtr, CHANNEL_EOF)) {
+	statePtr->inputEncodingFlags |= TCL_ENCODING_START;
+    }
     ResetFlag(statePtr, CHANNEL_EOF | CHANNEL_STICKY_EOF | CHANNEL_BLOCKED |
 	    INPUT_SAW_CR);
+    statePtr->inputEncodingFlags &= ~TCL_ENCODING_END;
 
     /*
      * If the channel is in asynchronous output mode, switch it back to
@@ -7970,7 +8012,11 @@ Tcl_SetChannelOption(
 	 * ahead'. Ditto for blocked.
 	 */
 
+	if (GotFlag(statePtr, CHANNEL_EOF)) {
+	    statePtr->inputEncodingFlags |= TCL_ENCODING_START;
+	}
 	ResetFlag(statePtr, CHANNEL_EOF|CHANNEL_STICKY_EOF|CHANNEL_BLOCKED);
+	statePtr->inputEncodingFlags &= ~TCL_ENCODING_END;
 	return TCL_OK;
     } else if (HaveOpt(1, "-translation")) {
 	const char *readMode, *writeMode;
@@ -9666,7 +9712,11 @@ DoRead(
 
     /* Special handling for zero-char read request. */
     if (bytesToRead == 0) {
+	if (GotFlag(statePtr, CHANNEL_EOF)) {
+	    statePtr->inputEncodingFlags |= TCL_ENCODING_START;
+	}
 	ResetFlag(statePtr, CHANNEL_BLOCKED|CHANNEL_EOF);
+	statePtr->inputEncodingFlags &= ~TCL_ENCODING_END;
 	UpdateInterest(chanPtr);
 	return 0;
     }
diff --git a/generic/tclInt.h b/generic/tclInt.h
index bcf2355..51d153b 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -4118,7 +4118,8 @@ MODULE_SCOPE void	TclpFreeAllocCache(void *);
 	AllocCache *cachePtr;						\
 	if (((interp) == NULL) ||					\
 		((cachePtr = ((Interp *)(interp))->allocCache),		\
-			(cachePtr->numObjects >= ALLOC_NOBJHIGH))) {	\
+			((cachePtr->numObjects == 0) ||			\
+			(cachePtr->numObjects >= ALLOC_NOBJHIGH)))) {	\
 	    TclThreadFreeObj(objPtr);					\
 	} else {							\
 	    (objPtr)->internalRep.twoPtrValue.ptr1 = cachePtr->firstObjPtr; \
diff --git a/generic/tclOO.c b/generic/tclOO.c
index 77e668b..e2ef1ae 100644
--- a/generic/tclOO.c
+++ b/generic/tclOO.c
@@ -1675,10 +1675,13 @@ Tcl_NewObjectInstance(
 
 		/*
 		 * Take care to not delete a deleted object; that would be
-		 * bad. [Bug 2903011]
+		 * bad. [Bug 2903011] Also take care to make sure that we have
+		 * the name of the command before we delete it. [Bug
+		 * 9dd1bd7a74]
 		 */
 
 		if (!Deleted(oPtr)) {
+		    (void) TclOOObjectName(interp, oPtr);
 		    Tcl_DeleteCommandFromToken(interp, oPtr->command);
 		}
 		return NULL;
@@ -1821,10 +1824,12 @@ FinalizeAlloc(
 
 	/*
 	 * Take care to not delete a deleted object; that would be bad. [Bug
-	 * 2903011]
+	 * 2903011] Also take care to make sure that we have the name of the
+	 * command before we delete it. [Bug 9dd1bd7a74]
 	 */
 
 	if (!Deleted(oPtr)) {
+	    (void) TclOOObjectName(interp, oPtr);
 	    Tcl_DeleteCommandFromToken(interp, oPtr->command);
 	}
 	DelRef(oPtr);
diff --git a/generic/tclThreadAlloc.c b/generic/tclThreadAlloc.c
index 560556d..3267a0d 100644
--- a/generic/tclThreadAlloc.c
+++ b/generic/tclThreadAlloc.c
@@ -84,6 +84,7 @@ typedef union Block {
 
 typedef struct Bucket {
     Block *firstPtr;		/* First block available */
+    Block *lastPtr;		/* End of block list */
     long numFree;		/* Number of blocks available */
 
     /* All fields below for accounting only */
@@ -107,6 +108,7 @@ typedef struct Cache {
     Tcl_ThreadId owner;		/* Which thread's cache is this? */
     Tcl_Obj *firstObjPtr;	/* List of free objects for thread */
     int numObjects;		/* Number of objects for thread */
+    Tcl_Obj *lastPtr;		/* Last object in this cache */
     int totalAssigned;		/* Total space assigned to thread */
     Bucket buckets[NBUCKETS];	/* The buckets for this thread */
 } Cache;
@@ -135,6 +137,7 @@ static int	GetBlocks(Cache *cachePtr, int bucket);
 static Block *	Ptr2Block(char *ptr);
 static char *	Block2Ptr(Block *blockPtr, int bucket, unsigned int reqSize);
 static void	MoveObjs(Cache *fromPtr, Cache *toPtr, int numMove);
+static void	PutObjs(Cache *fromPtr, int numMove);
 
 /*
  * Local variables defined in this file and initialized at startup.
@@ -271,9 +274,7 @@ TclFreeAllocCache(
      */
 
     if (cachePtr->numObjects > 0) {
-	Tcl_MutexLock(objLockPtr);
-	MoveObjs(cachePtr, sharedPtr, cachePtr->numObjects);
-	Tcl_MutexUnlock(objLockPtr);
+	PutObjs(cachePtr, cachePtr->numObjects);
     }
 
     /*
@@ -415,6 +416,9 @@ TclpFree(
     cachePtr->buckets[bucket].totalAssigned -= blockPtr->blockReqSize;
     blockPtr->nextBlock = cachePtr->buckets[bucket].firstPtr;
     cachePtr->buckets[bucket].firstPtr = blockPtr;
+    if (cachePtr->buckets[bucket].numFree == 0) {
+	cachePtr->buckets[bucket].lastPtr = blockPtr;
+    }
     cachePtr->buckets[bucket].numFree++;
     cachePtr->buckets[bucket].numInserts++;
 
@@ -572,11 +576,13 @@ TclThreadAllocObj(void)
 	    if (newObjsPtr == NULL) {
 		Tcl_Panic("alloc: could not allocate %d new objects", numMove);
 	    }
+	    cachePtr->lastPtr = newObjsPtr + numMove - 1;
+	    objPtr = cachePtr->firstObjPtr;	/* NULL */
 	    while (--numMove >= 0) {
-		objPtr = &newObjsPtr[numMove];
-		objPtr->internalRep.twoPtrValue.ptr1 = cachePtr->firstObjPtr;
-		cachePtr->firstObjPtr = objPtr;
+		newObjsPtr[numMove].internalRep.twoPtrValue.ptr1 = objPtr;
+		objPtr = newObjsPtr + numMove;
 	    }
+	    cachePtr->firstObjPtr = newObjsPtr;
 	}
     }
 
@@ -624,6 +630,9 @@ TclThreadFreeObj(
 
     objPtr->internalRep.twoPtrValue.ptr1 = cachePtr->firstObjPtr;
     cachePtr->firstObjPtr = objPtr;
+    if (cachePtr->numObjects == 0) {
+	cachePtr->lastPtr = objPtr;
+    }
     cachePtr->numObjects++;
 
     /*
@@ -632,9 +641,7 @@ TclThreadFreeObj(
      */
 
     if (cachePtr->numObjects > NOBJHIGH) {
-	Tcl_MutexLock(objLockPtr);
-	MoveObjs(cachePtr, sharedPtr, NOBJALLOC);
-	Tcl_MutexUnlock(objLockPtr);
+	PutObjs(cachePtr, NOBJALLOC);
     }
 }
 
@@ -732,13 +739,67 @@ MoveObjs(
      * just have to update the first and last.
      */
 
-    objPtr->internalRep.twoPtrValue.ptr1 = toPtr->firstObjPtr;
+    toPtr->lastPtr = objPtr;
+    objPtr->internalRep.twoPtrValue.ptr1 = toPtr->firstObjPtr; /* NULL */
     toPtr->firstObjPtr = fromFirstObjPtr;
 }
 
 /*
  *----------------------------------------------------------------------
  *
+ * PutObjs --
+ *
+ *	Move Tcl_Obj's from thread cache to shared cache.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static void
+PutObjs(
+    Cache *fromPtr,
+    int numMove)
+{
+    int keep = fromPtr->numObjects - numMove;
+    Tcl_Obj *firstPtr, *lastPtr = NULL;
+
+    fromPtr->numObjects = keep;
+    firstPtr = fromPtr->firstObjPtr;
+    if (keep == 0) {
+	fromPtr->firstObjPtr = NULL;
+    } else {
+	do {
+	    lastPtr = firstPtr;
+	    firstPtr = firstPtr->internalRep.twoPtrValue.ptr1;
+	} while (--keep > 0);
+	lastPtr->internalRep.twoPtrValue.ptr1 = NULL;
+    }
+
+    /*
+     * Move all objects as a block - they are already linked to each other, we
+     * just have to update the first and last.
+     */
+
+    Tcl_MutexLock(objLockPtr);
+    fromPtr->lastPtr->internalRep.twoPtrValue.ptr1 = sharedPtr->firstObjPtr;
+    sharedPtr->firstObjPtr = firstPtr;
+    if (sharedPtr->numObjects == 0) {
+	sharedPtr->lastPtr = fromPtr->lastPtr;
+    }
+    sharedPtr->numObjects += numMove;
+    Tcl_MutexUnlock(objLockPtr);
+
+    fromPtr->lastPtr = lastPtr;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
  * Block2Ptr, Ptr2Block --
  *
  *	Convert between internal blocks and user pointers.
@@ -848,20 +909,25 @@ PutBlocks(
     int bucket,
     int numMove)
 {
-    register Block *lastPtr, *firstPtr;
-    register int n = numMove;
-
     /*
-     * Before acquiring the lock, walk the block list to find the last block
-     * to be moved.
+     * We have numFree.  Want to shed numMove. So compute how many
+     * Blocks to keep.
      */
 
-    firstPtr = lastPtr = cachePtr->buckets[bucket].firstPtr;
-    while (--n > 0) {
-	lastPtr = lastPtr->nextBlock;
+    int keep = cachePtr->buckets[bucket].numFree - numMove;
+    Block *lastPtr = NULL, *firstPtr;
+
+    cachePtr->buckets[bucket].numFree = keep;
+    firstPtr = cachePtr->buckets[bucket].firstPtr;
+    if (keep == 0) {
+	cachePtr->buckets[bucket].firstPtr = NULL;
+    } else {
+	do {
+	    lastPtr = firstPtr;
+	    firstPtr = firstPtr->nextBlock;
+	} while (--keep > 0);
+	lastPtr->nextBlock = NULL;
     }
-    cachePtr->buckets[bucket].firstPtr = lastPtr->nextBlock;
-    cachePtr->buckets[bucket].numFree -= numMove;
 
     /*
      * Aquire the lock and place the list of blocks at the front of the shared
@@ -869,10 +935,17 @@ PutBlocks(
      */
 
     LockBucket(cachePtr, bucket);
-    lastPtr->nextBlock = sharedPtr->buckets[bucket].firstPtr;
+    cachePtr->buckets[bucket].lastPtr->nextBlock
+	    = sharedPtr->buckets[bucket].firstPtr;
     sharedPtr->buckets[bucket].firstPtr = firstPtr;
+    if (sharedPtr->buckets[bucket].numFree == 0) {
+	sharedPtr->buckets[bucket].lastPtr
+		= cachePtr->buckets[bucket].lastPtr;
+    }
     sharedPtr->buckets[bucket].numFree += numMove;
     UnlockBucket(cachePtr, bucket);
+
+    cachePtr->buckets[bucket].lastPtr = lastPtr;
 }
 
 /*
@@ -919,6 +992,8 @@ GetBlocks(
 	    if (n >= sharedPtr->buckets[bucket].numFree) {
 		cachePtr->buckets[bucket].firstPtr =
 			sharedPtr->buckets[bucket].firstPtr;
+		cachePtr->buckets[bucket].lastPtr =
+			sharedPtr->buckets[bucket].lastPtr;
 		cachePtr->buckets[bucket].numFree =
 			sharedPtr->buckets[bucket].numFree;
 		sharedPtr->buckets[bucket].firstPtr = NULL;
@@ -932,6 +1007,7 @@ GetBlocks(
 		    blockPtr = blockPtr->nextBlock;
 		}
 		sharedPtr->buckets[bucket].firstPtr = blockPtr->nextBlock;
+		cachePtr->buckets[bucket].lastPtr = blockPtr;
 		blockPtr->nextBlock = NULL;
 	    }
 	}
@@ -983,6 +1059,7 @@ GetBlocks(
 		((char *) blockPtr + bucketInfo[bucket].blockSize);
 	    blockPtr = blockPtr->nextBlock;
 	}
+	cachePtr->buckets[bucket].lastPtr = blockPtr;
 	blockPtr->nextBlock = NULL;
     }
     return 1;
diff --git a/library/http/http.tcl b/library/http/http.tcl
index a6b2bfd..751ca13 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -11,7 +11,7 @@
 package require Tcl 8.6
 # Keep this in sync with pkgIndex.tcl and with the install directories in
 # Makefiles
-package provide http 2.8.8
+package provide http 2.8.9
 
 namespace eval http {
     # Allow resourcing to not clobber existing data
@@ -739,7 +739,7 @@ proc http::Connected { token proto phost srvurl} {
 	    }
 	}
         if {!$accept_encoding_seen && ![info exists state(-handler)]} {
-	    puts $sock "Accept-Encoding: deflate,gzip,compress"
+	    puts $sock "Accept-Encoding: gzip,deflate,compress"
         }
 	if {$isQueryChannel && $state(querylength) == 0} {
 	    # Try to determine size of data in channel. If we cannot seek, the
@@ -1299,7 +1299,7 @@ proc http::Eof {token {force 0}} {
 		set state(body) [zlib $coding $state(body)]
 	    }
 	} err]} {
-	    Log "error doing $coding '$state(body)'"
+	    Log "error doing decompression: $err"
 	    return [Finish $token $err]
 	}
 
diff --git a/library/http/pkgIndex.tcl b/library/http/pkgIndex.tcl
index 27ba795..6e0301a 100644
--- a/library/http/pkgIndex.tcl
+++ b/library/http/pkgIndex.tcl
@@ -1,2 +1,2 @@
 if {![package vsatisfies [package provide Tcl] 8.6]} {return}
-package ifneeded http 2.8.8 [list tclPkgSetup $dir http 2.8.8 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister ::http::mapReply}}}]
+package ifneeded http 2.8.9 [list tclPkgSetup $dir http 2.8.9 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister ::http::mapReply}}}]
diff --git a/library/tzdata/Africa/Cairo b/library/tzdata/Africa/Cairo
index f453da2..aaeec54 100644
--- a/library/tzdata/Africa/Cairo
+++ b/library/tzdata/Africa/Cairo
@@ -129,184 +129,4 @@ set TZData(:Africa/Cairo) {
     {1403816400 7200 0 EET}
     {1406844000 10800 1 EEST}
     {1411678800 7200 0 EET}
-    {1429826400 10800 1 EEST}
-    {1434056400 7200 0 EET}
-    {1437688800 10800 1 EEST}
-    {1443128400 7200 0 EET}
-    {1461880800 10800 1 EEST}
-    {1464901200 7200 0 EET}
-    {1467928800 10800 1 EEST}
-    {1475182800 7200 0 EET}
-    {1493330400 10800 1 EEST}
-    {1495746000 7200 0 EET}
-    {1498773600 10800 1 EEST}
-    {1506632400 7200 0 EET}
-    {1524780000 10800 1 EEST}
-    {1525986000 7200 0 EET}
-    {1529013600 10800 1 EEST}
-    {1538082000 7200 0 EET}
-    {1556229600 10800 1 EEST}
-    {1556830800 7200 0 EET}
-    {1559858400 10800 1 EEST}
-    {1569531600 7200 0 EET}
-    {1590703200 10800 1 EEST}
-    {1600981200 7200 0 EET}
-    {1620943200 10800 1 EEST}
-    {1633035600 7200 0 EET}
-    {1651788000 10800 1 EEST}
-    {1664485200 7200 0 EET}
-    {1682632800 10800 1 EEST}
-    {1695934800 7200 0 EET}
-    {1714082400 10800 1 EEST}
-    {1727384400 7200 0 EET}
-    {1745532000 10800 1 EEST}
-    {1758834000 7200 0 EET}
-    {1776981600 10800 1 EEST}
-    {1790283600 7200 0 EET}
-    {1809036000 10800 1 EEST}
-    {1822338000 7200 0 EET}
-    {1840485600 10800 1 EEST}
-    {1853787600 7200 0 EET}
-    {1871935200 10800 1 EEST}
-    {1885237200 7200 0 EET}
-    {1903384800 10800 1 EEST}
-    {1916686800 7200 0 EET}
-    {1934834400 10800 1 EEST}
-    {1948136400 7200 0 EET}
-    {1966888800 10800 1 EEST}
-    {1980190800 7200 0 EET}
-    {1998338400 10800 1 EEST}
-    {2011640400 7200 0 EET}
-    {2029788000 10800 1 EEST}
-    {2043090000 7200 0 EET}
-    {2061237600 10800 1 EEST}
-    {2074539600 7200 0 EET}
-    {2092687200 10800 1 EEST}
-    {2105989200 7200 0 EET}
-    {2124136800 10800 1 EEST}
-    {2137438800 7200 0 EET}
-    {2156191200 10800 1 EEST}
-    {2169493200 7200 0 EET}
-    {2187640800 10800 1 EEST}
-    {2200942800 7200 0 EET}
-    {2219090400 10800 1 EEST}
-    {2232392400 7200 0 EET}
-    {2250540000 10800 1 EEST}
-    {2263842000 7200 0 EET}
-    {2281989600 10800 1 EEST}
-    {2295291600 7200 0 EET}
-    {2313439200 10800 1 EEST}
-    {2326741200 7200 0 EET}
-    {2345493600 10800 1 EEST}
-    {2358795600 7200 0 EET}
-    {2376943200 10800 1 EEST}
-    {2390245200 7200 0 EET}
-    {2408392800 10800 1 EEST}
-    {2421694800 7200 0 EET}
-    {2439842400 10800 1 EEST}
-    {2453144400 7200 0 EET}
-    {2471292000 10800 1 EEST}
-    {2484594000 7200 0 EET}
-    {2503346400 10800 1 EEST}
-    {2516648400 7200 0 EET}
-    {2534796000 10800 1 EEST}
-    {2548098000 7200 0 EET}
-    {2566245600 10800 1 EEST}
-    {2579547600 7200 0 EET}
-    {2597695200 10800 1 EEST}
-    {2610997200 7200 0 EET}
-    {2629144800 10800 1 EEST}
-    {2642446800 7200 0 EET}
-    {2660594400 10800 1 EEST}
-    {2673896400 7200 0 EET}
-    {2692648800 10800 1 EEST}
-    {2705950800 7200 0 EET}
-    {2724098400 10800 1 EEST}
-    {2737400400 7200 0 EET}
-    {2755548000 10800 1 EEST}
-    {2768850000 7200 0 EET}
-    {2786997600 10800 1 EEST}
-    {2800299600 7200 0 EET}
-    {2818447200 10800 1 EEST}
-    {2831749200 7200 0 EET}
-    {2850501600 10800 1 EEST}
-    {2863803600 7200 0 EET}
-    {2881951200 10800 1 EEST}
-    {2895253200 7200 0 EET}
-    {2913400800 10800 1 EEST}
-    {2926702800 7200 0 EET}
-    {2944850400 10800 1 EEST}
-    {2958152400 7200 0 EET}
-    {2976300000 10800 1 EEST}
-    {2989602000 7200 0 EET}
-    {3007749600 10800 1 EEST}
-    {3021051600 7200 0 EET}
-    {3039804000 10800 1 EEST}
-    {3053106000 7200 0 EET}
-    {3071253600 10800 1 EEST}
-    {3084555600 7200 0 EET}
-    {3102703200 10800 1 EEST}
-    {3116005200 7200 0 EET}
-    {3134152800 10800 1 EEST}
-    {3147454800 7200 0 EET}
-    {3165602400 10800 1 EEST}
-    {3178904400 7200 0 EET}
-    {3197052000 10800 1 EEST}
-    {3210354000 7200 0 EET}
-    {3229106400 10800 1 EEST}
-    {3242408400 7200 0 EET}
-    {3260556000 10800 1 EEST}
-    {3273858000 7200 0 EET}
-    {3292005600 10800 1 EEST}
-    {3305307600 7200 0 EET}
-    {3323455200 10800 1 EEST}
-    {3336757200 7200 0 EET}
-    {3354904800 10800 1 EEST}
-    {3368206800 7200 0 EET}
-    {3386959200 10800 1 EEST}
-    {3400261200 7200 0 EET}
-    {3418408800 10800 1 EEST}
-    {3431710800 7200 0 EET}
-    {3449858400 10800 1 EEST}
-    {3463160400 7200 0 EET}
-    {3481308000 10800 1 EEST}
-    {3494610000 7200 0 EET}
-    {3512757600 10800 1 EEST}
-    {3526059600 7200 0 EET}
-    {3544207200 10800 1 EEST}
-    {3557509200 7200 0 EET}
-    {3576261600 10800 1 EEST}
-    {3589563600 7200 0 EET}
-    {3607711200 10800 1 EEST}
-    {3621013200 7200 0 EET}
-    {3639160800 10800 1 EEST}
-    {3652462800 7200 0 EET}
-    {3670610400 10800 1 EEST}
-    {3683912400 7200 0 EET}
-    {3702060000 10800 1 EEST}
-    {3715362000 7200 0 EET}
-    {3734114400 10800 1 EEST}
-    {3747416400 7200 0 EET}
-    {3765564000 10800 1 EEST}
-    {3778866000 7200 0 EET}
-    {3797013600 10800 1 EEST}
-    {3810315600 7200 0 EET}
-    {3828463200 10800 1 EEST}
-    {3841765200 7200 0 EET}
-    {3859912800 10800 1 EEST}
-    {3873214800 7200 0 EET}
-    {3891362400 10800 1 EEST}
-    {3904664400 7200 0 EET}
-    {3923416800 10800 1 EEST}
-    {3936718800 7200 0 EET}
-    {3954866400 10800 1 EEST}
-    {3968168400 7200 0 EET}
-    {3986316000 10800 1 EEST}
-    {3999618000 7200 0 EET}
-    {4017765600 10800 1 EEST}
-    {4031067600 7200 0 EET}
-    {4049215200 10800 1 EEST}
-    {4062517200 7200 0 EET}
-    {4080664800 10800 1 EEST}
-    {4093966800 7200 0 EET}
 }
diff --git a/library/tzdata/America/Adak b/library/tzdata/America/Adak
index f3c5e5c..bd5d5ab 100644
--- a/library/tzdata/America/Adak
+++ b/library/tzdata/America/Adak
@@ -40,237 +40,237 @@ set TZData(:America/Adak) {
     {388587600 -36000 1 BDT}
     {404913600 -39600 0 BST}
     {420037200 -36000 1 BDT}
-    {439034400 -36000 0 HAST}
-    {452088000 -32400 1 HADT}
-    {467809200 -36000 0 HAST}
-    {483537600 -32400 1 HADT}
-    {499258800 -36000 0 HAST}
-    {514987200 -32400 1 HADT}
-    {530708400 -36000 0 HAST}
-    {544622400 -32400 1 HADT}
-    {562158000 -36000 0 HAST}
-    {576072000 -32400 1 HADT}
-    {594212400 -36000 0 HAST}
-    {607521600 -32400 1 HADT}
-    {625662000 -36000 0 HAST}
-    {638971200 -32400 1 HADT}
-    {657111600 -36000 0 HAST}
-    {671025600 -32400 1 HADT}
-    {688561200 -36000 0 HAST}
-    {702475200 -32400 1 HADT}
-    {720010800 -36000 0 HAST}
-    {733924800 -32400 1 HADT}
-    {752065200 -36000 0 HAST}
-    {765374400 -32400 1 HADT}
-    {783514800 -36000 0 HAST}
-    {796824000 -32400 1 HADT}
-    {814964400 -36000 0 HAST}
-    {828878400 -32400 1 HADT}
-    {846414000 -36000 0 HAST}
-    {860328000 -32400 1 HADT}
-    {877863600 -36000 0 HAST}
-    {891777600 -32400 1 HADT}
-    {909313200 -36000 0 HAST}
-    {923227200 -32400 1 HADT}
-    {941367600 -36000 0 HAST}
-    {954676800 -32400 1 HADT}
-    {972817200 -36000 0 HAST}
-    {986126400 -32400 1 HADT}
-    {1004266800 -36000 0 HAST}
-    {1018180800 -32400 1 HADT}
-    {1035716400 -36000 0 HAST}
-    {1049630400 -32400 1 HADT}
-    {1067166000 -36000 0 HAST}
-    {1081080000 -32400 1 HADT}
-    {1099220400 -36000 0 HAST}
-    {1112529600 -32400 1 HADT}
-    {1130670000 -36000 0 HAST}
-    {1143979200 -32400 1 HADT}
-    {1162119600 -36000 0 HAST}
-    {1173614400 -32400 1 HADT}
-    {1194174000 -36000 0 HAST}
-    {1205064000 -32400 1 HADT}
-    {1225623600 -36000 0 HAST}
-    {1236513600 -32400 1 HADT}
-    {1257073200 -36000 0 HAST}
-    {1268568000 -32400 1 HADT}
-    {1289127600 -36000 0 HAST}
-    {1300017600 -32400 1 HADT}
-    {1320577200 -36000 0 HAST}
-    {1331467200 -32400 1 HADT}
-    {1352026800 -36000 0 HAST}
-    {1362916800 -32400 1 HADT}
-    {1383476400 -36000 0 HAST}
-    {1394366400 -32400 1 HADT}
-    {1414926000 -36000 0 HAST}
-    {1425816000 -32400 1 HADT}
-    {1446375600 -36000 0 HAST}
-    {1457870400 -32400 1 HADT}
-    {1478430000 -36000 0 HAST}
-    {1489320000 -32400 1 HADT}
-    {1509879600 -36000 0 HAST}
-    {1520769600 -32400 1 HADT}
-    {1541329200 -36000 0 HAST}
-    {1552219200 -32400 1 HADT}
-    {1572778800 -36000 0 HAST}
-    {1583668800 -32400 1 HADT}
-    {1604228400 -36000 0 HAST}
-    {1615723200 -32400 1 HADT}
-    {1636282800 -36000 0 HAST}
-    {1647172800 -32400 1 HADT}
-    {1667732400 -36000 0 HAST}
-    {1678622400 -32400 1 HADT}
-    {1699182000 -36000 0 HAST}
-    {1710072000 -32400 1 HADT}
-    {1730631600 -36000 0 HAST}
-    {1741521600 -32400 1 HADT}
-    {1762081200 -36000 0 HAST}
-    {1772971200 -32400 1 HADT}
-    {1793530800 -36000 0 HAST}
-    {1805025600 -32400 1 HADT}
-    {1825585200 -36000 0 HAST}
-    {1836475200 -32400 1 HADT}
-    {1857034800 -36000 0 HAST}
-    {1867924800 -32400 1 HADT}
-    {1888484400 -36000 0 HAST}
-    {1899374400 -32400 1 HADT}
-    {1919934000 -36000 0 HAST}
-    {1930824000 -32400 1 HADT}
-    {1951383600 -36000 0 HAST}
-    {1962878400 -32400 1 HADT}
-    {1983438000 -36000 0 HAST}
-    {1994328000 -32400 1 HADT}
-    {2014887600 -36000 0 HAST}
-    {2025777600 -32400 1 HADT}
-    {2046337200 -36000 0 HAST}
-    {2057227200 -32400 1 HADT}
-    {2077786800 -36000 0 HAST}
-    {2088676800 -32400 1 HADT}
-    {2109236400 -36000 0 HAST}
-    {2120126400 -32400 1 HADT}
-    {2140686000 -36000 0 HAST}
-    {2152180800 -32400 1 HADT}
-    {2172740400 -36000 0 HAST}
-    {2183630400 -32400 1 HADT}
-    {2204190000 -36000 0 HAST}
-    {2215080000 -32400 1 HADT}
-    {2235639600 -36000 0 HAST}
-    {2246529600 -32400 1 HADT}
-    {2267089200 -36000 0 HAST}
-    {2277979200 -32400 1 HADT}
-    {2298538800 -36000 0 HAST}
-    {2309428800 -32400 1 HADT}
-    {2329988400 -36000 0 HAST}
-    {2341483200 -32400 1 HADT}
-    {2362042800 -36000 0 HAST}
-    {2372932800 -32400 1 HADT}
-    {2393492400 -36000 0 HAST}
-    {2404382400 -32400 1 HADT}
-    {2424942000 -36000 0 HAST}
-    {2435832000 -32400 1 HADT}
-    {2456391600 -36000 0 HAST}
-    {2467281600 -32400 1 HADT}
-    {2487841200 -36000 0 HAST}
-    {2499336000 -32400 1 HADT}
-    {2519895600 -36000 0 HAST}
-    {2530785600 -32400 1 HADT}
-    {2551345200 -36000 0 HAST}
-    {2562235200 -32400 1 HADT}
-    {2582794800 -36000 0 HAST}
-    {2593684800 -32400 1 HADT}
-    {2614244400 -36000 0 HAST}
-    {2625134400 -32400 1 HADT}
-    {2645694000 -36000 0 HAST}
-    {2656584000 -32400 1 HADT}
-    {2677143600 -36000 0 HAST}
-    {2688638400 -32400 1 HADT}
-    {2709198000 -36000 0 HAST}
-    {2720088000 -32400 1 HADT}
-    {2740647600 -36000 0 HAST}
-    {2751537600 -32400 1 HADT}
-    {2772097200 -36000 0 HAST}
-    {2782987200 -32400 1 HADT}
-    {2803546800 -36000 0 HAST}
-    {2814436800 -32400 1 HADT}
-    {2834996400 -36000 0 HAST}
-    {2846491200 -32400 1 HADT}
-    {2867050800 -36000 0 HAST}
-    {2877940800 -32400 1 HADT}
-    {2898500400 -36000 0 HAST}
-    {2909390400 -32400 1 HADT}
-    {2929950000 -36000 0 HAST}
-    {2940840000 -32400 1 HADT}
-    {2961399600 -36000 0 HAST}
-    {2972289600 -32400 1 HADT}
-    {2992849200 -36000 0 HAST}
-    {3003739200 -32400 1 HADT}
-    {3024298800 -36000 0 HAST}
-    {3035793600 -32400 1 HADT}
-    {3056353200 -36000 0 HAST}
-    {3067243200 -32400 1 HADT}
-    {3087802800 -36000 0 HAST}
-    {3098692800 -32400 1 HADT}
-    {3119252400 -36000 0 HAST}
-    {3130142400 -32400 1 HADT}
-    {3150702000 -36000 0 HAST}
-    {3161592000 -32400 1 HADT}
-    {3182151600 -36000 0 HAST}
-    {3193041600 -32400 1 HADT}
-    {3213601200 -36000 0 HAST}
-    {3225096000 -32400 1 HADT}
-    {3245655600 -36000 0 HAST}
-    {3256545600 -32400 1 HADT}
-    {3277105200 -36000 0 HAST}
-    {3287995200 -32400 1 HADT}
-    {3308554800 -36000 0 HAST}
-    {3319444800 -32400 1 HADT}
-    {3340004400 -36000 0 HAST}
-    {3350894400 -32400 1 HADT}
-    {3371454000 -36000 0 HAST}
-    {3382948800 -32400 1 HADT}
-    {3403508400 -36000 0 HAST}
-    {3414398400 -32400 1 HADT}
-    {3434958000 -36000 0 HAST}
-    {3445848000 -32400 1 HADT}
-    {3466407600 -36000 0 HAST}
-    {3477297600 -32400 1 HADT}
-    {3497857200 -36000 0 HAST}
-    {3508747200 -32400 1 HADT}
-    {3529306800 -36000 0 HAST}
-    {3540196800 -32400 1 HADT}
-    {3560756400 -36000 0 HAST}
-    {3572251200 -32400 1 HADT}
-    {3592810800 -36000 0 HAST}
-    {3603700800 -32400 1 HADT}
-    {3624260400 -36000 0 HAST}
-    {3635150400 -32400 1 HADT}
-    {3655710000 -36000 0 HAST}
-    {3666600000 -32400 1 HADT}
-    {3687159600 -36000 0 HAST}
-    {3698049600 -32400 1 HADT}
-    {3718609200 -36000 0 HAST}
-    {3730104000 -32400 1 HADT}
-    {3750663600 -36000 0 HAST}
-    {3761553600 -32400 1 HADT}
-    {3782113200 -36000 0 HAST}
-    {3793003200 -32400 1 HADT}
-    {3813562800 -36000 0 HAST}
-    {3824452800 -32400 1 HADT}
-    {3845012400 -36000 0 HAST}
-    {3855902400 -32400 1 HADT}
-    {3876462000 -36000 0 HAST}
-    {3887352000 -32400 1 HADT}
-    {3907911600 -36000 0 HAST}
-    {3919406400 -32400 1 HADT}
-    {3939966000 -36000 0 HAST}
-    {3950856000 -32400 1 HADT}
-    {3971415600 -36000 0 HAST}
-    {3982305600 -32400 1 HADT}
-    {4002865200 -36000 0 HAST}
-    {4013755200 -32400 1 HADT}
-    {4034314800 -36000 0 HAST}
-    {4045204800 -32400 1 HADT}
-    {4065764400 -36000 0 HAST}
-    {4076654400 -32400 1 HADT}
-    {4097214000 -36000 0 HAST}
+    {439034400 -36000 0 HST}
+    {452088000 -32400 1 HDT}
+    {467809200 -36000 0 HST}
+    {483537600 -32400 1 HDT}
+    {499258800 -36000 0 HST}
+    {514987200 -32400 1 HDT}
+    {530708400 -36000 0 HST}
+    {544622400 -32400 1 HDT}
+    {562158000 -36000 0 HST}
+    {576072000 -32400 1 HDT}
+    {594212400 -36000 0 HST}
+    {607521600 -32400 1 HDT}
+    {625662000 -36000 0 HST}
+    {638971200 -32400 1 HDT}
+    {657111600 -36000 0 HST}
+    {671025600 -32400 1 HDT}
+    {688561200 -36000 0 HST}
+    {702475200 -32400 1 HDT}
+    {720010800 -36000 0 HST}
+    {733924800 -32400 1 HDT}
+    {752065200 -36000 0 HST}
+    {765374400 -32400 1 HDT}
+    {783514800 -36000 0 HST}
+    {796824000 -32400 1 HDT}
+    {814964400 -36000 0 HST}
+    {828878400 -32400 1 HDT}
+    {846414000 -36000 0 HST}
+    {860328000 -32400 1 HDT}
+    {877863600 -36000 0 HST}
+    {891777600 -32400 1 HDT}
+    {909313200 -36000 0 HST}
+    {923227200 -32400 1 HDT}
+    {941367600 -36000 0 HST}
+    {954676800 -32400 1 HDT}
+    {972817200 -36000 0 HST}
+    {986126400 -32400 1 HDT}
+    {1004266800 -36000 0 HST}
+    {1018180800 -32400 1 HDT}
+    {1035716400 -36000 0 HST}
+    {1049630400 -32400 1 HDT}
+    {1067166000 -36000 0 HST}
+    {1081080000 -32400 1 HDT}
+    {1099220400 -36000 0 HST}
+    {1112529600 -32400 1 HDT}
+    {1130670000 -36000 0 HST}
+    {1143979200 -32400 1 HDT}
+    {1162119600 -36000 0 HST}
+    {1173614400 -32400 1 HDT}
+    {1194174000 -36000 0 HST}
+    {1205064000 -32400 1 HDT}
+    {1225623600 -36000 0 HST}
+    {1236513600 -32400 1 HDT}
+    {1257073200 -36000 0 HST}
+    {1268568000 -32400 1 HDT}
+    {1289127600 -36000 0 HST}
+    {1300017600 -32400 1 HDT}
+    {1320577200 -36000 0 HST}
+    {1331467200 -32400 1 HDT}
+    {1352026800 -36000 0 HST}
+    {1362916800 -32400 1 HDT}
+    {1383476400 -36000 0 HST}
+    {1394366400 -32400 1 HDT}
+    {1414926000 -36000 0 HST}
+    {1425816000 -32400 1 HDT}
+    {1446375600 -36000 0 HST}
+    {1457870400 -32400 1 HDT}
+    {1478430000 -36000 0 HST}
+    {1489320000 -32400 1 HDT}
+    {1509879600 -36000 0 HST}
+    {1520769600 -32400 1 HDT}
+    {1541329200 -36000 0 HST}
+    {1552219200 -32400 1 HDT}
+    {1572778800 -36000 0 HST}
+    {1583668800 -32400 1 HDT}
+    {1604228400 -36000 0 HST}
+    {1615723200 -32400 1 HDT}
+    {1636282800 -36000 0 HST}
+    {1647172800 -32400 1 HDT}
+    {1667732400 -36000 0 HST}
+    {1678622400 -32400 1 HDT}
+    {1699182000 -36000 0 HST}
+    {1710072000 -32400 1 HDT}
+    {1730631600 -36000 0 HST}
+    {1741521600 -32400 1 HDT}
+    {1762081200 -36000 0 HST}
+    {1772971200 -32400 1 HDT}
+    {1793530800 -36000 0 HST}
+    {1805025600 -32400 1 HDT}
+    {1825585200 -36000 0 HST}
+    {1836475200 -32400 1 HDT}
+    {1857034800 -36000 0 HST}
+    {1867924800 -32400 1 HDT}
+    {1888484400 -36000 0 HST}
+    {1899374400 -32400 1 HDT}
+    {1919934000 -36000 0 HST}
+    {1930824000 -32400 1 HDT}
+    {1951383600 -36000 0 HST}
+    {1962878400 -32400 1 HDT}
+    {1983438000 -36000 0 HST}
+    {1994328000 -32400 1 HDT}
+    {2014887600 -36000 0 HST}
+    {2025777600 -32400 1 HDT}
+    {2046337200 -36000 0 HST}
+    {2057227200 -32400 1 HDT}
+    {2077786800 -36000 0 HST}
+    {2088676800 -32400 1 HDT}
+    {2109236400 -36000 0 HST}
+    {2120126400 -32400 1 HDT}
+    {2140686000 -36000 0 HST}
+    {2152180800 -32400 1 HDT}
+    {2172740400 -36000 0 HST}
+    {2183630400 -32400 1 HDT}
+    {2204190000 -36000 0 HST}
+    {2215080000 -32400 1 HDT}
+    {2235639600 -36000 0 HST}
+    {2246529600 -32400 1 HDT}
+    {2267089200 -36000 0 HST}
+    {2277979200 -32400 1 HDT}
+    {2298538800 -36000 0 HST}
+    {2309428800 -32400 1 HDT}
+    {2329988400 -36000 0 HST}
+    {2341483200 -32400 1 HDT}
+    {2362042800 -36000 0 HST}
+    {2372932800 -32400 1 HDT}
+    {2393492400 -36000 0 HST}
+    {2404382400 -32400 1 HDT}
+    {2424942000 -36000 0 HST}
+    {2435832000 -32400 1 HDT}
+    {2456391600 -36000 0 HST}
+    {2467281600 -32400 1 HDT}
+    {2487841200 -36000 0 HST}
+    {2499336000 -32400 1 HDT}
+    {2519895600 -36000 0 HST}
+    {2530785600 -32400 1 HDT}
+    {2551345200 -36000 0 HST}
+    {2562235200 -32400 1 HDT}
+    {2582794800 -36000 0 HST}
+    {2593684800 -32400 1 HDT}
+    {2614244400 -36000 0 HST}
+    {2625134400 -32400 1 HDT}
+    {2645694000 -36000 0 HST}
+    {2656584000 -32400 1 HDT}
+    {2677143600 -36000 0 HST}
+    {2688638400 -32400 1 HDT}
+    {2709198000 -36000 0 HST}
+    {2720088000 -32400 1 HDT}
+    {2740647600 -36000 0 HST}
+    {2751537600 -32400 1 HDT}
+    {2772097200 -36000 0 HST}
+    {2782987200 -32400 1 HDT}
+    {2803546800 -36000 0 HST}
+    {2814436800 -32400 1 HDT}
+    {2834996400 -36000 0 HST}
+    {2846491200 -32400 1 HDT}
+    {2867050800 -36000 0 HST}
+    {2877940800 -32400 1 HDT}
+    {2898500400 -36000 0 HST}
+    {2909390400 -32400 1 HDT}
+    {2929950000 -36000 0 HST}
+    {2940840000 -32400 1 HDT}
+    {2961399600 -36000 0 HST}
+    {2972289600 -32400 1 HDT}
+    {2992849200 -36000 0 HST}
+    {3003739200 -32400 1 HDT}
+    {3024298800 -36000 0 HST}
+    {3035793600 -32400 1 HDT}
+    {3056353200 -36000 0 HST}
+    {3067243200 -32400 1 HDT}
+    {3087802800 -36000 0 HST}
+    {3098692800 -32400 1 HDT}
+    {3119252400 -36000 0 HST}
+    {3130142400 -32400 1 HDT}
+    {3150702000 -36000 0 HST}
+    {3161592000 -32400 1 HDT}
+    {3182151600 -36000 0 HST}
+    {3193041600 -32400 1 HDT}
+    {3213601200 -36000 0 HST}
+    {3225096000 -32400 1 HDT}
+    {3245655600 -36000 0 HST}
+    {3256545600 -32400 1 HDT}
+    {3277105200 -36000 0 HST}
+    {3287995200 -32400 1 HDT}
+    {3308554800 -36000 0 HST}
+    {3319444800 -32400 1 HDT}
+    {3340004400 -36000 0 HST}
+    {3350894400 -32400 1 HDT}
+    {3371454000 -36000 0 HST}
+    {3382948800 -32400 1 HDT}
+    {3403508400 -36000 0 HST}
+    {3414398400 -32400 1 HDT}
+    {3434958000 -36000 0 HST}
+    {3445848000 -32400 1 HDT}
+    {3466407600 -36000 0 HST}
+    {3477297600 -32400 1 HDT}
+    {3497857200 -36000 0 HST}
+    {3508747200 -32400 1 HDT}
+    {3529306800 -36000 0 HST}
+    {3540196800 -32400 1 HDT}
+    {3560756400 -36000 0 HST}
+    {3572251200 -32400 1 HDT}
+    {3592810800 -36000 0 HST}
+    {3603700800 -32400 1 HDT}
+    {3624260400 -36000 0 HST}
+    {3635150400 -32400 1 HDT}
+    {3655710000 -36000 0 HST}
+    {3666600000 -32400 1 HDT}
+    {3687159600 -36000 0 HST}
+    {3698049600 -32400 1 HDT}
+    {3718609200 -36000 0 HST}
+    {3730104000 -32400 1 HDT}
+    {3750663600 -36000 0 HST}
+    {3761553600 -32400 1 HDT}
+    {3782113200 -36000 0 HST}
+    {3793003200 -32400 1 HDT}
+    {3813562800 -36000 0 HST}
+    {3824452800 -32400 1 HDT}
+    {3845012400 -36000 0 HST}
+    {3855902400 -32400 1 HDT}
+    {3876462000 -36000 0 HST}
+    {3887352000 -32400 1 HDT}
+    {3907911600 -36000 0 HST}
+    {3919406400 -32400 1 HDT}
+    {3939966000 -36000 0 HST}
+    {3950856000 -32400 1 HDT}
+    {3971415600 -36000 0 HST}
+    {3982305600 -32400 1 HDT}
+    {4002865200 -36000 0 HST}
+    {4013755200 -32400 1 HDT}
+    {4034314800 -36000 0 HST}
+    {4045204800 -32400 1 HDT}
+    {4065764400 -36000 0 HST}
+    {4076654400 -32400 1 HDT}
+    {4097214000 -36000 0 HST}
 }
diff --git a/library/tzdata/America/Antigua b/library/tzdata/America/Antigua
index 5433e9b..be0c88e 100644
--- a/library/tzdata/America/Antigua
+++ b/library/tzdata/America/Antigua
@@ -1,7 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/Antigua) {
-    {-9223372036854775808 -14832 0 LMT}
-    {-1825098768 -18000 0 EST}
-    {-599598000 -14400 0 AST}
+if {![info exists TZData(America/Port_of_Spain)]} {
+    LoadTimeZoneFile America/Port_of_Spain
 }
+set TZData(:America/Antigua) $TZData(:America/Port_of_Spain)
diff --git a/library/tzdata/America/Cayman b/library/tzdata/America/Cayman
index 3e2e3cc..92ce5e2 100644
--- a/library/tzdata/America/Cayman
+++ b/library/tzdata/America/Cayman
@@ -1,7 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/Cayman) {
-    {-9223372036854775808 -19532 0 LMT}
-    {-2524502068 -18431 0 KMT}
-    {-1827687169 -18000 0 EST}
+if {![info exists TZData(America/Panama)]} {
+    LoadTimeZoneFile America/Panama
 }
+set TZData(:America/Cayman) $TZData(:America/Panama)
diff --git a/library/tzdata/America/Montreal b/library/tzdata/America/Montreal
index bebe7dc..0ead8ee 100644
--- a/library/tzdata/America/Montreal
+++ b/library/tzdata/America/Montreal
@@ -1,366 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:America/Montreal) {
-    {-9223372036854775808 -17656 0 LMT}
-    {-2713892744 -18000 0 EST}
-    {-1665334800 -14400 1 EDT}
-    {-1662753600 -18000 0 EST}
-    {-1640977200 -18000 0 EST}
-    {-1632070800 -14400 1 EDT}
-    {-1615140000 -18000 0 EST}
-    {-1609441200 -18000 0 EST}
-    {-1601742600 -14400 1 EDT}
-    {-1583775000 -18000 0 EST}
-    {-1567355400 -14400 1 EDT}
-    {-1554053400 -18000 0 EST}
-    {-1535907600 -14400 1 EDT}
-    {-1522603800 -18000 0 EST}
-    {-1504458000 -14400 1 EDT}
-    {-1491154200 -18000 0 EST}
-    {-1439830800 -14400 1 EDT}
-    {-1428255000 -18000 0 EST}
-    {-1409504400 -14400 1 EDT}
-    {-1396805400 -18000 0 EST}
-    {-1378054800 -14400 1 EDT}
-    {-1365355800 -18000 0 EST}
-    {-1346612400 -14400 1 EDT}
-    {-1333915200 -18000 0 EST}
-    {-1315162800 -14400 1 EDT}
-    {-1301860800 -18000 0 EST}
-    {-1283713200 -14400 1 EDT}
-    {-1270411200 -18000 0 EST}
-    {-1252263600 -14400 1 EDT}
-    {-1238961600 -18000 0 EST}
-    {-1220814000 -14400 1 EDT}
-    {-1207512000 -18000 0 EST}
-    {-1188759600 -14400 1 EDT}
-    {-1176062400 -18000 0 EST}
-    {-1157310000 -14400 1 EDT}
-    {-1144008000 -18000 0 EST}
-    {-1125860400 -14400 1 EDT}
-    {-1112558400 -18000 0 EST}
-    {-1094410800 -14400 1 EDT}
-    {-1081108800 -18000 0 EST}
-    {-1062961200 -14400 1 EDT}
-    {-1049659200 -18000 0 EST}
-    {-1031511600 -14400 1 EDT}
-    {-1018209600 -18000 0 EST}
-    {-1000062000 -14400 1 EDT}
-    {-986760000 -18000 0 EST}
-    {-968007600 -14400 1 EDT}
-    {-955310400 -18000 0 EST}
-    {-936558000 -14400 1 EDT}
-    {-880218000 -14400 0 EWT}
-    {-769395600 -14400 1 EPT}
-    {-765396000 -18000 0 EST}
-    {-757364400 -18000 0 EST}
-    {-747248400 -14400 1 EDT}
-    {-733946400 -18000 0 EST}
-    {-715798800 -14400 1 EDT}
-    {-702496800 -18000 0 EST}
-    {-684349200 -14400 1 EDT}
-    {-671047200 -18000 0 EST}
-    {-652899600 -14400 1 EDT}
-    {-636573600 -18000 0 EST}
-    {-620845200 -14400 1 EDT}
-    {-605124000 -18000 0 EST}
-    {-589395600 -14400 1 EDT}
-    {-576093600 -18000 0 EST}
-    {-557946000 -14400 1 EDT}
-    {-544644000 -18000 0 EST}
-    {-526496400 -14400 1 EDT}
-    {-513194400 -18000 0 EST}
-    {-495046800 -14400 1 EDT}
-    {-481744800 -18000 0 EST}
-    {-463597200 -14400 1 EDT}
-    {-450295200 -18000 0 EST}
-    {-431542800 -14400 1 EDT}
-    {-418240800 -18000 0 EST}
-    {-400093200 -14400 1 EDT}
-    {-384372000 -18000 0 EST}
-    {-368643600 -14400 1 EDT}
-    {-352922400 -18000 0 EST}
-    {-337194000 -14400 1 EDT}
-    {-321472800 -18000 0 EST}
-    {-305744400 -14400 1 EDT}
-    {-289418400 -18000 0 EST}
-    {-273690000 -14400 1 EDT}
-    {-257968800 -18000 0 EST}
-    {-242240400 -14400 1 EDT}
-    {-226519200 -18000 0 EST}
-    {-210790800 -14400 1 EDT}
-    {-195069600 -18000 0 EST}
-    {-179341200 -14400 1 EDT}
-    {-163620000 -18000 0 EST}
-    {-147891600 -14400 1 EDT}
-    {-131565600 -18000 0 EST}
-    {-116442000 -14400 1 EDT}
-    {-100116000 -18000 0 EST}
-    {-84387600 -14400 1 EDT}
-    {-68666400 -18000 0 EST}
-    {-52938000 -14400 1 EDT}
-    {-37216800 -18000 0 EST}
-    {-21488400 -14400 1 EDT}
-    {-5767200 -18000 0 EST}
-    {9961200 -14400 1 EDT}
-    {25682400 -18000 0 EST}
-    {41410800 -14400 1 EDT}
-    {57736800 -18000 0 EST}
-    {73465200 -14400 1 EDT}
-    {89186400 -18000 0 EST}
-    {104914800 -14400 1 EDT}
-    {120636000 -18000 0 EST}
-    {126248400 -18000 0 EST}
-    {136364400 -14400 1 EDT}
-    {152085600 -18000 0 EST}
-    {167814000 -14400 1 EDT}
-    {183535200 -18000 0 EST}
-    {199263600 -14400 1 EDT}
-    {215589600 -18000 0 EST}
-    {230713200 -14400 1 EDT}
-    {247039200 -18000 0 EST}
-    {262767600 -14400 1 EDT}
-    {278488800 -18000 0 EST}
-    {294217200 -14400 1 EDT}
-    {309938400 -18000 0 EST}
-    {325666800 -14400 1 EDT}
-    {341388000 -18000 0 EST}
-    {357116400 -14400 1 EDT}
-    {372837600 -18000 0 EST}
-    {388566000 -14400 1 EDT}
-    {404892000 -18000 0 EST}
-    {420015600 -14400 1 EDT}
-    {436341600 -18000 0 EST}
-    {452070000 -14400 1 EDT}
-    {467791200 -18000 0 EST}
-    {483519600 -14400 1 EDT}
-    {499240800 -18000 0 EST}
-    {514969200 -14400 1 EDT}
-    {530690400 -18000 0 EST}
-    {544604400 -14400 1 EDT}
-    {562140000 -18000 0 EST}
-    {576054000 -14400 1 EDT}
-    {594194400 -18000 0 EST}
-    {607503600 -14400 1 EDT}
-    {625644000 -18000 0 EST}
-    {638953200 -14400 1 EDT}
-    {657093600 -18000 0 EST}
-    {671007600 -14400 1 EDT}
-    {688543200 -18000 0 EST}
-    {702457200 -14400 1 EDT}
-    {719992800 -18000 0 EST}
-    {733906800 -14400 1 EDT}
-    {752047200 -18000 0 EST}
-    {765356400 -14400 1 EDT}
-    {783496800 -18000 0 EST}
-    {796806000 -14400 1 EDT}
-    {814946400 -18000 0 EST}
-    {828860400 -14400 1 EDT}
-    {846396000 -18000 0 EST}
-    {860310000 -14400 1 EDT}
-    {877845600 -18000 0 EST}
-    {891759600 -14400 1 EDT}
-    {909295200 -18000 0 EST}
-    {923209200 -14400 1 EDT}
-    {941349600 -18000 0 EST}
-    {954658800 -14400 1 EDT}
-    {972799200 -18000 0 EST}
-    {986108400 -14400 1 EDT}
-    {1004248800 -18000 0 EST}
-    {1018162800 -14400 1 EDT}
-    {1035698400 -18000 0 EST}
-    {1049612400 -14400 1 EDT}
-    {1067148000 -18000 0 EST}
-    {1081062000 -14400 1 EDT}
-    {1099202400 -18000 0 EST}
-    {1112511600 -14400 1 EDT}
-    {1130652000 -18000 0 EST}
-    {1143961200 -14400 1 EDT}
-    {1162101600 -18000 0 EST}
-    {1173596400 -14400 1 EDT}
-    {1194156000 -18000 0 EST}
-    {1205046000 -14400 1 EDT}
-    {1225605600 -18000 0 EST}
-    {1236495600 -14400 1 EDT}
-    {1257055200 -18000 0 EST}
-    {1268550000 -14400 1 EDT}
-    {1289109600 -18000 0 EST}
-    {1299999600 -14400 1 EDT}
-    {1320559200 -18000 0 EST}
-    {1331449200 -14400 1 EDT}
-    {1352008800 -18000 0 EST}
-    {1362898800 -14400 1 EDT}
-    {1383458400 -18000 0 EST}
-    {1394348400 -14400 1 EDT}
-    {1414908000 -18000 0 EST}
-    {1425798000 -14400 1 EDT}
-    {1446357600 -18000 0 EST}
-    {1457852400 -14400 1 EDT}
-    {1478412000 -18000 0 EST}
-    {1489302000 -14400 1 EDT}
-    {1509861600 -18000 0 EST}
-    {1520751600 -14400 1 EDT}
-    {1541311200 -18000 0 EST}
-    {1552201200 -14400 1 EDT}
-    {1572760800 -18000 0 EST}
-    {1583650800 -14400 1 EDT}
-    {1604210400 -18000 0 EST}
-    {1615705200 -14400 1 EDT}
-    {1636264800 -18000 0 EST}
-    {1647154800 -14400 1 EDT}
-    {1667714400 -18000 0 EST}
-    {1678604400 -14400 1 EDT}
-    {1699164000 -18000 0 EST}
-    {1710054000 -14400 1 EDT}
-    {1730613600 -18000 0 EST}
-    {1741503600 -14400 1 EDT}
-    {1762063200 -18000 0 EST}
-    {1772953200 -14400 1 EDT}
-    {1793512800 -18000 0 EST}
-    {1805007600 -14400 1 EDT}
-    {1825567200 -18000 0 EST}
-    {1836457200 -14400 1 EDT}
-    {1857016800 -18000 0 EST}
-    {1867906800 -14400 1 EDT}
-    {1888466400 -18000 0 EST}
-    {1899356400 -14400 1 EDT}
-    {1919916000 -18000 0 EST}
-    {1930806000 -14400 1 EDT}
-    {1951365600 -18000 0 EST}
-    {1962860400 -14400 1 EDT}
-    {1983420000 -18000 0 EST}
-    {1994310000 -14400 1 EDT}
-    {2014869600 -18000 0 EST}
-    {2025759600 -14400 1 EDT}
-    {2046319200 -18000 0 EST}
-    {2057209200 -14400 1 EDT}
-    {2077768800 -18000 0 EST}
-    {2088658800 -14400 1 EDT}
-    {2109218400 -18000 0 EST}
-    {2120108400 -14400 1 EDT}
-    {2140668000 -18000 0 EST}
-    {2152162800 -14400 1 EDT}
-    {2172722400 -18000 0 EST}
-    {2183612400 -14400 1 EDT}
-    {2204172000 -18000 0 EST}
-    {2215062000 -14400 1 EDT}
-    {2235621600 -18000 0 EST}
-    {2246511600 -14400 1 EDT}
-    {2267071200 -18000 0 EST}
-    {2277961200 -14400 1 EDT}
-    {2298520800 -18000 0 EST}
-    {2309410800 -14400 1 EDT}
-    {2329970400 -18000 0 EST}
-    {2341465200 -14400 1 EDT}
-    {2362024800 -18000 0 EST}
-    {2372914800 -14400 1 EDT}
-    {2393474400 -18000 0 EST}
-    {2404364400 -14400 1 EDT}
-    {2424924000 -18000 0 EST}
-    {2435814000 -14400 1 EDT}
-    {2456373600 -18000 0 EST}
-    {2467263600 -14400 1 EDT}
-    {2487823200 -18000 0 EST}
-    {2499318000 -14400 1 EDT}
-    {2519877600 -18000 0 EST}
-    {2530767600 -14400 1 EDT}
-    {2551327200 -18000 0 EST}
-    {2562217200 -14400 1 EDT}
-    {2582776800 -18000 0 EST}
-    {2593666800 -14400 1 EDT}
-    {2614226400 -18000 0 EST}
-    {2625116400 -14400 1 EDT}
-    {2645676000 -18000 0 EST}
-    {2656566000 -14400 1 EDT}
-    {2677125600 -18000 0 EST}
-    {2688620400 -14400 1 EDT}
-    {2709180000 -18000 0 EST}
-    {2720070000 -14400 1 EDT}
-    {2740629600 -18000 0 EST}
-    {2751519600 -14400 1 EDT}
-    {2772079200 -18000 0 EST}
-    {2782969200 -14400 1 EDT}
-    {2803528800 -18000 0 EST}
-    {2814418800 -14400 1 EDT}
-    {2834978400 -18000 0 EST}
-    {2846473200 -14400 1 EDT}
-    {2867032800 -18000 0 EST}
-    {2877922800 -14400 1 EDT}
-    {2898482400 -18000 0 EST}
-    {2909372400 -14400 1 EDT}
-    {2929932000 -18000 0 EST}
-    {2940822000 -14400 1 EDT}
-    {2961381600 -18000 0 EST}
-    {2972271600 -14400 1 EDT}
-    {2992831200 -18000 0 EST}
-    {3003721200 -14400 1 EDT}
-    {3024280800 -18000 0 EST}
-    {3035775600 -14400 1 EDT}
-    {3056335200 -18000 0 EST}
-    {3067225200 -14400 1 EDT}
-    {3087784800 -18000 0 EST}
-    {3098674800 -14400 1 EDT}
-    {3119234400 -18000 0 EST}
-    {3130124400 -14400 1 EDT}
-    {3150684000 -18000 0 EST}
-    {3161574000 -14400 1 EDT}
-    {3182133600 -18000 0 EST}
-    {3193023600 -14400 1 EDT}
-    {3213583200 -18000 0 EST}
-    {3225078000 -14400 1 EDT}
-    {3245637600 -18000 0 EST}
-    {3256527600 -14400 1 EDT}
-    {3277087200 -18000 0 EST}
-    {3287977200 -14400 1 EDT}
-    {3308536800 -18000 0 EST}
-    {3319426800 -14400 1 EDT}
-    {3339986400 -18000 0 EST}
-    {3350876400 -14400 1 EDT}
-    {3371436000 -18000 0 EST}
-    {3382930800 -14400 1 EDT}
-    {3403490400 -18000 0 EST}
-    {3414380400 -14400 1 EDT}
-    {3434940000 -18000 0 EST}
-    {3445830000 -14400 1 EDT}
-    {3466389600 -18000 0 EST}
-    {3477279600 -14400 1 EDT}
-    {3497839200 -18000 0 EST}
-    {3508729200 -14400 1 EDT}
-    {3529288800 -18000 0 EST}
-    {3540178800 -14400 1 EDT}
-    {3560738400 -18000 0 EST}
-    {3572233200 -14400 1 EDT}
-    {3592792800 -18000 0 EST}
-    {3603682800 -14400 1 EDT}
-    {3624242400 -18000 0 EST}
-    {3635132400 -14400 1 EDT}
-    {3655692000 -18000 0 EST}
-    {3666582000 -14400 1 EDT}
-    {3687141600 -18000 0 EST}
-    {3698031600 -14400 1 EDT}
-    {3718591200 -18000 0 EST}
-    {3730086000 -14400 1 EDT}
-    {3750645600 -18000 0 EST}
-    {3761535600 -14400 1 EDT}
-    {3782095200 -18000 0 EST}
-    {3792985200 -14400 1 EDT}
-    {3813544800 -18000 0 EST}
-    {3824434800 -14400 1 EDT}
-    {3844994400 -18000 0 EST}
-    {3855884400 -14400 1 EDT}
-    {3876444000 -18000 0 EST}
-    {3887334000 -14400 1 EDT}
-    {3907893600 -18000 0 EST}
-    {3919388400 -14400 1 EDT}
-    {3939948000 -18000 0 EST}
-    {3950838000 -14400 1 EDT}
-    {3971397600 -18000 0 EST}
-    {3982287600 -14400 1 EDT}
-    {4002847200 -18000 0 EST}
-    {4013737200 -14400 1 EDT}
-    {4034296800 -18000 0 EST}
-    {4045186800 -14400 1 EDT}
-    {4065746400 -18000 0 EST}
-    {4076636400 -14400 1 EDT}
-    {4097196000 -18000 0 EST}
+if {![info exists TZData(America/Toronto)]} {
+    LoadTimeZoneFile America/Toronto
 }
+set TZData(:America/Montreal) $TZData(:America/Toronto)
diff --git a/library/tzdata/America/Santiago b/library/tzdata/America/Santiago
index 29c2a93..b6d9b38 100644
--- a/library/tzdata/America/Santiago
+++ b/library/tzdata/America/Santiago
@@ -3,9 +3,9 @@
 set TZData(:America/Santiago) {
     {-9223372036854775808 -16966 0 LMT}
     {-2524504634 -16966 0 SMT}
-    {-1893439034 -18000 0 CLT}
+    {-1892661434 -18000 0 CLT}
     {-1688410800 -16966 0 SMT}
-    {-1619983034 -14400 0 CLT}
+    {-1619205434 -14400 0 CLT}
     {-1593806400 -16966 0 SMT}
     {-1335986234 -18000 0 CLT}
     {-1335985200 -14400 1 CLST}
@@ -18,13 +18,13 @@ set TZData(:America/Santiago) {
     {-1222977600 -18000 0 CLT}
     {-1209754800 -14400 1 CLST}
     {-1191355200 -18000 0 CLT}
-    {-1178132400 -14400 1 CLST}
+    {-1178132400 -14400 0 CLT}
     {-870552000 -18000 0 CLT}
-    {-865278000 -14400 1 CLST}
-    {-740520000 -14400 1 CLST}
-    {-736376400 -18000 0 CLT}
+    {-865278000 -14400 0 CLT}
+    {-740520000 -10800 1 CLST}
+    {-736376400 -14400 0 CLT}
     {-718056000 -18000 0 CLT}
-    {-713646000 -14400 0 CLT}
+    {-713649600 -14400 0 CLT}
     {-36619200 -10800 1 CLST}
     {-23922000 -14400 0 CLT}
     {-3355200 -10800 1 CLST}
@@ -65,10 +65,10 @@ set TZData(:America/Santiago) {
     {545194800 -14400 0 CLT}
     {560923200 -10800 1 CLST}
     {574225200 -14400 0 CLT}
-    {591768000 -10800 1 CLST}
+    {592372800 -10800 1 CLST}
     {605674800 -14400 0 CLT}
     {624427200 -10800 1 CLST}
-    {637729200 -14400 0 CLT}
+    {637124400 -14400 0 CLT}
     {653457600 -10800 1 CLST}
     {668574000 -14400 0 CLT}
     {687326400 -10800 1 CLST}
diff --git a/library/tzdata/Antarctica/Palmer b/library/tzdata/Antarctica/Palmer
index f12528b..2c43861 100644
--- a/library/tzdata/Antarctica/Palmer
+++ b/library/tzdata/Antarctica/Palmer
@@ -28,10 +28,10 @@ set TZData(:Antarctica/Palmer) {
     {545194800 -14400 0 CLT}
     {560923200 -10800 1 CLST}
     {574225200 -14400 0 CLT}
-    {591768000 -10800 1 CLST}
+    {592372800 -10800 1 CLST}
     {605674800 -14400 0 CLT}
     {624427200 -10800 1 CLST}
-    {637729200 -14400 0 CLT}
+    {637124400 -14400 0 CLT}
     {653457600 -10800 1 CLST}
     {668574000 -14400 0 CLT}
     {687326400 -10800 1 CLST}
diff --git a/library/tzdata/Asia/Choibalsan b/library/tzdata/Asia/Choibalsan
index 3d42617..2bcf7f7 100644
--- a/library/tzdata/Asia/Choibalsan
+++ b/library/tzdata/Asia/Choibalsan
@@ -48,4 +48,175 @@ set TZData(:Asia/Choibalsan) {
     {1127491200 32400 0 CHOT}
     {1143219600 36000 1 CHOST}
     {1159545600 32400 0 CHOT}
+    {1206889200 28800 0 CHOT}
+    {1427479200 32400 1 CHOST}
+    {1443193200 28800 0 CHOT}
+    {1458928800 32400 1 CHOST}
+    {1474642800 28800 0 CHOT}
+    {1490378400 32400 1 CHOST}
+    {1506697200 28800 0 CHOT}
+    {1522432800 32400 1 CHOST}
+    {1538146800 28800 0 CHOT}
+    {1553882400 32400 1 CHOST}
+    {1569596400 28800 0 CHOT}
+    {1585332000 32400 1 CHOST}
+    {1601046000 28800 0 CHOT}
+    {1616781600 32400 1 CHOST}
+    {1632495600 28800 0 CHOT}
+    {1648231200 32400 1 CHOST}
+    {1663945200 28800 0 CHOT}
+    {1679680800 32400 1 CHOST}
+    {1695999600 28800 0 CHOT}
+    {1711735200 32400 1 CHOST}
+    {1727449200 28800 0 CHOT}
+    {1743184800 32400 1 CHOST}
+    {1758898800 28800 0 CHOT}
+    {1774634400 32400 1 CHOST}
+    {1790348400 28800 0 CHOT}
+    {1806084000 32400 1 CHOST}
+    {1821798000 28800 0 CHOT}
+    {1837533600 32400 1 CHOST}
+    {1853852400 28800 0 CHOT}
+    {1869588000 32400 1 CHOST}
+    {1885302000 28800 0 CHOT}
+    {1901037600 32400 1 CHOST}
+    {1916751600 28800 0 CHOT}
+    {1932487200 32400 1 CHOST}
+    {1948201200 28800 0 CHOT}
+    {1963936800 32400 1 CHOST}
+    {1979650800 28800 0 CHOT}
+    {1995386400 32400 1 CHOST}
+    {2011100400 28800 0 CHOT}
+    {2026836000 32400 1 CHOST}
+    {2043154800 28800 0 CHOT}
+    {2058890400 32400 1 CHOST}
+    {2074604400 28800 0 CHOT}
+    {2090340000 32400 1 CHOST}
+    {2106054000 28800 0 CHOT}
+    {2121789600 32400 1 CHOST}
+    {2137503600 28800 0 CHOT}
+    {2153239200 32400 1 CHOST}
+    {2168953200 28800 0 CHOT}
+    {2184688800 32400 1 CHOST}
+    {2200402800 28800 0 CHOT}
+    {2216743200 32400 1 CHOST}
+    {2232457200 28800 0 CHOT}
+    {2248192800 32400 1 CHOST}
+    {2263906800 28800 0 CHOT}
+    {2279642400 32400 1 CHOST}
+    {2295356400 28800 0 CHOT}
+    {2311092000 32400 1 CHOST}
+    {2326806000 28800 0 CHOT}
+    {2342541600 32400 1 CHOST}
+    {2358255600 28800 0 CHOT}
+    {2373991200 32400 1 CHOST}
+    {2390310000 28800 0 CHOT}
+    {2406045600 32400 1 CHOST}
+    {2421759600 28800 0 CHOT}
+    {2437495200 32400 1 CHOST}
+    {2453209200 28800 0 CHOT}
+    {2468944800 32400 1 CHOST}
+    {2484658800 28800 0 CHOT}
+    {2500394400 32400 1 CHOST}
+    {2516108400 28800 0 CHOT}
+    {2531844000 32400 1 CHOST}
+    {2547558000 28800 0 CHOT}
+    {2563293600 32400 1 CHOST}
+    {2579612400 28800 0 CHOT}
+    {2595348000 32400 1 CHOST}
+    {2611062000 28800 0 CHOT}
+    {2626797600 32400 1 CHOST}
+    {2642511600 28800 0 CHOT}
+    {2658247200 32400 1 CHOST}
+    {2673961200 28800 0 CHOT}
+    {2689696800 32400 1 CHOST}
+    {2705410800 28800 0 CHOT}
+    {2721146400 32400 1 CHOST}
+    {2737465200 28800 0 CHOT}
+    {2753200800 32400 1 CHOST}
+    {2768914800 28800 0 CHOT}
+    {2784650400 32400 1 CHOST}
+    {2800364400 28800 0 CHOT}
+    {2816100000 32400 1 CHOST}
+    {2831814000 28800 0 CHOT}
+    {2847549600 32400 1 CHOST}
+    {2863263600 28800 0 CHOT}
+    {2878999200 32400 1 CHOST}
+    {2894713200 28800 0 CHOT}
+    {2910448800 32400 1 CHOST}
+    {2926767600 28800 0 CHOT}
+    {2942503200 32400 1 CHOST}
+    {2958217200 28800 0 CHOT}
+    {2973952800 32400 1 CHOST}
+    {2989666800 28800 0 CHOT}
+    {3005402400 32400 1 CHOST}
+    {3021116400 28800 0 CHOT}
+    {3036852000 32400 1 CHOST}
+    {3052566000 28800 0 CHOT}
+    {3068301600 32400 1 CHOST}
+    {3084015600 28800 0 CHOT}
+    {3100356000 32400 1 CHOST}
+    {3116070000 28800 0 CHOT}
+    {3131805600 32400 1 CHOST}
+    {3147519600 28800 0 CHOT}
+    {3163255200 32400 1 CHOST}
+    {3178969200 28800 0 CHOT}
+    {3194704800 32400 1 CHOST}
+    {3210418800 28800 0 CHOT}
+    {3226154400 32400 1 CHOST}
+    {3241868400 28800 0 CHOT}
+    {3257604000 32400 1 CHOST}
+    {3273922800 28800 0 CHOT}
+    {3289658400 32400 1 CHOST}
+    {3305372400 28800 0 CHOT}
+    {3321108000 32400 1 CHOST}
+    {3336822000 28800 0 CHOT}
+    {3352557600 32400 1 CHOST}
+    {3368271600 28800 0 CHOT}
+    {3384007200 32400 1 CHOST}
+    {3399721200 28800 0 CHOT}
+    {3415456800 32400 1 CHOST}
+    {3431170800 28800 0 CHOT}
+    {3446906400 32400 1 CHOST}
+    {3463225200 28800 0 CHOT}
+    {3478960800 32400 1 CHOST}
+    {3494674800 28800 0 CHOT}
+    {3510410400 32400 1 CHOST}
+    {3526124400 28800 0 CHOT}
+    {3541860000 32400 1 CHOST}
+    {3557574000 28800 0 CHOT}
+    {3573309600 32400 1 CHOST}
+    {3589023600 28800 0 CHOT}
+    {3604759200 32400 1 CHOST}
+    {3621078000 28800 0 CHOT}
+    {3636813600 32400 1 CHOST}
+    {3652527600 28800 0 CHOT}
+    {3668263200 32400 1 CHOST}
+    {3683977200 28800 0 CHOT}
+    {3699712800 32400 1 CHOST}
+    {3715426800 28800 0 CHOT}
+    {3731162400 32400 1 CHOST}
+    {3746876400 28800 0 CHOT}
+    {3762612000 32400 1 CHOST}
+    {3778326000 28800 0 CHOT}
+    {3794061600 32400 1 CHOST}
+    {3810380400 28800 0 CHOT}
+    {3826116000 32400 1 CHOST}
+    {3841830000 28800 0 CHOT}
+    {3857565600 32400 1 CHOST}
+    {3873279600 28800 0 CHOT}
+    {3889015200 32400 1 CHOST}
+    {3904729200 28800 0 CHOT}
+    {3920464800 32400 1 CHOST}
+    {3936178800 28800 0 CHOT}
+    {3951914400 32400 1 CHOST}
+    {3967628400 28800 0 CHOT}
+    {3983968800 32400 1 CHOST}
+    {3999682800 28800 0 CHOT}
+    {4015418400 32400 1 CHOST}
+    {4031132400 28800 0 CHOT}
+    {4046868000 32400 1 CHOST}
+    {4062582000 28800 0 CHOT}
+    {4078317600 32400 1 CHOST}
+    {4094031600 28800 0 CHOT}
 }
diff --git a/library/tzdata/Asia/Gaza b/library/tzdata/Asia/Gaza
index 8ec9c5b..805b6b7 100644
--- a/library/tzdata/Asia/Gaza
+++ b/library/tzdata/Asia/Gaza
@@ -104,175 +104,175 @@ set TZData(:Asia/Gaza) {
     {1364508000 10800 1 EEST}
     {1380229200 7200 0 EET}
     {1395957600 10800 1 EEST}
-    {1411678800 7200 0 EET}
-    {1427407200 10800 1 EEST}
-    {1443128400 7200 0 EET}
-    {1459461600 10800 1 EEST}
-    {1474578000 7200 0 EET}
-    {1490911200 10800 1 EEST}
-    {1506027600 7200 0 EET}
-    {1522360800 10800 1 EEST}
-    {1537477200 7200 0 EET}
-    {1553810400 10800 1 EEST}
-    {1569531600 7200 0 EET}
-    {1585260000 10800 1 EEST}
-    {1600981200 7200 0 EET}
-    {1616709600 10800 1 EEST}
-    {1632430800 7200 0 EET}
-    {1648764000 10800 1 EEST}
-    {1663880400 7200 0 EET}
-    {1680213600 10800 1 EEST}
-    {1695330000 7200 0 EET}
-    {1711663200 10800 1 EEST}
-    {1727384400 7200 0 EET}
-    {1743112800 10800 1 EEST}
-    {1758834000 7200 0 EET}
-    {1774562400 10800 1 EEST}
-    {1790283600 7200 0 EET}
-    {1806012000 10800 1 EEST}
-    {1821733200 7200 0 EET}
-    {1838066400 10800 1 EEST}
-    {1853182800 7200 0 EET}
-    {1869516000 10800 1 EEST}
-    {1884632400 7200 0 EET}
-    {1900965600 10800 1 EEST}
-    {1916686800 7200 0 EET}
-    {1932415200 10800 1 EEST}
-    {1948136400 7200 0 EET}
-    {1963864800 10800 1 EEST}
-    {1979586000 7200 0 EET}
-    {1995919200 10800 1 EEST}
-    {2011035600 7200 0 EET}
-    {2027368800 10800 1 EEST}
-    {2042485200 7200 0 EET}
-    {2058818400 10800 1 EEST}
-    {2073934800 7200 0 EET}
-    {2090268000 10800 1 EEST}
-    {2105989200 7200 0 EET}
-    {2121717600 10800 1 EEST}
-    {2137438800 7200 0 EET}
-    {2153167200 10800 1 EEST}
-    {2168888400 7200 0 EET}
-    {2185221600 10800 1 EEST}
-    {2200338000 7200 0 EET}
-    {2216671200 10800 1 EEST}
-    {2231787600 7200 0 EET}
-    {2248120800 10800 1 EEST}
-    {2263842000 7200 0 EET}
-    {2279570400 10800 1 EEST}
-    {2295291600 7200 0 EET}
-    {2311020000 10800 1 EEST}
-    {2326741200 7200 0 EET}
-    {2343074400 10800 1 EEST}
-    {2358190800 7200 0 EET}
-    {2374524000 10800 1 EEST}
-    {2389640400 7200 0 EET}
-    {2405973600 10800 1 EEST}
-    {2421090000 7200 0 EET}
-    {2437423200 10800 1 EEST}
-    {2453144400 7200 0 EET}
-    {2468872800 10800 1 EEST}
-    {2484594000 7200 0 EET}
-    {2500322400 10800 1 EEST}
-    {2516043600 7200 0 EET}
-    {2532376800 10800 1 EEST}
-    {2547493200 7200 0 EET}
-    {2563826400 10800 1 EEST}
-    {2578942800 7200 0 EET}
-    {2595276000 10800 1 EEST}
-    {2610997200 7200 0 EET}
-    {2626725600 10800 1 EEST}
-    {2642446800 7200 0 EET}
-    {2658175200 10800 1 EEST}
-    {2673896400 7200 0 EET}
-    {2689624800 10800 1 EEST}
-    {2705346000 7200 0 EET}
-    {2721679200 10800 1 EEST}
-    {2736795600 7200 0 EET}
-    {2753128800 10800 1 EEST}
-    {2768245200 7200 0 EET}
-    {2784578400 10800 1 EEST}
-    {2800299600 7200 0 EET}
-    {2816028000 10800 1 EEST}
-    {2831749200 7200 0 EET}
-    {2847477600 10800 1 EEST}
-    {2863198800 7200 0 EET}
-    {2879532000 10800 1 EEST}
-    {2894648400 7200 0 EET}
-    {2910981600 10800 1 EEST}
-    {2926098000 7200 0 EET}
-    {2942431200 10800 1 EEST}
-    {2957547600 7200 0 EET}
-    {2973880800 10800 1 EEST}
-    {2989602000 7200 0 EET}
-    {3005330400 10800 1 EEST}
-    {3021051600 7200 0 EET}
-    {3036780000 10800 1 EEST}
-    {3052501200 7200 0 EET}
-    {3068834400 10800 1 EEST}
-    {3083950800 7200 0 EET}
-    {3100284000 10800 1 EEST}
-    {3115400400 7200 0 EET}
-    {3131733600 10800 1 EEST}
-    {3147454800 7200 0 EET}
-    {3163183200 10800 1 EEST}
-    {3178904400 7200 0 EET}
-    {3194632800 10800 1 EEST}
-    {3210354000 7200 0 EET}
-    {3226687200 10800 1 EEST}
-    {3241803600 7200 0 EET}
-    {3258136800 10800 1 EEST}
-    {3273253200 7200 0 EET}
-    {3289586400 10800 1 EEST}
-    {3304702800 7200 0 EET}
-    {3321036000 10800 1 EEST}
-    {3336757200 7200 0 EET}
-    {3352485600 10800 1 EEST}
-    {3368206800 7200 0 EET}
-    {3383935200 10800 1 EEST}
-    {3399656400 7200 0 EET}
-    {3415989600 10800 1 EEST}
-    {3431106000 7200 0 EET}
-    {3447439200 10800 1 EEST}
-    {3462555600 7200 0 EET}
-    {3478888800 10800 1 EEST}
-    {3494610000 7200 0 EET}
-    {3510338400 10800 1 EEST}
-    {3526059600 7200 0 EET}
-    {3541788000 10800 1 EEST}
-    {3557509200 7200 0 EET}
-    {3573237600 10800 1 EEST}
-    {3588958800 7200 0 EET}
-    {3605292000 10800 1 EEST}
-    {3620408400 7200 0 EET}
-    {3636741600 10800 1 EEST}
-    {3651858000 7200 0 EET}
-    {3668191200 10800 1 EEST}
-    {3683912400 7200 0 EET}
-    {3699640800 10800 1 EEST}
-    {3715362000 7200 0 EET}
-    {3731090400 10800 1 EEST}
-    {3746811600 7200 0 EET}
-    {3763144800 10800 1 EEST}
-    {3778261200 7200 0 EET}
-    {3794594400 10800 1 EEST}
-    {3809710800 7200 0 EET}
-    {3826044000 10800 1 EEST}
-    {3841160400 7200 0 EET}
-    {3857493600 10800 1 EEST}
-    {3873214800 7200 0 EET}
-    {3888943200 10800 1 EEST}
-    {3904664400 7200 0 EET}
-    {3920392800 10800 1 EEST}
-    {3936114000 7200 0 EET}
-    {3952447200 10800 1 EEST}
-    {3967563600 7200 0 EET}
-    {3983896800 10800 1 EEST}
-    {3999013200 7200 0 EET}
-    {4015346400 10800 1 EEST}
-    {4031067600 7200 0 EET}
-    {4046796000 10800 1 EEST}
-    {4062517200 7200 0 EET}
-    {4078245600 10800 1 EEST}
-    {4093966800 7200 0 EET}
+    {1414098000 7200 0 EET}
+    {1427493600 10800 1 EEST}
+    {1445547600 7200 0 EET}
+    {1458943200 10800 1 EEST}
+    {1476997200 7200 0 EET}
+    {1490997600 10800 1 EEST}
+    {1509051600 7200 0 EET}
+    {1522447200 10800 1 EEST}
+    {1540501200 7200 0 EET}
+    {1553896800 10800 1 EEST}
+    {1571950800 7200 0 EET}
+    {1585346400 10800 1 EEST}
+    {1603400400 7200 0 EET}
+    {1616796000 10800 1 EEST}
+    {1634850000 7200 0 EET}
+    {1648245600 10800 1 EEST}
+    {1666299600 7200 0 EET}
+    {1680300000 10800 1 EEST}
+    {1698354000 7200 0 EET}
+    {1711749600 10800 1 EEST}
+    {1729803600 7200 0 EET}
+    {1743199200 10800 1 EEST}
+    {1761253200 7200 0 EET}
+    {1774648800 10800 1 EEST}
+    {1792702800 7200 0 EET}
+    {1806098400 10800 1 EEST}
+    {1824152400 7200 0 EET}
+    {1838152800 10800 1 EEST}
+    {1856206800 7200 0 EET}
+    {1869602400 10800 1 EEST}
+    {1887656400 7200 0 EET}
+    {1901052000 10800 1 EEST}
+    {1919106000 7200 0 EET}
+    {1932501600 10800 1 EEST}
+    {1950555600 7200 0 EET}
+    {1963951200 10800 1 EEST}
+    {1982005200 7200 0 EET}
+    {1995400800 10800 1 EEST}
+    {2013454800 7200 0 EET}
+    {2027455200 10800 1 EEST}
+    {2045509200 7200 0 EET}
+    {2058904800 10800 1 EEST}
+    {2076958800 7200 0 EET}
+    {2090354400 10800 1 EEST}
+    {2108408400 7200 0 EET}
+    {2121804000 10800 1 EEST}
+    {2139858000 7200 0 EET}
+    {2153253600 10800 1 EEST}
+    {2171307600 7200 0 EET}
+    {2184703200 10800 1 EEST}
+    {2202757200 7200 0 EET}
+    {2216757600 10800 1 EEST}
+    {2234811600 7200 0 EET}
+    {2248207200 10800 1 EEST}
+    {2266261200 7200 0 EET}
+    {2279656800 10800 1 EEST}
+    {2297710800 7200 0 EET}
+    {2311106400 10800 1 EEST}
+    {2329160400 7200 0 EET}
+    {2342556000 10800 1 EEST}
+    {2360610000 7200 0 EET}
+    {2374610400 10800 1 EEST}
+    {2392664400 7200 0 EET}
+    {2406060000 10800 1 EEST}
+    {2424114000 7200 0 EET}
+    {2437509600 10800 1 EEST}
+    {2455563600 7200 0 EET}
+    {2468959200 10800 1 EEST}
+    {2487013200 7200 0 EET}
+    {2500408800 10800 1 EEST}
+    {2518462800 7200 0 EET}
+    {2531858400 10800 1 EEST}
+    {2549912400 7200 0 EET}
+    {2563912800 10800 1 EEST}
+    {2581966800 7200 0 EET}
+    {2595362400 10800 1 EEST}
+    {2613416400 7200 0 EET}
+    {2626812000 10800 1 EEST}
+    {2644866000 7200 0 EET}
+    {2658261600 10800 1 EEST}
+    {2676315600 7200 0 EET}
+    {2689711200 10800 1 EEST}
+    {2707765200 7200 0 EET}
+    {2721765600 10800 1 EEST}
+    {2739819600 7200 0 EET}
+    {2753215200 10800 1 EEST}
+    {2771269200 7200 0 EET}
+    {2784664800 10800 1 EEST}
+    {2802718800 7200 0 EET}
+    {2816114400 10800 1 EEST}
+    {2834168400 7200 0 EET}
+    {2847564000 10800 1 EEST}
+    {2865618000 7200 0 EET}
+    {2879013600 10800 1 EEST}
+    {2897067600 7200 0 EET}
+    {2911068000 10800 1 EEST}
+    {2929122000 7200 0 EET}
+    {2942517600 10800 1 EEST}
+    {2960571600 7200 0 EET}
+    {2973967200 10800 1 EEST}
+    {2992021200 7200 0 EET}
+    {3005416800 10800 1 EEST}
+    {3023470800 7200 0 EET}
+    {3036866400 10800 1 EEST}
+    {3054920400 7200 0 EET}
+    {3068316000 10800 1 EEST}
+    {3086370000 7200 0 EET}
+    {3100370400 10800 1 EEST}
+    {3118424400 7200 0 EET}
+    {3131820000 10800 1 EEST}
+    {3149874000 7200 0 EET}
+    {3163269600 10800 1 EEST}
+    {3181323600 7200 0 EET}
+    {3194719200 10800 1 EEST}
+    {3212773200 7200 0 EET}
+    {3226168800 10800 1 EEST}
+    {3244222800 7200 0 EET}
+    {3258223200 10800 1 EEST}
+    {3276277200 7200 0 EET}
+    {3289672800 10800 1 EEST}
+    {3307726800 7200 0 EET}
+    {3321122400 10800 1 EEST}
+    {3339176400 7200 0 EET}
+    {3352572000 10800 1 EEST}
+    {3370626000 7200 0 EET}
+    {3384021600 10800 1 EEST}
+    {3402075600 7200 0 EET}
+    {3415471200 10800 1 EEST}
+    {3433525200 7200 0 EET}
+    {3447525600 10800 1 EEST}
+    {3465579600 7200 0 EET}
+    {3478975200 10800 1 EEST}
+    {3497029200 7200 0 EET}
+    {3510424800 10800 1 EEST}
+    {3528478800 7200 0 EET}
+    {3541874400 10800 1 EEST}
+    {3559928400 7200 0 EET}
+    {3573324000 10800 1 EEST}
+    {3591378000 7200 0 EET}
+    {3605378400 10800 1 EEST}
+    {3623432400 7200 0 EET}
+    {3636828000 10800 1 EEST}
+    {3654882000 7200 0 EET}
+    {3668277600 10800 1 EEST}
+    {3686331600 7200 0 EET}
+    {3699727200 10800 1 EEST}
+    {3717781200 7200 0 EET}
+    {3731176800 10800 1 EEST}
+    {3749230800 7200 0 EET}
+    {3762626400 10800 1 EEST}
+    {3780680400 7200 0 EET}
+    {3794680800 10800 1 EEST}
+    {3812734800 7200 0 EET}
+    {3826130400 10800 1 EEST}
+    {3844184400 7200 0 EET}
+    {3857580000 10800 1 EEST}
+    {3875634000 7200 0 EET}
+    {3889029600 10800 1 EEST}
+    {3907083600 7200 0 EET}
+    {3920479200 10800 1 EEST}
+    {3938533200 7200 0 EET}
+    {3951928800 10800 1 EEST}
+    {3969982800 7200 0 EET}
+    {3983983200 10800 1 EEST}
+    {4002037200 7200 0 EET}
+    {4015432800 10800 1 EEST}
+    {4033486800 7200 0 EET}
+    {4046882400 10800 1 EEST}
+    {4064936400 7200 0 EET}
+    {4078332000 10800 1 EEST}
+    {4096386000 7200 0 EET}
 }
diff --git a/library/tzdata/Asia/Hebron b/library/tzdata/Asia/Hebron
index 900ffad..9049d93 100644
--- a/library/tzdata/Asia/Hebron
+++ b/library/tzdata/Asia/Hebron
@@ -103,175 +103,175 @@ set TZData(:Asia/Hebron) {
     {1364508000 10800 1 EEST}
     {1380229200 7200 0 EET}
     {1395957600 10800 1 EEST}
-    {1411678800 7200 0 EET}
-    {1427407200 10800 1 EEST}
-    {1443128400 7200 0 EET}
-    {1459461600 10800 1 EEST}
-    {1474578000 7200 0 EET}
-    {1490911200 10800 1 EEST}
-    {1506027600 7200 0 EET}
-    {1522360800 10800 1 EEST}
-    {1537477200 7200 0 EET}
-    {1553810400 10800 1 EEST}
-    {1569531600 7200 0 EET}
-    {1585260000 10800 1 EEST}
-    {1600981200 7200 0 EET}
-    {1616709600 10800 1 EEST}
-    {1632430800 7200 0 EET}
-    {1648764000 10800 1 EEST}
-    {1663880400 7200 0 EET}
-    {1680213600 10800 1 EEST}
-    {1695330000 7200 0 EET}
-    {1711663200 10800 1 EEST}
-    {1727384400 7200 0 EET}
-    {1743112800 10800 1 EEST}
-    {1758834000 7200 0 EET}
-    {1774562400 10800 1 EEST}
-    {1790283600 7200 0 EET}
-    {1806012000 10800 1 EEST}
-    {1821733200 7200 0 EET}
-    {1838066400 10800 1 EEST}
-    {1853182800 7200 0 EET}
-    {1869516000 10800 1 EEST}
-    {1884632400 7200 0 EET}
-    {1900965600 10800 1 EEST}
-    {1916686800 7200 0 EET}
-    {1932415200 10800 1 EEST}
-    {1948136400 7200 0 EET}
-    {1963864800 10800 1 EEST}
-    {1979586000 7200 0 EET}
-    {1995919200 10800 1 EEST}
-    {2011035600 7200 0 EET}
-    {2027368800 10800 1 EEST}
-    {2042485200 7200 0 EET}
-    {2058818400 10800 1 EEST}
-    {2073934800 7200 0 EET}
-    {2090268000 10800 1 EEST}
-    {2105989200 7200 0 EET}
-    {2121717600 10800 1 EEST}
-    {2137438800 7200 0 EET}
-    {2153167200 10800 1 EEST}
-    {2168888400 7200 0 EET}
-    {2185221600 10800 1 EEST}
-    {2200338000 7200 0 EET}
-    {2216671200 10800 1 EEST}
-    {2231787600 7200 0 EET}
-    {2248120800 10800 1 EEST}
-    {2263842000 7200 0 EET}
-    {2279570400 10800 1 EEST}
-    {2295291600 7200 0 EET}
-    {2311020000 10800 1 EEST}
-    {2326741200 7200 0 EET}
-    {2343074400 10800 1 EEST}
-    {2358190800 7200 0 EET}
-    {2374524000 10800 1 EEST}
-    {2389640400 7200 0 EET}
-    {2405973600 10800 1 EEST}
-    {2421090000 7200 0 EET}
-    {2437423200 10800 1 EEST}
-    {2453144400 7200 0 EET}
-    {2468872800 10800 1 EEST}
-    {2484594000 7200 0 EET}
-    {2500322400 10800 1 EEST}
-    {2516043600 7200 0 EET}
-    {2532376800 10800 1 EEST}
-    {2547493200 7200 0 EET}
-    {2563826400 10800 1 EEST}
-    {2578942800 7200 0 EET}
-    {2595276000 10800 1 EEST}
-    {2610997200 7200 0 EET}
-    {2626725600 10800 1 EEST}
-    {2642446800 7200 0 EET}
-    {2658175200 10800 1 EEST}
-    {2673896400 7200 0 EET}
-    {2689624800 10800 1 EEST}
-    {2705346000 7200 0 EET}
-    {2721679200 10800 1 EEST}
-    {2736795600 7200 0 EET}
-    {2753128800 10800 1 EEST}
-    {2768245200 7200 0 EET}
-    {2784578400 10800 1 EEST}
-    {2800299600 7200 0 EET}
-    {2816028000 10800 1 EEST}
-    {2831749200 7200 0 EET}
-    {2847477600 10800 1 EEST}
-    {2863198800 7200 0 EET}
-    {2879532000 10800 1 EEST}
-    {2894648400 7200 0 EET}
-    {2910981600 10800 1 EEST}
-    {2926098000 7200 0 EET}
-    {2942431200 10800 1 EEST}
-    {2957547600 7200 0 EET}
-    {2973880800 10800 1 EEST}
-    {2989602000 7200 0 EET}
-    {3005330400 10800 1 EEST}
-    {3021051600 7200 0 EET}
-    {3036780000 10800 1 EEST}
-    {3052501200 7200 0 EET}
-    {3068834400 10800 1 EEST}
-    {3083950800 7200 0 EET}
-    {3100284000 10800 1 EEST}
-    {3115400400 7200 0 EET}
-    {3131733600 10800 1 EEST}
-    {3147454800 7200 0 EET}
-    {3163183200 10800 1 EEST}
-    {3178904400 7200 0 EET}
-    {3194632800 10800 1 EEST}
-    {3210354000 7200 0 EET}
-    {3226687200 10800 1 EEST}
-    {3241803600 7200 0 EET}
-    {3258136800 10800 1 EEST}
-    {3273253200 7200 0 EET}
-    {3289586400 10800 1 EEST}
-    {3304702800 7200 0 EET}
-    {3321036000 10800 1 EEST}
-    {3336757200 7200 0 EET}
-    {3352485600 10800 1 EEST}
-    {3368206800 7200 0 EET}
-    {3383935200 10800 1 EEST}
-    {3399656400 7200 0 EET}
-    {3415989600 10800 1 EEST}
-    {3431106000 7200 0 EET}
-    {3447439200 10800 1 EEST}
-    {3462555600 7200 0 EET}
-    {3478888800 10800 1 EEST}
-    {3494610000 7200 0 EET}
-    {3510338400 10800 1 EEST}
-    {3526059600 7200 0 EET}
-    {3541788000 10800 1 EEST}
-    {3557509200 7200 0 EET}
-    {3573237600 10800 1 EEST}
-    {3588958800 7200 0 EET}
-    {3605292000 10800 1 EEST}
-    {3620408400 7200 0 EET}
-    {3636741600 10800 1 EEST}
-    {3651858000 7200 0 EET}
-    {3668191200 10800 1 EEST}
-    {3683912400 7200 0 EET}
-    {3699640800 10800 1 EEST}
-    {3715362000 7200 0 EET}
-    {3731090400 10800 1 EEST}
-    {3746811600 7200 0 EET}
-    {3763144800 10800 1 EEST}
-    {3778261200 7200 0 EET}
-    {3794594400 10800 1 EEST}
-    {3809710800 7200 0 EET}
-    {3826044000 10800 1 EEST}
-    {3841160400 7200 0 EET}
-    {3857493600 10800 1 EEST}
-    {3873214800 7200 0 EET}
-    {3888943200 10800 1 EEST}
-    {3904664400 7200 0 EET}
-    {3920392800 10800 1 EEST}
-    {3936114000 7200 0 EET}
-    {3952447200 10800 1 EEST}
-    {3967563600 7200 0 EET}
-    {3983896800 10800 1 EEST}
-    {3999013200 7200 0 EET}
-    {4015346400 10800 1 EEST}
-    {4031067600 7200 0 EET}
-    {4046796000 10800 1 EEST}
-    {4062517200 7200 0 EET}
-    {4078245600 10800 1 EEST}
-    {4093966800 7200 0 EET}
+    {1414098000 7200 0 EET}
+    {1427493600 10800 1 EEST}
+    {1445547600 7200 0 EET}
+    {1458943200 10800 1 EEST}
+    {1476997200 7200 0 EET}
+    {1490997600 10800 1 EEST}
+    {1509051600 7200 0 EET}
+    {1522447200 10800 1 EEST}
+    {1540501200 7200 0 EET}
+    {1553896800 10800 1 EEST}
+    {1571950800 7200 0 EET}
+    {1585346400 10800 1 EEST}
+    {1603400400 7200 0 EET}
+    {1616796000 10800 1 EEST}
+    {1634850000 7200 0 EET}
+    {1648245600 10800 1 EEST}
+    {1666299600 7200 0 EET}
+    {1680300000 10800 1 EEST}
+    {1698354000 7200 0 EET}
+    {1711749600 10800 1 EEST}
+    {1729803600 7200 0 EET}
+    {1743199200 10800 1 EEST}
+    {1761253200 7200 0 EET}
+    {1774648800 10800 1 EEST}
+    {1792702800 7200 0 EET}
+    {1806098400 10800 1 EEST}
+    {1824152400 7200 0 EET}
+    {1838152800 10800 1 EEST}
+    {1856206800 7200 0 EET}
+    {1869602400 10800 1 EEST}
+    {1887656400 7200 0 EET}
+    {1901052000 10800 1 EEST}
+    {1919106000 7200 0 EET}
+    {1932501600 10800 1 EEST}
+    {1950555600 7200 0 EET}
+    {1963951200 10800 1 EEST}
+    {1982005200 7200 0 EET}
+    {1995400800 10800 1 EEST}
+    {2013454800 7200 0 EET}
+    {2027455200 10800 1 EEST}
+    {2045509200 7200 0 EET}
+    {2058904800 10800 1 EEST}
+    {2076958800 7200 0 EET}
+    {2090354400 10800 1 EEST}
+    {2108408400 7200 0 EET}
+    {2121804000 10800 1 EEST}
+    {2139858000 7200 0 EET}
+    {2153253600 10800 1 EEST}
+    {2171307600 7200 0 EET}
+    {2184703200 10800 1 EEST}
+    {2202757200 7200 0 EET}
+    {2216757600 10800 1 EEST}
+    {2234811600 7200 0 EET}
+    {2248207200 10800 1 EEST}
+    {2266261200 7200 0 EET}
+    {2279656800 10800 1 EEST}
+    {2297710800 7200 0 EET}
+    {2311106400 10800 1 EEST}
+    {2329160400 7200 0 EET}
+    {2342556000 10800 1 EEST}
+    {2360610000 7200 0 EET}
+    {2374610400 10800 1 EEST}
+    {2392664400 7200 0 EET}
+    {2406060000 10800 1 EEST}
+    {2424114000 7200 0 EET}
+    {2437509600 10800 1 EEST}
+    {2455563600 7200 0 EET}
+    {2468959200 10800 1 EEST}
+    {2487013200 7200 0 EET}
+    {2500408800 10800 1 EEST}
+    {2518462800 7200 0 EET}
+    {2531858400 10800 1 EEST}
+    {2549912400 7200 0 EET}
+    {2563912800 10800 1 EEST}
+    {2581966800 7200 0 EET}
+    {2595362400 10800 1 EEST}
+    {2613416400 7200 0 EET}
+    {2626812000 10800 1 EEST}
+    {2644866000 7200 0 EET}
+    {2658261600 10800 1 EEST}
+    {2676315600 7200 0 EET}
+    {2689711200 10800 1 EEST}
+    {2707765200 7200 0 EET}
+    {2721765600 10800 1 EEST}
+    {2739819600 7200 0 EET}
+    {2753215200 10800 1 EEST}
+    {2771269200 7200 0 EET}
+    {2784664800 10800 1 EEST}
+    {2802718800 7200 0 EET}
+    {2816114400 10800 1 EEST}
+    {2834168400 7200 0 EET}
+    {2847564000 10800 1 EEST}
+    {2865618000 7200 0 EET}
+    {2879013600 10800 1 EEST}
+    {2897067600 7200 0 EET}
+    {2911068000 10800 1 EEST}
+    {2929122000 7200 0 EET}
+    {2942517600 10800 1 EEST}
+    {2960571600 7200 0 EET}
+    {2973967200 10800 1 EEST}
+    {2992021200 7200 0 EET}
+    {3005416800 10800 1 EEST}
+    {3023470800 7200 0 EET}
+    {3036866400 10800 1 EEST}
+    {3054920400 7200 0 EET}
+    {3068316000 10800 1 EEST}
+    {3086370000 7200 0 EET}
+    {3100370400 10800 1 EEST}
+    {3118424400 7200 0 EET}
+    {3131820000 10800 1 EEST}
+    {3149874000 7200 0 EET}
+    {3163269600 10800 1 EEST}
+    {3181323600 7200 0 EET}
+    {3194719200 10800 1 EEST}
+    {3212773200 7200 0 EET}
+    {3226168800 10800 1 EEST}
+    {3244222800 7200 0 EET}
+    {3258223200 10800 1 EEST}
+    {3276277200 7200 0 EET}
+    {3289672800 10800 1 EEST}
+    {3307726800 7200 0 EET}
+    {3321122400 10800 1 EEST}
+    {3339176400 7200 0 EET}
+    {3352572000 10800 1 EEST}
+    {3370626000 7200 0 EET}
+    {3384021600 10800 1 EEST}
+    {3402075600 7200 0 EET}
+    {3415471200 10800 1 EEST}
+    {3433525200 7200 0 EET}
+    {3447525600 10800 1 EEST}
+    {3465579600 7200 0 EET}
+    {3478975200 10800 1 EEST}
+    {3497029200 7200 0 EET}
+    {3510424800 10800 1 EEST}
+    {3528478800 7200 0 EET}
+    {3541874400 10800 1 EEST}
+    {3559928400 7200 0 EET}
+    {3573324000 10800 1 EEST}
+    {3591378000 7200 0 EET}
+    {3605378400 10800 1 EEST}
+    {3623432400 7200 0 EET}
+    {3636828000 10800 1 EEST}
+    {3654882000 7200 0 EET}
+    {3668277600 10800 1 EEST}
+    {3686331600 7200 0 EET}
+    {3699727200 10800 1 EEST}
+    {3717781200 7200 0 EET}
+    {3731176800 10800 1 EEST}
+    {3749230800 7200 0 EET}
+    {3762626400 10800 1 EEST}
+    {3780680400 7200 0 EET}
+    {3794680800 10800 1 EEST}
+    {3812734800 7200 0 EET}
+    {3826130400 10800 1 EEST}
+    {3844184400 7200 0 EET}
+    {3857580000 10800 1 EEST}
+    {3875634000 7200 0 EET}
+    {3889029600 10800 1 EEST}
+    {3907083600 7200 0 EET}
+    {3920479200 10800 1 EEST}
+    {3938533200 7200 0 EET}
+    {3951928800 10800 1 EEST}
+    {3969982800 7200 0 EET}
+    {3983983200 10800 1 EEST}
+    {4002037200 7200 0 EET}
+    {4015432800 10800 1 EEST}
+    {4033486800 7200 0 EET}
+    {4046882400 10800 1 EEST}
+    {4064936400 7200 0 EET}
+    {4078332000 10800 1 EEST}
+    {4096386000 7200 0 EET}
 }
diff --git a/library/tzdata/Asia/Hovd b/library/tzdata/Asia/Hovd
index 2a87dab..3d200a6 100644
--- a/library/tzdata/Asia/Hovd
+++ b/library/tzdata/Asia/Hovd
@@ -48,4 +48,174 @@ set TZData(:Asia/Hovd) {
     {1127498400 25200 0 HOVT}
     {1143226800 28800 1 HOVST}
     {1159552800 25200 0 HOVT}
+    {1427482800 28800 1 HOVST}
+    {1443196800 25200 0 HOVT}
+    {1458932400 28800 1 HOVST}
+    {1474646400 25200 0 HOVT}
+    {1490382000 28800 1 HOVST}
+    {1506700800 25200 0 HOVT}
+    {1522436400 28800 1 HOVST}
+    {1538150400 25200 0 HOVT}
+    {1553886000 28800 1 HOVST}
+    {1569600000 25200 0 HOVT}
+    {1585335600 28800 1 HOVST}
+    {1601049600 25200 0 HOVT}
+    {1616785200 28800 1 HOVST}
+    {1632499200 25200 0 HOVT}
+    {1648234800 28800 1 HOVST}
+    {1663948800 25200 0 HOVT}
+    {1679684400 28800 1 HOVST}
+    {1696003200 25200 0 HOVT}
+    {1711738800 28800 1 HOVST}
+    {1727452800 25200 0 HOVT}
+    {1743188400 28800 1 HOVST}
+    {1758902400 25200 0 HOVT}
+    {1774638000 28800 1 HOVST}
+    {1790352000 25200 0 HOVT}
+    {1806087600 28800 1 HOVST}
+    {1821801600 25200 0 HOVT}
+    {1837537200 28800 1 HOVST}
+    {1853856000 25200 0 HOVT}
+    {1869591600 28800 1 HOVST}
+    {1885305600 25200 0 HOVT}
+    {1901041200 28800 1 HOVST}
+    {1916755200 25200 0 HOVT}
+    {1932490800 28800 1 HOVST}
+    {1948204800 25200 0 HOVT}
+    {1963940400 28800 1 HOVST}
+    {1979654400 25200 0 HOVT}
+    {1995390000 28800 1 HOVST}
+    {2011104000 25200 0 HOVT}
+    {2026839600 28800 1 HOVST}
+    {2043158400 25200 0 HOVT}
+    {2058894000 28800 1 HOVST}
+    {2074608000 25200 0 HOVT}
+    {2090343600 28800 1 HOVST}
+    {2106057600 25200 0 HOVT}
+    {2121793200 28800 1 HOVST}
+    {2137507200 25200 0 HOVT}
+    {2153242800 28800 1 HOVST}
+    {2168956800 25200 0 HOVT}
+    {2184692400 28800 1 HOVST}
+    {2200406400 25200 0 HOVT}
+    {2216746800 28800 1 HOVST}
+    {2232460800 25200 0 HOVT}
+    {2248196400 28800 1 HOVST}
+    {2263910400 25200 0 HOVT}
+    {2279646000 28800 1 HOVST}
+    {2295360000 25200 0 HOVT}
+    {2311095600 28800 1 HOVST}
+    {2326809600 25200 0 HOVT}
+    {2342545200 28800 1 HOVST}
+    {2358259200 25200 0 HOVT}
+    {2373994800 28800 1 HOVST}
+    {2390313600 25200 0 HOVT}
+    {2406049200 28800 1 HOVST}
+    {2421763200 25200 0 HOVT}
+    {2437498800 28800 1 HOVST}
+    {2453212800 25200 0 HOVT}
+    {2468948400 28800 1 HOVST}
+    {2484662400 25200 0 HOVT}
+    {2500398000 28800 1 HOVST}
+    {2516112000 25200 0 HOVT}
+    {2531847600 28800 1 HOVST}
+    {2547561600 25200 0 HOVT}
+    {2563297200 28800 1 HOVST}
+    {2579616000 25200 0 HOVT}
+    {2595351600 28800 1 HOVST}
+    {2611065600 25200 0 HOVT}
+    {2626801200 28800 1 HOVST}
+    {2642515200 25200 0 HOVT}
+    {2658250800 28800 1 HOVST}
+    {2673964800 25200 0 HOVT}
+    {2689700400 28800 1 HOVST}
+    {2705414400 25200 0 HOVT}
+    {2721150000 28800 1 HOVST}
+    {2737468800 25200 0 HOVT}
+    {2753204400 28800 1 HOVST}
+    {2768918400 25200 0 HOVT}
+    {2784654000 28800 1 HOVST}
+    {2800368000 25200 0 HOVT}
+    {2816103600 28800 1 HOVST}
+    {2831817600 25200 0 HOVT}
+    {2847553200 28800 1 HOVST}
+    {2863267200 25200 0 HOVT}
+    {2879002800 28800 1 HOVST}
+    {2894716800 25200 0 HOVT}
+    {2910452400 28800 1 HOVST}
+    {2926771200 25200 0 HOVT}
+    {2942506800 28800 1 HOVST}
+    {2958220800 25200 0 HOVT}
+    {2973956400 28800 1 HOVST}
+    {2989670400 25200 0 HOVT}
+    {3005406000 28800 1 HOVST}
+    {3021120000 25200 0 HOVT}
+    {3036855600 28800 1 HOVST}
+    {3052569600 25200 0 HOVT}
+    {3068305200 28800 1 HOVST}
+    {3084019200 25200 0 HOVT}
+    {3100359600 28800 1 HOVST}
+    {3116073600 25200 0 HOVT}
+    {3131809200 28800 1 HOVST}
+    {3147523200 25200 0 HOVT}
+    {3163258800 28800 1 HOVST}
+    {3178972800 25200 0 HOVT}
+    {3194708400 28800 1 HOVST}
+    {3210422400 25200 0 HOVT}
+    {3226158000 28800 1 HOVST}
+    {3241872000 25200 0 HOVT}
+    {3257607600 28800 1 HOVST}
+    {3273926400 25200 0 HOVT}
+    {3289662000 28800 1 HOVST}
+    {3305376000 25200 0 HOVT}
+    {3321111600 28800 1 HOVST}
+    {3336825600 25200 0 HOVT}
+    {3352561200 28800 1 HOVST}
+    {3368275200 25200 0 HOVT}
+    {3384010800 28800 1 HOVST}
+    {3399724800 25200 0 HOVT}
+    {3415460400 28800 1 HOVST}
+    {3431174400 25200 0 HOVT}
+    {3446910000 28800 1 HOVST}
+    {3463228800 25200 0 HOVT}
+    {3478964400 28800 1 HOVST}
+    {3494678400 25200 0 HOVT}
+    {3510414000 28800 1 HOVST}
+    {3526128000 25200 0 HOVT}
+    {3541863600 28800 1 HOVST}
+    {3557577600 25200 0 HOVT}
+    {3573313200 28800 1 HOVST}
+    {3589027200 25200 0 HOVT}
+    {3604762800 28800 1 HOVST}
+    {3621081600 25200 0 HOVT}
+    {3636817200 28800 1 HOVST}
+    {3652531200 25200 0 HOVT}
+    {3668266800 28800 1 HOVST}
+    {3683980800 25200 0 HOVT}
+    {3699716400 28800 1 HOVST}
+    {3715430400 25200 0 HOVT}
+    {3731166000 28800 1 HOVST}
+    {3746880000 25200 0 HOVT}
+    {3762615600 28800 1 HOVST}
+    {3778329600 25200 0 HOVT}
+    {3794065200 28800 1 HOVST}
+    {3810384000 25200 0 HOVT}
+    {3826119600 28800 1 HOVST}
+    {3841833600 25200 0 HOVT}
+    {3857569200 28800 1 HOVST}
+    {3873283200 25200 0 HOVT}
+    {3889018800 28800 1 HOVST}
+    {3904732800 25200 0 HOVT}
+    {3920468400 28800 1 HOVST}
+    {3936182400 25200 0 HOVT}
+    {3951918000 28800 1 HOVST}
+    {3967632000 25200 0 HOVT}
+    {3983972400 28800 1 HOVST}
+    {3999686400 25200 0 HOVT}
+    {4015422000 28800 1 HOVST}
+    {4031136000 25200 0 HOVT}
+    {4046871600 28800 1 HOVST}
+    {4062585600 25200 0 HOVT}
+    {4078321200 28800 1 HOVST}
+    {4094035200 25200 0 HOVT}
 }
diff --git a/library/tzdata/Asia/Ulaanbaatar b/library/tzdata/Asia/Ulaanbaatar
index fef76ec..93e066c 100644
--- a/library/tzdata/Asia/Ulaanbaatar
+++ b/library/tzdata/Asia/Ulaanbaatar
@@ -48,4 +48,174 @@ set TZData(:Asia/Ulaanbaatar) {
     {1127494800 28800 0 ULAT}
     {1143223200 32400 1 ULAST}
     {1159549200 28800 0 ULAT}
+    {1427479200 32400 1 ULAST}
+    {1443193200 28800 0 ULAT}
+    {1458928800 32400 1 ULAST}
+    {1474642800 28800 0 ULAT}
+    {1490378400 32400 1 ULAST}
+    {1506697200 28800 0 ULAT}
+    {1522432800 32400 1 ULAST}
+    {1538146800 28800 0 ULAT}
+    {1553882400 32400 1 ULAST}
+    {1569596400 28800 0 ULAT}
+    {1585332000 32400 1 ULAST}
+    {1601046000 28800 0 ULAT}
+    {1616781600 32400 1 ULAST}
+    {1632495600 28800 0 ULAT}
+    {1648231200 32400 1 ULAST}
+    {1663945200 28800 0 ULAT}
+    {1679680800 32400 1 ULAST}
+    {1695999600 28800 0 ULAT}
+    {1711735200 32400 1 ULAST}
+    {1727449200 28800 0 ULAT}
+    {1743184800 32400 1 ULAST}
+    {1758898800 28800 0 ULAT}
+    {1774634400 32400 1 ULAST}
+    {1790348400 28800 0 ULAT}
+    {1806084000 32400 1 ULAST}
+    {1821798000 28800 0 ULAT}
+    {1837533600 32400 1 ULAST}
+    {1853852400 28800 0 ULAT}
+    {1869588000 32400 1 ULAST}
+    {1885302000 28800 0 ULAT}
+    {1901037600 32400 1 ULAST}
+    {1916751600 28800 0 ULAT}
+    {1932487200 32400 1 ULAST}
+    {1948201200 28800 0 ULAT}
+    {1963936800 32400 1 ULAST}
+    {1979650800 28800 0 ULAT}
+    {1995386400 32400 1 ULAST}
+    {2011100400 28800 0 ULAT}
+    {2026836000 32400 1 ULAST}
+    {2043154800 28800 0 ULAT}
+    {2058890400 32400 1 ULAST}
+    {2074604400 28800 0 ULAT}
+    {2090340000 32400 1 ULAST}
+    {2106054000 28800 0 ULAT}
+    {2121789600 32400 1 ULAST}
+    {2137503600 28800 0 ULAT}
+    {2153239200 32400 1 ULAST}
+    {2168953200 28800 0 ULAT}
+    {2184688800 32400 1 ULAST}
+    {2200402800 28800 0 ULAT}
+    {2216743200 32400 1 ULAST}
+    {2232457200 28800 0 ULAT}
+    {2248192800 32400 1 ULAST}
+    {2263906800 28800 0 ULAT}
+    {2279642400 32400 1 ULAST}
+    {2295356400 28800 0 ULAT}
+    {2311092000 32400 1 ULAST}
+    {2326806000 28800 0 ULAT}
+    {2342541600 32400 1 ULAST}
+    {2358255600 28800 0 ULAT}
+    {2373991200 32400 1 ULAST}
+    {2390310000 28800 0 ULAT}
+    {2406045600 32400 1 ULAST}
+    {2421759600 28800 0 ULAT}
+    {2437495200 32400 1 ULAST}
+    {2453209200 28800 0 ULAT}
+    {2468944800 32400 1 ULAST}
+    {2484658800 28800 0 ULAT}
+    {2500394400 32400 1 ULAST}
+    {2516108400 28800 0 ULAT}
+    {2531844000 32400 1 ULAST}
+    {2547558000 28800 0 ULAT}
+    {2563293600 32400 1 ULAST}
+    {2579612400 28800 0 ULAT}
+    {2595348000 32400 1 ULAST}
+    {2611062000 28800 0 ULAT}
+    {2626797600 32400 1 ULAST}
+    {2642511600 28800 0 ULAT}
+    {2658247200 32400 1 ULAST}
+    {2673961200 28800 0 ULAT}
+    {2689696800 32400 1 ULAST}
+    {2705410800 28800 0 ULAT}
+    {2721146400 32400 1 ULAST}
+    {2737465200 28800 0 ULAT}
+    {2753200800 32400 1 ULAST}
+    {2768914800 28800 0 ULAT}
+    {2784650400 32400 1 ULAST}
+    {2800364400 28800 0 ULAT}
+    {2816100000 32400 1 ULAST}
+    {2831814000 28800 0 ULAT}
+    {2847549600 32400 1 ULAST}
+    {2863263600 28800 0 ULAT}
+    {2878999200 32400 1 ULAST}
+    {2894713200 28800 0 ULAT}
+    {2910448800 32400 1 ULAST}
+    {2926767600 28800 0 ULAT}
+    {2942503200 32400 1 ULAST}
+    {2958217200 28800 0 ULAT}
+    {2973952800 32400 1 ULAST}
+    {2989666800 28800 0 ULAT}
+    {3005402400 32400 1 ULAST}
+    {3021116400 28800 0 ULAT}
+    {3036852000 32400 1 ULAST}
+    {3052566000 28800 0 ULAT}
+    {3068301600 32400 1 ULAST}
+    {3084015600 28800 0 ULAT}
+    {3100356000 32400 1 ULAST}
+    {3116070000 28800 0 ULAT}
+    {3131805600 32400 1 ULAST}
+    {3147519600 28800 0 ULAT}
+    {3163255200 32400 1 ULAST}
+    {3178969200 28800 0 ULAT}
+    {3194704800 32400 1 ULAST}
+    {3210418800 28800 0 ULAT}
+    {3226154400 32400 1 ULAST}
+    {3241868400 28800 0 ULAT}
+    {3257604000 32400 1 ULAST}
+    {3273922800 28800 0 ULAT}
+    {3289658400 32400 1 ULAST}
+    {3305372400 28800 0 ULAT}
+    {3321108000 32400 1 ULAST}
+    {3336822000 28800 0 ULAT}
+    {3352557600 32400 1 ULAST}
+    {3368271600 28800 0 ULAT}
+    {3384007200 32400 1 ULAST}
+    {3399721200 28800 0 ULAT}
+    {3415456800 32400 1 ULAST}
+    {3431170800 28800 0 ULAT}
+    {3446906400 32400 1 ULAST}
+    {3463225200 28800 0 ULAT}
+    {3478960800 32400 1 ULAST}
+    {3494674800 28800 0 ULAT}
+    {3510410400 32400 1 ULAST}
+    {3526124400 28800 0 ULAT}
+    {3541860000 32400 1 ULAST}
+    {3557574000 28800 0 ULAT}
+    {3573309600 32400 1 ULAST}
+    {3589023600 28800 0 ULAT}
+    {3604759200 32400 1 ULAST}
+    {3621078000 28800 0 ULAT}
+    {3636813600 32400 1 ULAST}
+    {3652527600 28800 0 ULAT}
+    {3668263200 32400 1 ULAST}
+    {3683977200 28800 0 ULAT}
+    {3699712800 32400 1 ULAST}
+    {3715426800 28800 0 ULAT}
+    {3731162400 32400 1 ULAST}
+    {3746876400 28800 0 ULAT}
+    {3762612000 32400 1 ULAST}
+    {3778326000 28800 0 ULAT}
+    {3794061600 32400 1 ULAST}
+    {3810380400 28800 0 ULAT}
+    {3826116000 32400 1 ULAST}
+    {3841830000 28800 0 ULAT}
+    {3857565600 32400 1 ULAST}
+    {3873279600 28800 0 ULAT}
+    {3889015200 32400 1 ULAST}
+    {3904729200 28800 0 ULAT}
+    {3920464800 32400 1 ULAST}
+    {3936178800 28800 0 ULAT}
+    {3951914400 32400 1 ULAST}
+    {3967628400 28800 0 ULAT}
+    {3983968800 32400 1 ULAST}
+    {3999682800 28800 0 ULAT}
+    {4015418400 32400 1 ULAST}
+    {4031132400 28800 0 ULAT}
+    {4046868000 32400 1 ULAST}
+    {4062582000 28800 0 ULAT}
+    {4078317600 32400 1 ULAST}
+    {4094031600 28800 0 ULAT}
 }
diff --git a/library/tzdata/Europe/Volgograd b/library/tzdata/Europe/Volgograd
index 8c29c58..d71fb0b 100644
--- a/library/tzdata/Europe/Volgograd
+++ b/library/tzdata/Europe/Volgograd
@@ -28,43 +28,43 @@ set TZData(:Europe/Volgograd) {
     {638319600 14400 1 VOLST}
     {654649200 10800 0 VOLT}
     {670374000 14400 0 VOLT}
-    {701820000 14400 0 MSK}
+    {701820000 14400 0 MSD}
     {717534000 10800 0 MSK}
-    {733273200 14400 1 MSK}
+    {733273200 14400 1 MSD}
     {748998000 10800 0 MSK}
-    {764722800 14400 1 MSK}
+    {764722800 14400 1 MSD}
     {780447600 10800 0 MSK}
-    {796172400 14400 1 MSK}
+    {796172400 14400 1 MSD}
     {811897200 10800 0 MSK}
-    {828226800 14400 1 MSK}
+    {828226800 14400 1 MSD}
     {846370800 10800 0 MSK}
-    {859676400 14400 1 MSK}
+    {859676400 14400 1 MSD}
     {877820400 10800 0 MSK}
-    {891126000 14400 1 MSK}
+    {891126000 14400 1 MSD}
     {909270000 10800 0 MSK}
-    {922575600 14400 1 MSK}
+    {922575600 14400 1 MSD}
     {941324400 10800 0 MSK}
-    {954025200 14400 1 MSK}
+    {954025200 14400 1 MSD}
     {972774000 10800 0 MSK}
-    {985474800 14400 1 MSK}
+    {985474800 14400 1 MSD}
     {1004223600 10800 0 MSK}
-    {1017529200 14400 1 MSK}
+    {1017529200 14400 1 MSD}
     {1035673200 10800 0 MSK}
-    {1048978800 14400 1 MSK}
+    {1048978800 14400 1 MSD}
     {1067122800 10800 0 MSK}
-    {1080428400 14400 1 MSK}
+    {1080428400 14400 1 MSD}
     {1099177200 10800 0 MSK}
-    {1111878000 14400 1 MSK}
+    {1111878000 14400 1 MSD}
     {1130626800 10800 0 MSK}
-    {1143327600 14400 1 MSK}
+    {1143327600 14400 1 MSD}
     {1162076400 10800 0 MSK}
-    {1174777200 14400 1 MSK}
+    {1174777200 14400 1 MSD}
     {1193526000 10800 0 MSK}
-    {1206831600 14400 1 MSK}
+    {1206831600 14400 1 MSD}
     {1224975600 10800 0 MSK}
-    {1238281200 14400 1 MSK}
+    {1238281200 14400 1 MSD}
     {1256425200 10800 0 MSK}
-    {1269730800 14400 1 MSK}
+    {1269730800 14400 1 MSD}
     {1288479600 10800 0 MSK}
     {1301180400 14400 0 MSK}
     {1414274400 10800 0 MSK}
diff --git a/library/tzdata/Pacific/Easter b/library/tzdata/Pacific/Easter
index f76594a..4b45ba2 100644
--- a/library/tzdata/Pacific/Easter
+++ b/library/tzdata/Pacific/Easter
@@ -1,14 +1,9 @@
 # created by tools/tclZIC.tcl - do not edit
 
 set TZData(:Pacific/Easter) {
-    {-9223372036854775808 -26264 0 LMT}
-    {-2524495336 -26248 0 EMT}
-    {-1178124152 -21600 0 EASST}
-    {-870552000 -25200 0 EAST}
-    {-865278000 -21600 1 EASST}
-    {-740520000 -21600 1 EASST}
-    {-736376400 -25200 0 EAST}
-    {-718056000 -25200 0 EAST}
+    {-9223372036854775808 -26248 0 LMT}
+    {-2524495352 -26248 0 EMT}
+    {-1178124152 -25200 0 EAST}
     {-36619200 -21600 1 EASST}
     {-23922000 -25200 0 EAST}
     {-3355200 -21600 1 EASST}
@@ -36,7 +31,6 @@ set TZData(:Pacific/Easter) {
     {340171200 -21600 1 EASST}
     {353473200 -25200 0 EAST}
     {371620800 -21600 1 EASST}
-    {384836400 -18000 0 EAST}
     {384922800 -21600 0 EAST}
     {403070400 -18000 1 EASST}
     {416372400 -21600 0 EAST}
@@ -50,10 +44,10 @@ set TZData(:Pacific/Easter) {
     {545194800 -21600 0 EAST}
     {560923200 -18000 1 EASST}
     {574225200 -21600 0 EAST}
-    {591768000 -18000 1 EASST}
+    {592372800 -18000 1 EASST}
     {605674800 -21600 0 EAST}
     {624427200 -18000 1 EASST}
-    {637729200 -21600 0 EAST}
+    {637124400 -21600 0 EAST}
     {653457600 -18000 1 EASST}
     {668574000 -21600 0 EAST}
     {687326400 -18000 1 EASST}
diff --git a/library/tzdata/Pacific/Midway b/library/tzdata/Pacific/Midway
index c07b030..d044569 100644
--- a/library/tzdata/Pacific/Midway
+++ b/library/tzdata/Pacific/Midway
@@ -1,10 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Pacific/Midway) {
-    {-9223372036854775808 -42568 0 LMT}
-    {-2177410232 -39600 0 NST}
-    {-428504400 -36000 1 NDT}
-    {-420645600 -39600 0 NST}
-    {-86878800 -39600 0 BST}
-    {439038000 -39600 0 SST}
+if {![info exists TZData(Pacific/Pago_Pago)]} {
+    LoadTimeZoneFile Pacific/Pago_Pago
 }
+set TZData(:Pacific/Midway) $TZData(:Pacific/Pago_Pago)
diff --git a/library/tzdata/Pacific/Saipan b/library/tzdata/Pacific/Saipan
index b799298..4e769cd 100644
--- a/library/tzdata/Pacific/Saipan
+++ b/library/tzdata/Pacific/Saipan
@@ -1,9 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Pacific/Saipan) {
-    {-9223372036854775808 -51420 0 LMT}
-    {-3944626980 34980 0 LMT}
-    {-2177487780 32400 0 MPT}
-    {-7981200 36000 0 MPT}
-    {977493600 36000 0 ChST}
+if {![info exists TZData(Pacific/Guam)]} {
+    LoadTimeZoneFile Pacific/Guam
 }
+set TZData(:Pacific/Saipan) $TZData(:Pacific/Guam)
diff --git a/tests/http11.test b/tests/http11.test
index 230ce5a..c9ded0b 100644
--- a/tests/http11.test
+++ b/tests/http11.test
@@ -70,11 +70,8 @@ proc check_crc {tok args} {
     return "ok"
 }
 
-makeFile "<html><head><title>test</title></head>\
-<body><p>this is a test</p>\n\
-[string repeat {<p>This is a tcl test file.</p>} 4192]\n\
-</body></html>" testdoc.html
-
+makeFile "<html><head><title>test</title></head><body><p>this is a test</p>\n[string repeat {<p>This is a tcl test file.</p>} 4192]\n</body></html>" testdoc.html
+
 # -------------------------------------------------------------------------
 
 test http11-1.0 "normal request for document " -setup {
@@ -447,7 +444,8 @@ test http11-2.10 "-channel,deflate,keepalive" -setup {
     set chan [open [makeFile {} testfile.tmp] wb+]
 } -body {
     set tok [http::geturl http://localhost:$httpd_port/testdoc.html \
-                 -timeout 5000 -channel $chan -keepalive 1]
+                 -timeout 5000 -channel $chan -keepalive 1 \
+		 -headers {accept-encoding deflate}]
     http::wait $tok
     seek $chan 0
     set data [read $chan]
@@ -482,6 +480,27 @@ test http11-2.11 "-channel,identity,keepalive" -setup {
     halt_httpd
 } -result {ok {HTTP/1.1 200 OK} ok {} {} chunked}
 
+test http11-2.12 "-channel,negotiate,keepalive" -setup {
+    variable httpd [create_httpd]
+    set chan [open [makeFile {} testfile.tmp] wb+]
+} -body {
+    set tok [http::geturl http://localhost:$httpd_port/testdoc.html \
+                 -timeout 5000 -channel $chan -keepalive 1]
+    http::wait $tok
+    seek $chan 0
+    set data [read $chan]
+    list [http::status $tok] [http::code $tok] [check_crc $tok $data]\
+        [meta $tok connection] [meta $tok content-encoding]\
+        [meta $tok transfer-encoding] [meta $tok x-requested-encodings]\
+        [expr {[file size testdoc.html]-[file size testfile.tmp]}]
+} -cleanup {
+    http::cleanup $tok
+    close $chan
+    removeFile testfile.tmp
+    halt_httpd
+} -result {ok {HTTP/1.1 200 OK} ok {} gzip chunked gzip,deflate,compress 0}
+
+
 # -------------------------------------------------------------------------
 #
 # The following tests for the -handler option will require changes in
@@ -644,7 +663,7 @@ test http11-4.3 "normal post request, check channel query length" -setup {
     removeFile testfile.tmp
     halt_httpd
 } -result {status ok code {HTTP/1.1 200 OK} crc ok connection close query-length 122880}
-
+
 # -------------------------------------------------------------------------
 
 foreach p {create_httpd httpd_read halt_httpd meta check_crc} {
diff --git a/tests/httpd11.tcl b/tests/httpd11.tcl
index 9c543dc..267f409 100644
--- a/tests/httpd11.tcl
+++ b/tests/httpd11.tcl
@@ -158,13 +158,13 @@ proc Service {chan addr port} {
         }
         
         if {$protocol eq "HTTP/1.1"} {
-            if {[string match "*deflate*" [dict get? $meta accept-encoding]]} {
-                set encoding deflate
-            } elseif {[string match "*gzip*" [dict get? $meta accept-encoding]]} {
-                set encoding gzip
-            } elseif {[string match "*compress*" [dict get? $meta accept-encoding]]} {
-                set encoding compress
-            }
+	    foreach enc [split [dict get? $meta accept-encoding] ,] {
+		set enc [string trim $enc]
+		if {$enc in {deflate gzip compress}} {
+		    set encoding $enc
+		    break
+		}
+	    }
             set transfer chunked
         } else {
             set close 1
@@ -189,6 +189,7 @@ proc Service {chan addr port} {
         if {$close} {
             Puts $chan "connection: close"
         }
+	Puts $chan "x-requested-encodings: [dict get? $meta accept-encoding]"
         if {$encoding eq "identity"} {
             Puts $chan "content-length: [string length $data]"
         } else {
diff --git a/tests/io.test b/tests/io.test
index 06ae81d..6b6ad6d 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -1517,6 +1517,39 @@ test io-12.7 {ReadChars: too many chars read [bc5b790099]} {
     }
     close $c
 } {}
+test io-12.8 {ReadChars: multibyte chars split} {
+    set f [open $path(test1) w]
+    fconfigure $f -translation binary
+    puts -nonewline $f [string repeat a 9]\xc2\xa0
+    close $f
+    set f [open $path(test1)]
+    fconfigure $f -encoding utf-8 -buffersize 10
+    set in [read $f]
+    close $f
+    scan [string index $in end] %c
+} 160
+test io-12.9 {ReadChars: multibyte chars split} {
+    set f [open $path(test1) w]
+    fconfigure $f -translation binary
+    puts -nonewline $f [string repeat a 9]\xc2
+    close $f
+    set f [open $path(test1)]
+    fconfigure $f -encoding utf-8 -buffersize 10
+    set in [read $f]
+    close $f
+    scan [string index $in end] %c
+} 194
+test io-12.10 {ReadChars: multibyte chars split} {
+    set f [open $path(test1) w]
+    fconfigure $f -translation binary
+    puts -nonewline $f [string repeat a 9]\xc2
+    close $f
+    set f [open $path(test1)]
+    fconfigure $f -encoding utf-8 -buffersize 11
+    set in [read $f]
+    close $f
+    scan [string index $in end] %c
+} 194
 
 test io-13.1 {TranslateInputEOL: cr mode} {} {
     set f [open $path(test1) w]
@@ -7355,7 +7388,7 @@ test io-53.4 {CopyData: background write overflow} {stdio unix openpipe fileeven
     set result ""
     fileevent $f1 read [namespace code {
 	append result [read $f1 1024]
-	if {[string length $result] >= [string length $big]} {
+	if {[string length $result] >= [string length $big]+1} {
 	    set x done
 	}
     }]
@@ -7364,6 +7397,38 @@ test io-53.4 {CopyData: background write overflow} {stdio unix openpipe fileeven
     set big {}
     set x
 } done
+test io-53.4.1 {Bug 894da183c8} {stdio fcopy} {
+    set big bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\n
+    variable x
+    for {set x 0} {$x < 12} {incr x} {
+	append big $big
+    }
+    file delete $path(pipe)
+    set f1 [open $path(pipe) w]
+    puts $f1 [list file delete $path(test1)]
+    puts $f1 {
+	puts ready
+	set f [open io-53.4.1 w]
+	chan configure $f -translation lf
+	fcopy stdin $f -command { set x }
+	vwait x
+	close $f
+    }
+    puts $f1 "close \[[list open $path(test1) w]]"
+    close $f1
+    set f1 [open "|[list [interpreter] $path(pipe)]" r+]
+    set result [gets $f1]
+    fconfigure $f1 -blocking 0 -buffersize 125000 -translation lf
+    puts $f1 $big
+    fconfigure $f1 -blocking 1
+    close $f1
+    set big {}
+    while {[catch {glob $path(test1)}]} {after 50}
+    file delete $path(test1)
+    set check [file size io-53.4.1]
+    file delete io-53.4.1
+    set check
+} 266241
 set result {}
 proc FcopyTestAccept {sock args} {
     after 1000 "close $sock"
@@ -8542,6 +8607,25 @@ test io-73.4 {[5adc350683] [read] after EOF} -setup {
 } -result {1 1 {more data
 } 1}
 
+test io-73.5 {effect of eof on encoding end flags} -setup {
+    set fn [makeFile {} io-73.5]
+    set rfd [open $fn r]
+    set wfd [open $fn a]
+    chan configure $wfd -buffering none -translation binary
+    chan configure $rfd -buffersize 5 -encoding utf-8
+    read $rfd
+} -body {
+    set result [eof $rfd]
+    puts -nonewline $wfd "more\u00c2\u00a0data"
+    lappend result [eof $rfd]
+    lappend result [read $rfd]
+    lappend result [eof $rfd]
+} -cleanup {
+    close $wfd
+    close $rfd
+    removeFile io-73.5
+} -result [list 1 1 more\u00a0data 1]
+
 # ### ### ### ######### ######### #########
 
 # cleanup
diff --git a/tests/oo.test b/tests/oo.test
index 5fa760b..f35b70a 100644
--- a/tests/oo.test
+++ b/tests/oo.test
@@ -416,6 +416,31 @@ test oo-2.8 {construction, method calls and ensembles - Bug 3514761} -setup {
 } -returnCodes error -cleanup {
     namespace delete k
 } -result {wrong # args: should be "k next j"}
+test oo-2.9 {construction failures and self creation} -setup {
+    set ::result {}
+    oo::class create Root
+} -body {
+    oo::class create A {
+	superclass Root
+	constructor {} {
+	    lappend ::result "in A"
+	    error "failure in A"
+	}
+	destructor {lappend ::result [self]}
+    }
+    oo::class create B {
+	superclass Root
+	constructor {} {
+	    lappend ::result "in B [self]"
+	    error "failure in B"
+	}
+	destructor {lappend ::result [self]}
+    }
+    lappend ::result [catch {A create a} msg] $msg
+    lappend ::result [catch {B create b} msg] $msg
+} -cleanup {
+    Root destroy
+} -result {{in A} ::a 1 {failure in A} {in B ::b} ::b 1 {failure in B}}
 
 test oo-3.1 {basic test of OO functionality: destructor} -setup {
     # This is a bit complex because it needs to run in a sub-interp as we're
@@ -1544,6 +1569,34 @@ test oo-12.7 {OO: filters} -setup {
 } -cleanup {
     Aclass destroy
 } -result {foo {{::Aclass outerfoo} {::Aclass InnerFoo}}}
+test oo-12.8 {OO: filters and destructors} -setup {
+    oo::class create Aclass
+    Aclass create Aobject
+    set ::log {}
+} -body {
+    oo::define Aclass {
+	constructor {} {
+	    lappend ::log "in constructor"
+	}
+	destructor {
+	    lappend ::log "in destructor"
+	}
+	method bar {} {
+	    lappend ::log "in method"
+	}
+	method Boo args {
+	    lappend ::log [self target]
+	    next {*}$args
+	}
+	filter Boo
+    }
+    set obj [Aclass new]
+    $obj bar
+    $obj destroy
+    return $::log
+} -cleanup {
+    Aclass destroy
+} -result {{in constructor} {::Aclass bar} {in method} {::oo::object destroy} {in destructor}}
 
 test oo-13.1 {OO: changing an object's class} {
     oo::class create Aclass
diff --git a/tests/ooNext2.test b/tests/ooNext2.test
index 5ecd209..6a48d28 100644
--- a/tests/ooNext2.test
+++ b/tests/ooNext2.test
@@ -866,6 +866,196 @@ test oo-call-3.4 {current call introspection: in destructors} -setup {
 } -cleanup {
     root destroy
 } -result {{{{method <destructor> ::B method} {method <destructor> ::A method}} 0} {{{method <destructor> ::B method} {method <destructor> ::A method}} 1}}
+
+# Contributed tests from aspect, related to [0f42ff7871]
+#
+# dkf's "Principles Leading to a Fix"
+#
+#   A method ought to work "the same" whether or not it has been overridden by
+#   a subclass. A tailcalled command ought to have as parent stack the same
+#   thing you'd get with uplevel 1. A subclass will often expect the
+#   superclass's result to be the result that would be returned if the
+#   subclass was not there.
+
+# Common setup:
+#	any invocation of bar should emit "abc\nhi\n" then return to its
+#	caller
+set testopts {
+    -setup {
+	oo::class create Master
+	oo::class create Foo {
+	    superclass Master
+	    method bar {} {
+		puts abc
+		tailcall puts hi
+		puts xyz
+	    }
+	}
+	oo::class create Foo2 {
+	    superclass Master
+	}
+    }
+    -cleanup {
+	Master destroy
+    }
+}
+
+# these succeed, showing that without [next] the bug doesn't fire
+test next-tailcall-simple-1 "trivial case with one method" {*}$testopts -body {
+    [Foo create foo] bar
+} -output [join {abc hi} \n]\n
+test next-tailcall-simple-2 "my bar" {*}$testopts -body {
+    oo::define Foo method baz {} {
+	puts a
+	my bar
+	puts b
+    }
+    [Foo create foo] baz
+} -output [join {a abc hi b} \n]\n
+test next-tailcall-simple-3 "\[self\] bar" {*}$testopts -body {
+    oo::define Foo method baz {} {
+	puts a
+	[self] bar
+	puts b
+    }
+    [Foo create foo] baz
+} -output [join {a abc hi b} \n]\n
+test next-tailcall-simple-4 "foo bar" {*}$testopts -body {
+    oo::define Foo method baz {} {
+	puts a
+	foo bar
+	puts b
+    }
+    [Foo create foo] baz
+} -output [join {a abc hi b} \n]\n
+
+# everything from here on uses [next], and fails on 8.6.4 with compilation
+test next-tailcall-superclass-1 "next superclass" {*}$testopts -body {
+    oo::define Foo2 {
+	superclass Foo
+	method bar {} {
+	    puts a
+	    next
+	    puts b
+	}
+    }
+    [Foo2 create foo] bar
+} -output [join {a abc hi b} \n]\n
+test next-tailcall-superclass-2 "nextto superclass" {*}$testopts -body {
+    oo::define Foo2 {
+	superclass Foo
+	method bar {} {
+	    puts a
+	    nextto Foo
+	    puts b
+	}
+    }
+    [Foo2 create foo] bar
+} -output [join {a abc hi b} \n]\n
+
+test next-tailcall-mixin-1 "class mixin" {*}$testopts -body {
+    oo::define Foo2 {
+	method Bar {} {
+	    puts a
+	    next
+	    puts b
+	}
+	filter Bar
+    }
+    oo::define Foo mixin Foo2
+    Foo create foo
+    foo bar
+} -output [join {a abc hi b} \n]\n
+
+test next-tailcall-objmixin-1 "object mixin" {*}$testopts -body {
+    oo::define Foo2 {
+	method Bar {} {
+	    puts a
+	    next
+	    puts b
+	}
+	filter Bar
+    }
+    Foo create foo
+    oo::objdefine foo mixin Foo2
+    foo bar
+} -output [join {a abc hi b} \n]\n
+
+test next-tailcall-filter-1 "filter method" {*}$testopts -body {
+    oo::define Foo method Filter {} {
+	puts a
+	next
+	puts b
+    }
+    oo::define Foo filter Filter
+    [Foo new] bar
+} -output [join {a abc hi b} \n]\n
+
+test next-tailcall-forward-1 "forward method" {*}$testopts -body {
+    proc foobar {} {
+	puts "abc"
+	tailcall puts "hi"
+	puts "xyz"
+    }
+    oo::define Foo forward foobar foobar
+    oo::define Foo2 {
+	superclass Foo
+	method foobar {} {
+	    puts a
+	    next
+	    puts b
+	}
+    }
+    [Foo2 new] foobar
+} -output [join {a abc hi b} \n]\n
+
+test next-tailcall-constructor-1 "next in constructor" -body {
+    oo::class create Foo {
+	constructor {} {
+	    puts abc
+	    tailcall puts hi
+	    puts xyz
+	}
+    }
+    oo::class create Foo2 {
+	superclass Foo
+	constructor {} {
+	    puts a
+	    next
+	    puts b
+	}
+    }
+    list [Foo new] [Foo2 new]
+    return ""
+} -cleanup {
+    Foo destroy
+} -output [join {abc hi a abc hi b} \n]\n
+
+test next-tailcall-destructor-1 "next in destructor" -body {
+    oo::class create Foo {
+	destructor {
+	    puts abc
+	    tailcall puts hi
+	    puts xyz
+	}
+    }
+    oo::class create Foo2 {
+	superclass Foo
+	destructor {
+	    puts a
+	    next
+	    puts b
+	}
+    }
+    Foo create foo
+    Foo2 create foo2
+    foo destroy
+    foo2 destroy
+} -output [join {abc hi a abc hi b} \n]\n -cleanup {
+    Foo destroy
+}
+
+unset testopts
 
 cleanupTests
 return
diff --git a/unix/Makefile.in b/unix/Makefile.in
index ad6034f..958e759 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -96,7 +96,7 @@ CFLAGS_WARNING		= @CFLAGS_WARNING@
 
 # The default switches for optimization or debugging
 CFLAGS_DEBUG		= @CFLAGS_DEBUG@
-CFLAGS_OPTIMIZE		= -DNDEBUG @CFLAGS_OPTIMIZE@
+CFLAGS_OPTIMIZE		= @CFLAGS_OPTIMIZE@
 
 # To change the compiler switches, for example to change from optimization to
 # debugging symbols, change the following line:
@@ -844,8 +844,8 @@ install-libraries: libraries
 	    do \
 	    $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
 	    done;
-	@echo "Installing package http 2.8.8 as a Tcl Module";
-	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.8.tm;
+	@echo "Installing package http 2.8.9 as a Tcl Module";
+	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.9.tm;
 	@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
 	@for i in $(TOP_DIR)/library/opt/*.tcl ; \
 	    do \
diff --git a/win/Makefile.in b/win/Makefile.in
index 325b365..168da2e 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -110,6 +110,7 @@ GENERIC_DIR_NATIVE	= $(shell $(CYGPATH) '$(GENERIC_DIR)' | sed 's!\\!/!g')
 TOMMATH_DIR_NATIVE	= $(shell $(CYGPATH) '$(TOMMATH_DIR)' | sed 's!\\!/!g')
 WIN_DIR_NATIVE		= $(shell $(CYGPATH) '$(WIN_DIR)' | sed 's!\\!/!g')
 ROOT_DIR_NATIVE		= $(shell $(CYGPATH) '$(ROOT_DIR)' | sed 's!\\!/!g')
+ZLIB_DIR_NATIVE		= $(shell $(CYGPATH) '$(ZLIB_DIR)' | sed 's!\\!/!g')
 #GENERIC_DIR_NATIVE	= $(GENERIC_DIR)
 #TOMMATH_DIR_NATIVE	= $(TOMMATH_DIR)
 #WIN_DIR_NATIVE		= $(WIN_DIR)
@@ -189,10 +190,10 @@ SHELL		= @SHELL@
 RM		= rm -f
 COPY		= cp
 
-CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${TCL_SHLIB_CFLAGS} -I"${ZLIB_DIR}" \
--I"${GENERIC_DIR_NATIVE}" -DTCL_TOMMATH -DMP_PREC=4 -I"${TOMMATH_DIR_NATIVE}" \
--I"${WIN_DIR_NATIVE}" ${AC_FLAGS} \
-${COMPILE_DEBUG_FLAGS} ${NO_DEPRECATED_FLAGS}
+CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${TCL_SHLIB_CFLAGS} \
+-I"${ZLIB_DIR_NATIVE}" -I"${GENERIC_DIR_NATIVE}" -DTCL_TOMMATH \
+-DMP_PREC=4 -I"${TOMMATH_DIR_NATIVE}" -I"${WIN_DIR_NATIVE}" \
+${AC_FLAGS} ${COMPILE_DEBUG_FLAGS} ${NO_DEPRECATED_FLAGS}
 
 CC_OBJNAME = @CC_OBJNAME@
 CC_EXENAME = @CC_EXENAME@
@@ -642,8 +643,8 @@ install-libraries: libraries install-tzdata install-msgs
 	    do \
 	    $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/http1.0"; \
 	    done;
-	@echo "Installing package http 2.8.8 as a Tcl Module";
-	@$(COPY) $(ROOT_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.6/http-2.8.8.tm;
+	@echo "Installing package http 2.8.9 as a Tcl Module";
+	@$(COPY) $(ROOT_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.6/http-2.8.9.tm;
 	@echo "Installing library opt0.4 directory";
 	@for j in $(ROOT_DIR)/library/opt/*.tcl; \
 	    do \
diff --git a/win/configure b/win/configure
index bdfa908..2401002 100755
--- a/win/configure
+++ b/win/configure
@@ -4364,12 +4364,12 @@ if test "$tcl_ok" = "yes"; then
 
     if test "$GCC" == "yes"; then
 
-      ZLIB_LIBS=\${ZLIB_DIR}/win64/libz.dll.a
+      ZLIB_LIBS=\${ZLIB_DIR_NATIVE}/win64/libz.dll.a
 
 
 else
 
-      ZLIB_LIBS=\${ZLIB_DIR}/win64/zdll.lib
+      ZLIB_LIBS=\${ZLIB_DIR_NATIVE}/win64/zdll.lib
 
 
 fi
@@ -4377,7 +4377,7 @@ fi
 
 else
 
-    ZLIB_LIBS=\${ZLIB_DIR}/win32/zdll.lib
+    ZLIB_LIBS=\${ZLIB_DIR_NATIVE}/win32/zdll.lib
 
 
 fi
diff --git a/win/configure.in b/win/configure.in
index 99d78f2..fc487d0 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -130,12 +130,12 @@ AS_IF([test "$tcl_ok" = "yes"], [
   AC_SUBST(ZLIB_DLL_FILE,[\${ZLIB_DLL_FILE}])
   AS_IF([test "$do64bit" = "yes"], [
     AS_IF([test "$GCC" == "yes"],[
-      AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win64/libz.dll.a])
+      AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win64/libz.dll.a])
     ], [
-      AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win64/zdll.lib])
+      AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win64/zdll.lib])
     ])
   ], [
-    AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR}/win32/zdll.lib])
+    AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win32/zdll.lib])
   ])
 ], [
   AC_SUBST(ZLIB_OBJS,[\${ZLIB_OBJS}])
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index d6ca348..a5b14b4 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -668,7 +668,7 @@ NativeReadReparse(
     HANDLE hFile;
     DWORD returnedLength;
 
-    hFile = CreateFile(linkDirPath, desiredAccess, 0, NULL, OPEN_EXISTING,
+    hFile = CreateFile(linkDirPath, desiredAccess, FILE_SHARE_READ, NULL, OPEN_EXISTING,
 	    FILE_FLAG_OPEN_REPARSE_POINT | FILE_FLAG_BACKUP_SEMANTICS, NULL);
 
     if (hFile == INVALID_HANDLE_VALUE) {
author	Joe Mistachkin <joe@mistachkin.com>	2015-05-17 19:49:44 (GMT)
committer	Joe Mistachkin <joe@mistachkin.com>	2015-05-17 19:49:44 (GMT)
commit	2c15b241eada4c3508f40bc48287bfc3617bbd76 (patch)
tree	2905f9e58003ed85727b6c497ff9b87b5b09d37b
parent	797f5c18a178ccf6347e2f64c565216353e9e255 (diff)
parent	25217a3ed35a8e8d7a9b5fd1c79a84ffbca0164b (diff)
download	tcl-2c15b241eada4c3508f40bc48287bfc3617bbd76.zip tcl-2c15b241eada4c3508f40bc48287bfc3617bbd76.tar.gz tcl-2c15b241eada4c3508f40bc48287bfc3617bbd76.tar.bz2