From: Derick Rethans <derick@php.net>
Date: Sun, 6 May 2001 18:33:49 +0000 (+0000)
Subject: - Partial fix for bug #9050, support for "Jan 19  2000" date format
X-Git-Tag: php-4.0.6RC1~106
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b181237582ab23e9ae5a8e4cbd1734f4416f00b2;p=php

- Partial fix for bug #9050, support for "Jan 19  2000" date format
---

diff --git a/ext/standard/parsedate.y b/ext/standard/parsedate.y
index a0bb517b88..64e899d98d 100644
--- a/ext/standard/parsedate.y
+++ b/ext/standard/parsedate.y
@@ -320,6 +320,11 @@ date	: tUNUMBER '/' tUNUMBER {
 	    yyMonth = $2;
 	    yyYear = -$3;
 	}
+	| tMONTH tUNUMBER tUNUMBER {
+	    yyMonth = $1;
+	    yyDay = $2;
+		yyYear = $3;
+	}
 	| tMONTH tUNUMBER {
 	    yyMonth = $1;
 	    yyDay = $2;
diff --git a/ext/standard/tests/time/002.phpt b/ext/standard/tests/time/002.phpt
new file mode 100644
index 0000000000..766af4d773
--- /dev/null
+++ b/ext/standard/tests/time/002.phpt
@@ -0,0 +1,40 @@
+--TEST--
+strtotime() function
+--POST--
+--GET--
+--FILE--
+<?php
+	echo "1999-10-13\n";
+	echo strtotime ("1999-10-13")."\n";
+	echo strtotime ("Oct 13  1999")."\n\n";
+
+	echo "2000-01-19\n";
+	echo strtotime ("2000-01-19")."\n";
+	echo strtotime ("Jan 19  2000")."\n\n";
+
+	echo "2001-12-21\n";
+	echo strtotime ("2001-12-21")."\n";
+	echo strtotime ("Dec 21  2001")."\n\n";
+
+	echo "2001-12-21 12:16\n";
+	echo strtotime ("2001-12-21 12:16")."\n";
+	echo strtotime ("Dec 21 2001 12:16")."\n";
+	echo strtotime ("Dec 21  12:16")."\n";
+?>
+--EXPECT--
+1999-10-13
+939765600
+939765600
+
+2000-01-19
+948236400
+948236400
+
+2001-12-21
+1008889200
+1008889200
+
+2001-12-21 12:16
+1008933360
+1008933360
+-1