From a8949a5f0ed2559a44335ec5bf5875237e8007a8 Mon Sep 17 00:00:00 2001
From: Derick Rethans <derick@php.net>
Date: Tue, 28 Jun 2005 21:49:35 +0000
Subject: [PATCH] - Added testcases for bug #14561 and #26090 and updated NEWS
 with those   fixed bug nr's.

---
 NEWS                         |  4 ++--
 ext/date/tests/bug14561.phpt | 11 +++++++++++
 ext/date/tests/bug26090.phpt | 14 ++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 ext/date/tests/bug14561.phpt
 create mode 100644 ext/date/tests/bug26090.phpt

diff --git a/NEWS b/NEWS
index 16df902c5a7..59a4a64e376 100644
--- a/NEWS
+++ b/NEWS
@@ -63,10 +63,10 @@ PHP                                                                        NEWS
 - Fixed bug #29896 (Backtrace argument list out of sync). (Dmitry)
 - Fixed bug #29683 (headers_list() returns empty array). (Tony)
 - Fixed bug #28355 (glob wont error if dir is not readable). (Hartmut)
-- Fixed bugs #20382, #28024, #30532, #32086, #32270, #32555, #32588, #33056
-  (strtotime() related bugs). (Derick)
 - Fixed bug #15854 (boolean ini options may be incorrectly displayed as Off 
   when they are On). (Tony)
+- Fixed bugs #14561, #20382, #26090, #26320, #28024, #30532, #32086, #32270,
+  #32555, #32588, #33056 (strtotime() related bugs). (Derick)
 
 10 Jun 2005, PHP 5.1 Beta 1
 - Upgraded PCRE library to version 5.0. (Andrei)
diff --git a/ext/date/tests/bug14561.phpt b/ext/date/tests/bug14561.phpt
new file mode 100644
index 00000000000..e2b6ef09825
--- /dev/null
+++ b/ext/date/tests/bug14561.phpt
@@ -0,0 +1,11 @@
+--TEST--
+Bug #14561 (strtotime() bug)
+--FILE--
+<?php
+putenv("TZ=GMT");
+echo strtotime("19:30 Dec 17"), "\n";
+echo strtotime("Dec 17 19:30"), "\n";
+?>
+--EXPECT--
+1134847800
+1134847800
diff --git a/ext/date/tests/bug26090.phpt b/ext/date/tests/bug26090.phpt
new file mode 100644
index 00000000000..03a90352cc0
--- /dev/null
+++ b/ext/date/tests/bug26090.phpt
@@ -0,0 +1,14 @@
+--TEST--
+Bug #26090 (allow colons in time zone offset to strtotime())
+--FILE--
+<?php
+putenv("TZ=America/New_York");
+$t = '2003-10-28 10:20:30-0800';
+echo date('Y-m-d H:i:s T', strtotime($t)) . "\n";
+
+$t = '2003-10-28 10:20:30-08:00';
+echo date('Y-m-d H:i:s T', strtotime($t)) . "\n";
+?>
+--EXPECT--
+2003-10-28 13:20:30 EST
+2003-10-28 13:20:30 EST