From d3c83378ebf7f7d605a891df0fbcfd7d6564b76c Mon Sep 17 00:00:00 2001
From: Derick Rethans <derick@php.net>
Date: Sun, 3 Jul 2005 14:36:59 +0000
Subject: [PATCH] - Move mktime/gmmktime related tests from ext/standard to
 ext/date.

---
 ext/date/php_date.c                                             | 1 +
 ext/date/tests/{bug20382.phpt => bug20382-1.phpt}               | 2 +-
 ext/{standard/tests/time => date/tests}/bug21966.phpt           | 0
 ext/{standard/tests/time => date/tests}/bug27719.phpt           | 2 +-
 ext/{standard/tests/time/003.phpt => date/tests/mktime-1.phpt}  | 0
 .../tests/time/mktime.phpt => date/tests/mktime-2.phpt}         | 0
 6 files changed, 3 insertions(+), 2 deletions(-)
 rename ext/date/tests/{bug20382.phpt => bug20382-1.phpt} (84%)
 rename ext/{standard/tests/time => date/tests}/bug21966.phpt (100%)
 rename ext/{standard/tests/time => date/tests}/bug27719.phpt (96%)
 rename ext/{standard/tests/time/003.phpt => date/tests/mktime-1.phpt} (100%)
 rename ext/{standard/tests/time/mktime.phpt => date/tests/mktime-2.phpt} (100%)

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 40af3f92d9..673cd04175 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -470,6 +470,7 @@ PHPAPI static void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt)
 			if (dst == 0 && tmp_offset->is_dst == 1) {
 				adjust_seconds = +3600;
 			}
+			timelib_time_offset_dtor(tmp_offset);
 		}
 	}
 	/* Clean up and return */
diff --git a/ext/date/tests/bug20382.phpt b/ext/date/tests/bug20382-1.phpt
similarity index 84%
rename from ext/date/tests/bug20382.phpt
rename to ext/date/tests/bug20382-1.phpt
index 4da8c21105..a259d934af 100644
--- a/ext/date/tests/bug20382.phpt
+++ b/ext/date/tests/bug20382-1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #20382 (strtotime ("Monday", $date) produces wrong result on DST changeover)
+Bug #20382 [1] (strtotime ("Monday", $date) produces wrong result on DST changeover)
 --FILE--
 <?php
 	putenv("TZ=Europe/Amsterdam");
diff --git a/ext/standard/tests/time/bug21966.phpt b/ext/date/tests/bug21966.phpt
similarity index 100%
rename from ext/standard/tests/time/bug21966.phpt
rename to ext/date/tests/bug21966.phpt
diff --git a/ext/standard/tests/time/bug27719.phpt b/ext/date/tests/bug27719.phpt
similarity index 96%
rename from ext/standard/tests/time/bug27719.phpt
rename to ext/date/tests/bug27719.phpt
index cff6fdd2fe..6f65bfb85e 100644
--- a/ext/standard/tests/time/bug27719.phpt
+++ b/ext/date/tests/bug27719.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #27719: mktime returns incorrect timestamp for dst days
+Bug #27719 (mktime returns incorrect timestamp for dst days)
 --INI--
 error_reporting=2047
 --FILE--
diff --git a/ext/standard/tests/time/003.phpt b/ext/date/tests/mktime-1.phpt
similarity index 100%
rename from ext/standard/tests/time/003.phpt
rename to ext/date/tests/mktime-1.phpt
diff --git a/ext/standard/tests/time/mktime.phpt b/ext/date/tests/mktime-2.phpt
similarity index 100%
rename from ext/standard/tests/time/mktime.phpt
rename to ext/date/tests/mktime-2.phpt
-- 
2.50.1