- Added backward compability wrapper "php_parse_date()".

- Changed WDDX extension to use new date parsing code.
- Removed all remnants to the old parser.
#- I hope that I didn't break the .dsp's...

16 files changed, 22 insertions, 1315 deletions

diff --git a/ext/date/TODO b/ext/date/TODO
index f98cb629e7..34a209f942 100644
--- a/ext/date/TODO
+++ b/ext/date/TODO
@@ -1,5 +1,4 @@
 - Port over my 200 test cases to .phpt format.
 - Write an error handler for unexpected characters while parsing dates.
-- Remove old parsedate.* code from ext/standard 
 - Move all date/time related functions from ext/standard to ext/date
 - Move all date/time related tests from ext/standard/tests to ext/data/tests
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 40a0c96d61..2b28bed9a5 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -85,6 +85,22 @@ PHP_MINFO_FUNCTION(date)
 	php_info_print_table_end();
 }
 
+signed long php_parse_date(char *string, signed long *now)
+{
+	timelib_time *parsed_time;
+	int           error;
+	signed long   retval;
+
+	parsed_time = timelib_strtotime(string);
+	timelib_update_ts(parsed_time, NULL);
+	retval = timelib_date_to_int(parsed_time, &error);
+	timelib_time_dtor(parsed_time);
+	if (error) {
+		return -1;
+	}
+	return retval;
+}
+
 static char* guess_timezone(TSRMLS_D)
 {
 	char *env;
diff --git a/ext/date/php_date.h b/ext/date/php_date.h
index 6e665c798d..75eeb1e47e 100644
--- a/ext/date/php_date.h
+++ b/ext/date/php_date.h
@@ -40,4 +40,7 @@ ZEND_END_MODULE_GLOBALS(date)
 #define DATEG(v) (date_globals.v)
 #endif
 
+/* Backwards compability wrapper */
+signed long php_parse_date(char *string, signed long *now);
+
 #endif /* PHP_DATE_H */
diff --git a/ext/standard/Makefile.frag b/ext/standard/Makefile.frag
index c3a27b0a48..a9a8bd5994 100644
--- a/ext/standard/Makefile.frag
+++ b/ext/standard/Makefile.frag
@@ -1,7 +1,4 @@
 
-$(srcdir)/parsedate.c: $(srcdir)/parsedate.y
-	$(YACC) $(srcdir)/parsedate.y -o $@
-
 $(srcdir)/var_unserializer.c: $(srcdir)/var_unserializer.re
 	$(RE2C) -b $(srcdir)/var_unserializer.re > $@
 
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index f3ad2ba851..4958e79fa4 100644
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -483,7 +483,7 @@ PHP_NEW_EXTENSION(standard, array.c base64.c basic_functions.c browscap.c crc32.
                             cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \
                             flock_compat.c formatted_print.c fsock.c head.c html.c image.c \
                             info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \
-                            microtime.c pack.c pageinfo.c parsedate.c quot_print.c rand.c \
+                            microtime.c pack.c pageinfo.c quot_print.c rand.c \
                             reg.c soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \
                             url_scanner.c var.c versioning.c assert.c strnatcmp.c levenshtein.c \
                             incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \
diff --git a/ext/standard/config.w32 b/ext/standard/config.w32
index d587dedcc6..b006b98a66 100644
--- a/ext/standard/config.w32
+++ b/ext/standard/config.w32
@@ -8,7 +8,7 @@ EXTENSION("standard", "array.c base64.c basic_functions.c browscap.c \
 	crc32.c crypt.c cyr_convert.c datetime.c dir.c dl.c dns.c exec.c \
 	file.c filestat.c formatted_print.c fsock.c head.c html.c image.c \
 	info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c microtime.c \
-	pack.c pageinfo.c parsedate.c quot_print.c rand.c reg.c soundex.c \
+	pack.c pageinfo.c quot_print.c rand.c reg.c soundex.c \
 	string.c scanf.c syslog.c type.c uniqid.c url.c url_scanner.c var.c \
 	versioning.c assert.c strnatcmp.c levenshtein.c incomplete_class.c \
 	url_scanner_ex.c ftp_fopen_wrapper.c http_fopen_wrapper.c \
diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c
index fa6afb4ce6..9280e33662 100644
--- a/ext/standard/datetime.c
+++ b/ext/standard/datetime.c
@@ -35,8 +35,6 @@
 #endif
 #include <stdio.h>
 
-#include "php_parsedate.h"
-
 char *mon_full_names[] = {
 	"January", "February", "March", "April",
 	"May", "June", "July", "August",
diff --git a/ext/standard/parsedate.y b/ext/standard/parsedate.y
deleted file mode 100644
index c5b4dbc42f..0000000000
--- a/ext/standard/parsedate.y
+++ /dev/null
@@ -1,1161 +0,0 @@
-%{
-/*
-**  Originally written by Steven M. Bellovin <smb@research.att.com> while
-**  at the University of North Carolina at Chapel Hill.  Later tweaked by
-**  a couple of people on Usenet.  Completely overhauled by Rich $alz
-**  <rsalz@bbn.com> and Jim Berets <jberets@bbn.com> in August, 1990.
-**
-**  This code is in the public domain and has no copyright.
-*/
-
-/* $Id$ */
-
-#include "php.h"
-
-#ifdef PHP_WIN32
-#include <malloc.h>
-#endif
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <time.h>
-#include <ctype.h>
-
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-#ifdef PHP_WIN32
-# include "win32/time.h"
-#endif
-
-#include "php_parsedate.h"
-
-#if HAVE_STDLIB_H
-# include <stdlib.h> /* for `free'; used by Bison 1.27 */
-#endif
-
-#if defined(_HPUX_SOURCE)
-#include <alloca.h>
-#endif
-
-#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
-# define IN_CTYPE_DOMAIN(c) 1
-#else
-# define IN_CTYPE_DOMAIN(c) isascii(c)
-#endif
-
-#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c))
-#define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (c))
-#define ISUPPER(c) (IN_CTYPE_DOMAIN (c) && isupper (c))
-#define ISDIGIT_LOCALE(c) (IN_CTYPE_DOMAIN (c) && isdigit (c))
-
-/* ISDIGIT differs from ISDIGIT_LOCALE, as follows:
-   - Its arg may be any int or unsigned int; it need not be an unsigned char.
-   - It's guaranteed to evaluate its argument exactly once.
-   - It's typically faster.
-   Posix 1003.2-1992 section 2.5.2.1 page 50 lines 1556-1558 says that
-   only '0' through '9' are digits.  Prefer ISDIGIT to ISDIGIT_LOCALE unless
-   it's important to use the locale's definition of `digit' even when the
-   host does not conform to Posix.  */
-#define ISDIGIT(c) ((unsigned) (c) - '0' <= 9)
-
-#if defined (STDC_HEADERS) || defined (USG)
-# include <string.h>
-#endif
-
-#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
-# define __attribute__(x)
-#endif
-
-#ifndef ATTRIBUTE_UNUSED
-# define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
-#endif
-
-/* Some old versions of bison generate parsers that use bcopy.
-   That loses on systems that don't provide the function, so we have
-   to redefine it here.  */
-#if !defined (HAVE_BCOPY) && defined (HAVE_MEMCPY) && !defined (bcopy)
-# define bcopy(from, to, len) memcpy ((to), (from), (len))
-#endif
-
-/* Remap normal yacc parser interface names (yyparse, yylex, yyerror, etc),
-   as well as gratuitiously global symbol names, so we can have multiple
-   yacc generated parsers in the same program.  Note that these are only
-   the variables produced by yacc.  If other parser generators (bison,
-   byacc, etc) produce additional global names that conflict at link time,
-   then those parser generators need to be fixed instead of adding those
-   names to this list. */
-
-#define yyparse php_gd_parse
-#define yylex   php_gd_lex
-
-static int yyerror ();
-
-#define EPOCH		1970
-#define HOUR(x)		((x) * 60)
-
-#define MAX_BUFF_LEN    128   /* size of buffer to read the date into */
-
-/*
-**  An entry in the lexical lookup table.
-*/
-typedef struct _TABLE {
-    const char	*name;
-    int		type;
-    int		value;
-} TABLE;
-
-
-/*
-**  Meridian:  am, pm, or 24-hour style.
-*/
-typedef enum _MERIDIAN {
-    MERam, MERpm, MER24
-} MERIDIAN;
-
-struct date_yy {
-	const char	*yyInput;
-	int	yyDayOrdinal;
-	int	yyDayNumber;
-	int	yyHaveDate;
-	int	yyHaveDay;
-	int	yyHaveRel;
-	int	yyHaveTime;
-	int	yyHaveZone;
-	int	yyTimezone;
-	int	yyDay;
-	int	yyHour;
-	int	yyMinutes;
-	int	yyMonth;
-	int	yySeconds;
-	int	yyYear;
-	MERIDIAN	yyMeridian;
-	int	yyRelDay;
-	int	yyRelHour;
-	int	yyRelMinutes;
-	int	yyRelMonth;
-	int	yyRelSeconds;
-	int	yyRelYear;
-};
-
-typedef union _date_ll {
-    int			Number;
-    enum _MERIDIAN	Meridian;
-} date_ll;
-
-#define YYPARSE_PARAM parm
-#define YYLEX_PARAM parm
-#define YYSTYPE date_ll
-#define YYLTYPE void
-
-static int yylex (YYSTYPE *lvalp, void *parm);
-%}
-
-/* This grammar has 56 shift/reduce conflicts. */
-%expect 56
-%pure_parser
-
-%token	tAGO tDAY tDAY_UNIT tDAYZONE tDST tHOUR_UNIT tID tTZONE tWZONE tZZONE
-%token	tMERIDIAN tMINUTE_UNIT tMONTH tMONTH_UNIT
-%token	tSEC_UNIT tSNUMBER tUNUMBER tYEAR_UNIT tZONE
-
-%type	<Number>	tDAY tDAY_UNIT tDAYZONE tHOUR_UNIT tMINUTE_UNIT
-%type	<Number>	tMONTH tMONTH_UNIT
-%type	<Number>	tSEC_UNIT tSNUMBER tUNUMBER tYEAR_UNIT tZONE tTZONE tWZONE tZZONE 
-%type	<Meridian>	tMERIDIAN 
-
-%%
-
-spec	: /* NULL */
-	| spec item
-    ;
-
-item	: time {
-	    ((struct date_yy *)parm)->yyHaveTime++;
-	}
-	| zone {
-	        ((struct date_yy *)parm)->yyHaveZone++;
-	}
-	| date {
-	    ((struct date_yy *)parm)->yyHaveDate++;
-	}
-	| day {
-	    ((struct date_yy *)parm)->yyHaveDay++;
-	}
-	| rel {
-	    ((struct date_yy *)parm)->yyHaveRel++;
-	}
-	| number
-    | o_merid
-	;
-
-time	: tUNUMBER tMERIDIAN {
-	    ((struct date_yy *)parm)->yyHour = $1;
-	    ((struct date_yy *)parm)->yyMinutes = 0;
-	    ((struct date_yy *)parm)->yySeconds = 0;
-	    ((struct date_yy *)parm)->yyMeridian = $2;
-	}
-	| iso8601time_colon
-	/* | pgsqltime  ... shares a common spec with ISO8601 */
-	;
-
-iso8601time_colon: HMStime_with_colon sec_fraction_part rel {
-	    ((struct date_yy *)parm)->yyMeridian = MER24;
-	}
-	| HMtime_with_colon sec_fraction_part rel {
-	    ((struct date_yy *)parm)->yyMeridian = MER24;
-	    ((struct date_yy *)parm)->yySeconds = 0;
-	}
-	| HMStime_with_colon sec_fraction_part iso8601zonepart {
-	    ((struct date_yy *)parm)->yyMeridian = MER24;
-	}
-	| HMtime_with_colon sec_fraction_part iso8601zonepart {
-	    ((struct date_yy *)parm)->yyMeridian = MER24;
-	    ((struct date_yy *)parm)->yySeconds = 0;
-	}
-    ;
-
-iso8601zonepart: zonepart_numeric_without_colon {
-		((struct date_yy *)parm)->yyHaveZone++;
-	}
-	| zonepart_numeric_with_colon {
-		((struct date_yy *)parm)->yyHaveZone++;
-	}
-	| zone {
-		((struct date_yy *)parm)->yyHaveZone++;
-	}
-	| /* empty */
-	;
-
-sec_fraction_part: '.' tUNUMBER {
-	}
-	| /* empty */
-	;
-
-zonepart_numeric_without_colon: tSNUMBER {
-		/* format: [+-]hhmm */
-		if ($1 <= -100 || $1 >= 100) {
-			((struct date_yy *)parm)->yyTimezone = (-$1 / 100) * 60 + (-$1 % 100);
-		} else if ($1 >= -99 || $1 <= 99) {
-			((struct date_yy *)parm)->yyTimezone = -$1 * 60;
-		}
-	}
-	;
-
-zonepart_numeric_with_colon: tSNUMBER ':' tUNUMBER {
-		/* format: [+-]hh:mm */
-		((struct date_yy *)parm)->yyTimezone = -$1 * 60 + ($1 > 0 ? -$3: $3);
-	}
-	;
-
-HMStime_with_colon: HMtime_with_colon ':' tUNUMBER {
-		/* format: hh:mm:ss */
-	    ((struct date_yy *)parm)->yySeconds = $3;
-	}
-	;
-
-HMtime_with_colon: tUNUMBER ':' tUNUMBER {
-		/* format: hh:mm */
-	    ((struct date_yy *)parm)->yyHour = $1;
-	    ((struct date_yy *)parm)->yyMinutes = $3;
-	}
-	;
-
-
-	/* we have to deal with a special case for the datetime format 
-	   of XML Schema here: '2003-11-18T22:40:00Z'
-	   the combination of a 'T' timezone specifier later followed
-	   by a 'Z' is now recognized and allowed
-	   TODO: change the grammer so that the exact positions are checked
-	   right now '2003-11-18 22:40:00 TZ' is also accepted (hartmut)
-	*/
-	   
-zone	: tTZONE {
-	    ((struct date_yy *)parm)->yyTimezone = $1;
-	}
-	| tWZONE {
-	    ((struct date_yy *)parm)->yyTimezone = $1;
-	}
-	| tZZONE {
-	    ((struct date_yy *)parm)->yyTimezone = $1;
-	}
-	| tZONE {
-	    ((struct date_yy *)parm)->yyTimezone = $1;
-	}
-	| tDAYZONE {
-	    ((struct date_yy *)parm)->yyTimezone = $1 - 60;
-	}
-	| tZONE tDST {
-	    ((struct date_yy *)parm)->yyTimezone = $1 - 60;
-	}
-	;
-
-day	: tDAY {
-	    ((struct date_yy *)parm)->yyDayOrdinal = 1;
-	    ((struct date_yy *)parm)->yyDayNumber = $1;
-	}
-	| tDAY ',' {
-	    ((struct date_yy *)parm)->yyDayOrdinal = 1;
-	    ((struct date_yy *)parm)->yyDayNumber = $1;
-	}
-	| tUNUMBER tDAY {
-	    ((struct date_yy *)parm)->yyDayOrdinal = $1;
-	    ((struct date_yy *)parm)->yyDayNumber = $2;
-	}
-	;
-
-date	: tUNUMBER '/' tUNUMBER {
-	    ((struct date_yy *)parm)->yyMonth = $1;
-	    ((struct date_yy *)parm)->yyDay = $3;
-	}
-	| tMONTH tUNUMBER tUNUMBER ':' tUNUMBER ':' tUNUMBER tUNUMBER {
-		((struct date_yy *)parm)->yyYear = $8;
-		((struct date_yy *)parm)->yyMonth = $1;
-		((struct date_yy *)parm)->yyDay = $2;
-
-		((struct date_yy *)parm)->yyHour = $3;
-		((struct date_yy *)parm)->yyMinutes = $5;
-		((struct date_yy *)parm)->yySeconds = $7;
-
-		((struct date_yy *)parm)->yyHaveTime = 1;
-	}
-	| tUNUMBER '/' tUNUMBER '/' tUNUMBER {
-	  /* Interpret as YYYY/MM/DD if $1 >= 1000, otherwise as MM/DD/YY.
-	     The goal in recognizing YYYY/MM/DD is solely to support legacy
-	     machine-generated dates like those in an RCS log listing.  If
-	     you want portability, use the ISO 8601 format.  */
-	  if ($1 >= 1000)
-	    {
-	      ((struct date_yy *)parm)->yyYear = $1;
-	      ((struct date_yy *)parm)->yyMonth = $3;
-	      ((struct date_yy *)parm)->yyDay = $5;
-	    }
-	  else
-	    {
-	      ((struct date_yy *)parm)->yyMonth = $1;
-	      ((struct date_yy *)parm)->yyDay = $3;
-	      ((struct date_yy *)parm)->yyYear = $5;
-	    }
-	}
-	| iso8601date
-	| iso8601datetime {
-			((struct date_yy *)parm)->yyHaveTime++;
-    }
-	| tUNUMBER tMONTH tSNUMBER {
-	    /* e.g. 17-JUN-1992.  */
-	    ((struct date_yy *)parm)->yyDay = $1;
-	    ((struct date_yy *)parm)->yyMonth = $2;
-	    ((struct date_yy *)parm)->yyYear = -$3;
-	}
-	| tMONTH tUNUMBER tUNUMBER {
-	    ((struct date_yy *)parm)->yyMonth = $1;
-	    ((struct date_yy *)parm)->yyDay = $2;
-		((struct date_yy *)parm)->yyYear = $3;
-	}
-	| tMONTH tUNUMBER {
-	    ((struct date_yy *)parm)->yyMonth = $1;
-	    if ($2 > 1000) {
-		((struct date_yy *)parm)->yyYear = $2;
-	    } else {
-		((struct date_yy *)parm)->yyDay = $2;
-	    }
-	}
-	| tMONTH tUNUMBER ',' tUNUMBER {
-	    ((struct date_yy *)parm)->yyMonth = $1;
-	    ((struct date_yy *)parm)->yyDay = $2;
-	    ((struct date_yy *)parm)->yyYear = $4;
-	}
-	| tUNUMBER tMONTH {
-	    ((struct date_yy *)parm)->yyMonth = $2;
-	    if ($1 > 1000) {
-		((struct date_yy *)parm)->yyYear = $1;
-	    } else {
-		((struct date_yy *)parm)->yyDay = $1;
-	    }
-	}
-	| tUNUMBER tMONTH tUNUMBER {
-	    ((struct date_yy *)parm)->yyMonth = $2;
-	    ((struct date_yy *)parm)->yyDay = $1;
-	    ((struct date_yy *)parm)->yyYear = $3;
-	}
-	;
-
-iso8601datetime: iso8601date tTZONE iso8601time
-	| tUNUMBER tTZONE iso8601time {
-		int i = $1;
-
-		if (i >= 10000) {
-			/* format: yyyymmdd */
-			((struct date_yy *)parm)->yyYear = i / 10000;
-			i %= 10000;
-			((struct date_yy *)parm)->yyMonth = i / 100;
-			i %= 100;
-			((struct date_yy *)parm)->yyDay = i;
-		} else if (i >= 1000 && i <= 9999) {
-			/* format: yyyy */
-			((struct date_yy *)parm)->yyYear = i;
-			((struct date_yy *)parm)->yyDay= 1;
-			((struct date_yy *)parm)->yyMonth = 1;
-		}
-	}
-	;
-
-iso8601date: tUNUMBER tSNUMBER tSNUMBER {
-	    /* ISO 8601 format.  yyyy-mm-dd.  */
-	    ((struct date_yy *)parm)->yyYear = $1;
-	    ((struct date_yy *)parm)->yyMonth = -$2;
-	    ((struct date_yy *)parm)->yyDay = -$3;
-	}
-	| tUNUMBER tSNUMBER {
-		/* ISO 8601 format   yyyy-mm */
-	    ((struct date_yy *)parm)->yyYear = $1;
-	    ((struct date_yy *)parm)->yyMonth = -$2;
-	    ((struct date_yy *)parm)->yyDay = 1;
-	}
-	| tUNUMBER iso8601weekspec {
-		const int om = (1 + 9) % 12; /* offset month */
-		const int oy = $1 - 1; /* offset year */
-
-		((struct date_yy *)parm)->yyYear = $1;
-		((struct date_yy *)parm)->yyMonth = 1;
-		/* Zeller's formula */
-		((struct date_yy *)parm)->yyDay -= ((13 * om + 12) / 5 +
-					oy + oy / 4 + oy / 400 - oy / 100) % 7 - 1;
-	}
-    ;
-
-iso8601weekspec: tWZONE tUNUMBER {
-		((struct date_yy *)parm)->yyDay = ($2 / 10) * 7 + ($2 % 10) - 8;
-	}
-	| tWZONE tUNUMBER tSNUMBER {
-		((struct date_yy *)parm)->yyDay = $2 * 7 - $3 - 8;
-	}
-	;
-
-iso8601time:
-	iso8601time_colon
-	| tUNUMBER sec_fraction_part iso8601zonepart {
-		int i = $1;
-
-		if (i <= -100000 || i >= 100000) {
-			((struct date_yy *)parm)->yyHour = i / 10000;
-			i %= 10000;
-			((struct date_yy *)parm)->yyMinutes = i / 100;
-			i %= 100;
-	    	((struct date_yy *)parm)->yySeconds = i;
-		} else if (i <= -1000 || i >= 1000) {
-			((struct date_yy *)parm)->yyHour = i / 100;
-			i %= 100;
-			((struct date_yy *)parm)->yyMinutes = i;
-	    	((struct date_yy *)parm)->yySeconds = 0;
-		} else if (i >= -99 || i <= 99) {
-			((struct date_yy *)parm)->yyHour = $1;
-			((struct date_yy *)parm)->yyMinutes = 0;
-	    	((struct date_yy *)parm)->yySeconds = 0;
-		} else {
-			((struct date_yy *)parm)->yyHaveTime = 0;
-		}
-	    ((struct date_yy *)parm)->yyMeridian = MER24;
-	}
-	;
-
-rel	: relunit tAGO {
-	    ((struct date_yy *)parm)->yyRelSeconds =
-			-((struct date_yy *)parm)->yyRelSeconds;
-	    ((struct date_yy *)parm)->yyRelMinutes =
-			-((struct date_yy *)parm)->yyRelMinutes;
-	    ((struct date_yy *)parm)->yyRelHour =
-			-((struct date_yy *)parm)->yyRelHour;
-	    ((struct date_yy *)parm)->yyRelDay =
-			-((struct date_yy *)parm)->yyRelDay;
-	    ((struct date_yy *)parm)->yyRelMonth =
-			-((struct date_yy *)parm)->yyRelMonth;
-	    ((struct date_yy *)parm)->yyRelYear =
-			-((struct date_yy *)parm)->yyRelYear;
-	}
-	| relunit
-	;
-
-relunit	: tUNUMBER tYEAR_UNIT {
-	    ((struct date_yy *)parm)->yyRelYear += $1 * $2;
-	}
-	| tSNUMBER tYEAR_UNIT {
-	    ((struct date_yy *)parm)->yyRelYear += $1 * $2;
-	}
-	| tYEAR_UNIT {
-	    ((struct date_yy *)parm)->yyRelYear += $1;
-	}
-	| tUNUMBER tMONTH_UNIT {
-	    ((struct date_yy *)parm)->yyRelMonth += $1 * $2;
-	}
-	| tSNUMBER tMONTH_UNIT {
-	    ((struct date_yy *)parm)->yyRelMonth += $1 * $2;
-	}
-	| tMONTH_UNIT {
-	    ((struct date_yy *)parm)->yyRelMonth += $1;
-	}
-	| tUNUMBER tDAY_UNIT {
-	    ((struct date_yy *)parm)->yyRelDay += $1 * $2;
-	}
-	| tSNUMBER tDAY_UNIT {
-	    ((struct date_yy *)parm)->yyRelDay += $1 * $2;
-	}
-	| tDAY_UNIT {
-	    ((struct date_yy *)parm)->yyRelDay += $1;
-	}
-	| tUNUMBER tHOUR_UNIT {
-	    ((struct date_yy *)parm)->yyRelHour += $1 * $2;
-	}
-	| tSNUMBER tHOUR_UNIT {
-	    ((struct date_yy *)parm)->yyRelHour += $1 * $2;
-	}
-	| tHOUR_UNIT {
-	    ((struct date_yy *)parm)->yyRelHour += $1;
-	}
-	| tUNUMBER tMINUTE_UNIT {
-	    ((struct date_yy *)parm)->yyRelMinutes += $1 * $2;
-	}
-	| tSNUMBER tMINUTE_UNIT {
-	    ((struct date_yy *)parm)->yyRelMinutes += $1 * $2;
-	}
-	| tMINUTE_UNIT {
-	    ((struct date_yy *)parm)->yyRelMinutes += $1;
-	}
-	| tUNUMBER tSEC_UNIT {
-	    ((struct date_yy *)parm)->yyRelSeconds += $1 * $2;
-	}
-	| tSNUMBER tSEC_UNIT {
-	    ((struct date_yy *)parm)->yyRelSeconds += $1 * $2;
-	}
-	| tSEC_UNIT {
-	    ((struct date_yy *)parm)->yyRelSeconds += $1;
-	}
-	;
-
-number	: tUNUMBER
-          {
-	    if (((struct date_yy *)parm)->yyHaveTime && 
-			((struct date_yy *)parm)->yyHaveDate && 
-			!((struct date_yy *)parm)->yyHaveRel)
-	      ((struct date_yy *)parm)->yyYear = $1;
-	    else
-	      {
-		if ($1>10000)
-		  {
-		    ((struct date_yy *)parm)->yyHaveDate++;
-		    ((struct date_yy *)parm)->yyDay= ($1)%100;
-		    ((struct date_yy *)parm)->yyMonth= ($1/100)%100;
-		    ((struct date_yy *)parm)->yyYear = $1/10000;
-		  }
-		else
-		  {
-		    ((struct date_yy *)parm)->yyHaveTime++;
-		    if ($1 < 100)
-		      {
-			((struct date_yy *)parm)->yyHour = $1;
-			((struct date_yy *)parm)->yyMinutes = 0;
-		      }
-		    else
-		      {
-		    	((struct date_yy *)parm)->yyHour = $1 / 100;
-		    	((struct date_yy *)parm)->yyMinutes = $1 % 100;
-		      }
-		    ((struct date_yy *)parm)->yySeconds = 0;
-		    ((struct date_yy *)parm)->yyMeridian = MER24;
-		  }
-	      }
-	  }
-	;
-
-o_merid : tMERIDIAN 
-          {
-			 ((struct date_yy *)parm)->yyMeridian = $1;
-		  }
-	;
-
-%%
-
-time_t get_date (char *p, time_t *now);
-
-#ifndef PHP_WIN32
-extern struct tm	*gmtime();
-extern struct tm	*localtime();
-extern time_t		mktime();
-#endif
-
-/* Month and day table. */
-static TABLE const MonthDayTable[] = {
-    { "january",	tMONTH,  1 },
-    { "february",	tMONTH,  2 },
-    { "march",		tMONTH,  3 },
-    { "april",		tMONTH,  4 },
-    { "may",		tMONTH,  5 },
-    { "june",		tMONTH,  6 },
-    { "july",		tMONTH,  7 },
-    { "august",		tMONTH,  8 },
-    { "september",	tMONTH,  9 },
-    { "sept",		tMONTH,  9 },
-    { "october",	tMONTH, 10 },
-    { "november",	tMONTH, 11 },
-    { "december",	tMONTH, 12 },
-    { "sunday",		tDAY, 0 },
-    { "monday",		tDAY, 1 },
-    { "tuesday",	tDAY, 2 },
-    { "tues",		tDAY, 2 },
-    { "wednesday",	tDAY, 3 },
-    { "wednes",		tDAY, 3 },
-    { "thursday",	tDAY, 4 },
-    { "thur",		tDAY, 4 },
-    { "thurs",		tDAY, 4 },
-    { "friday",		tDAY, 5 },
-    { "saturday",	tDAY, 6 },
-    { NULL, 0, 0 }
-};
-
-/* Time units table. */
-static TABLE const UnitsTable[] = {
-    { "year",		tYEAR_UNIT,	1 },
-    { "month",		tMONTH_UNIT,	1 },
-    { "fortnight",	tDAY_UNIT,	14 },
-    { "week",		tDAY_UNIT,	7 },
-    { "day",		tDAY_UNIT,	1 },
-    { "hour",		tHOUR_UNIT,	1 },
-    { "minute",		tMINUTE_UNIT,	1 },
-    { "min",		tMINUTE_UNIT,	1 },
-    { "second",		tSEC_UNIT,	1 },
-    { "sec",		tSEC_UNIT,	1 },
-    { NULL, 0, 0 }
-};
-
-/* Assorted relative-time words. */
-static TABLE const OtherTable[] = {
-    { "tomorrow",	tDAY_UNIT,	1 },
-    { "yesterday",	tDAY_UNIT,	-1 },
-    { "today",		tDAY_UNIT,	0 },
-    { "now",		tDAY_UNIT,	0 },
-    { "last",		tUNUMBER,	-1 },
-    { "this",		tUNUMBER,	0 },
-    { "next",		tUNUMBER,	2 },
-    { "first",		tUNUMBER,	1 },
-/*  { "second",		tUNUMBER,	2 }, */
-    { "third",		tUNUMBER,	3 },
-    { "fourth",		tUNUMBER,	4 },
-    { "fifth",		tUNUMBER,	5 },
-    { "sixth",		tUNUMBER,	6 },
-    { "seventh",	tUNUMBER,	7 },
-    { "eighth",		tUNUMBER,	8 },
-    { "ninth",		tUNUMBER,	9 },
-    { "tenth",		tUNUMBER,	10 },
-    { "eleventh",	tUNUMBER,	11 },
-    { "twelfth",	tUNUMBER,	12 },
-    { "ago",		tAGO,	1 },
-    { NULL, 0, 0 }
-};
-
-/* The timezone table. */
-static TABLE const TimezoneTable[] = {
-    { "gmt",	tZONE,     HOUR ( 0) },	/* Greenwich Mean */
-    { "ut",	tZONE,     HOUR ( 0) },	/* Universal (Coordinated) */
-    { "utc",	tZONE,     HOUR ( 0) },
-    { "wet",	tZONE,     HOUR ( 0) },	/* Western European */
-    { "bst",	tDAYZONE,  HOUR ( 0) },	/* British Summer */
-    { "wat",	tZONE,     HOUR ( 1) },	/* West Africa */
-    { "at",	tZONE,     HOUR ( 2) },	/* Azores */
-#if	0
-    /* For completeness.  BST is also British Summer, and GST is
-     * also Guam Standard. */
-    { "bst",	tZONE,     HOUR ( 3) },	/* Brazil Standard */
-    { "gst",	tZONE,     HOUR ( 3) },	/* Greenland Standard */
-#endif
-#if 0
-    { "nft",	tZONE,     HOUR (3.5) },	/* Newfoundland */
-    { "nst",	tZONE,     HOUR (3.5) },	/* Newfoundland Standard */
-    { "ndt",	tDAYZONE,  HOUR (3.5) },	/* Newfoundland Daylight */
-#endif
-    { "ast",	tZONE,     HOUR ( 4) },	/* Atlantic Standard */
-    { "adt",	tDAYZONE,  HOUR ( 4) },	/* Atlantic Daylight */
-    { "est",	tZONE,     HOUR ( 5) },	/* Eastern Standard */
-    { "edt",	tDAYZONE,  HOUR ( 5) },	/* Eastern Daylight */
-    { "cst",	tZONE,     HOUR ( 6) },	/* Central Standard */
-    { "cdt",	tDAYZONE,  HOUR ( 6) },	/* Central Daylight */
-    { "mst",	tZONE,     HOUR ( 7) },	/* Mountain Standard */
-    { "mdt",	tDAYZONE,  HOUR ( 7) },	/* Mountain Daylight */
-    { "pst",	tZONE,     HOUR ( 8) },	/* Pacific Standard */
-    { "pdt",	tDAYZONE,  HOUR ( 8) },	/* Pacific Daylight */
-    { "yst",	tZONE,     HOUR ( 9) },	/* Yukon Standard */
-    { "ydt",	tDAYZONE,  HOUR ( 9) },	/* Yukon Daylight */
-    { "hst",	tZONE,     HOUR (10) },	/* Hawaii Standard */
-    { "hdt",	tDAYZONE,  HOUR (10) },	/* Hawaii Daylight */
-    { "cat",	tZONE,     HOUR (10) },	/* Central Alaska */
-    { "akst",	tZONE,     HOUR (10) }, /* Alaska Standard */
-    { "akdt",	tZONE,     HOUR (10) }, /* Alaska Daylight */
-    { "ahst",	tZONE,     HOUR (10) },	/* Alaska-Hawaii Standard */
-    { "nt",	tZONE,     HOUR (11) },	/* Nome */
-    { "idlw",	tZONE,     HOUR (12) },	/* International Date Line West */
-    { "cet",	tZONE,     -HOUR (1) },	/* Central European */
-    { "cest",	tDAYZONE,  -HOUR (1) },	/* Central European Summer */
-    { "met",	tZONE,     -HOUR (1) },	/* Middle European */
-    { "mewt",	tZONE,     -HOUR (1) },	/* Middle European Winter */
-    { "mest",	tDAYZONE,  -HOUR (1) },	/* Middle European Summer */
-    { "mesz",	tDAYZONE,  -HOUR (1) },	/* Middle European Summer */
-    { "swt",	tZONE,     -HOUR (1) },	/* Swedish Winter */
-    { "sst",	tDAYZONE,  -HOUR (1) },	/* Swedish Summer */
-    { "fwt",	tZONE,     -HOUR (1) },	/* French Winter */
-    { "fst",	tDAYZONE,  -HOUR (1) },	/* French Summer */
-    { "eet",	tZONE,     -HOUR (2) },	/* Eastern Europe, USSR Zone 1 */
-    { "bt",	tZONE,     -HOUR (3) },	/* Baghdad, USSR Zone 2 */
-#if 0
-    { "it",	tZONE,     -HOUR (3.5) },/* Iran */
-#endif
-    { "zp4",	tZONE,     -HOUR (4) },	/* USSR Zone 3 */
-    { "zp5",	tZONE,     -HOUR (5) },	/* USSR Zone 4 */
-#if 0
-    { "ist",	tZONE,     -HOUR (5.5) },/* Indian Standard */
-#endif
-    { "zp6",	tZONE,     -HOUR (6) },	/* USSR Zone 5 */
-#if	0
-    /* For completeness.  NST is also Newfoundland Standard, and SST is
-     * also Swedish Summer. */
-    { "nst",	tZONE,     -HOUR (6.5) },/* North Sumatra */
-    { "sst",	tZONE,     -HOUR (7) },	/* South Sumatra, USSR Zone 6 */
-#endif	/* 0 */
-    { "wast",	tZONE,     -HOUR (7) },	/* West Australian Standard */
-    { "wadt",	tDAYZONE,  -HOUR (7) },	/* West Australian Daylight */
-#if 0
-    { "jt",	tZONE,     -HOUR (7.5) },/* Java (3pm in Cronusland!) */
-#endif
-    { "cct",	tZONE,     -HOUR (8) },	/* China Coast, USSR Zone 7 */
-    { "jst",	tZONE,     -HOUR (9) },	/* Japan Standard, USSR Zone 8 */
-#if 0
-    { "cast",	tZONE,     -HOUR (9.5) },/* Central Australian Standard */
-    { "cadt",	tDAYZONE,  -HOUR (9.5) },/* Central Australian Daylight */
-#endif
-    { "east",	tZONE,     -HOUR (10) },	/* Eastern Australian Standard */
-    { "eadt",	tDAYZONE,  -HOUR (10) },	/* Eastern Australian Daylight */
-    { "gst",	tZONE,     -HOUR (10) },	/* Guam Standard, USSR Zone 9 */
-    { "nzt",	tZONE,     -HOUR (12) },	/* New Zealand */
-    { "nzst",	tZONE,     -HOUR (12) },	/* New Zealand Standard */
-    { "nzdt",	tDAYZONE,  -HOUR (12) },	/* New Zealand Daylight */
-    { "idle",	tZONE,     -HOUR (12) },	/* International Date Line East */
-    {  NULL, 0, 0  }
-};
-
-/* Military timezone table. */
-static TABLE const MilitaryTable[] = {
-    { "a",	tZONE,	HOUR (- 1) },
-    { "b",	tZONE,	HOUR (- 2) },
-    { "c",	tZONE,	HOUR (- 3) },
-    { "d",	tZONE,	HOUR (- 4) },
-    { "e",	tZONE,	HOUR (- 5) },
-    { "f",	tZONE,	HOUR (- 6) },
-    { "g",	tZONE,	HOUR (- 7) },
-    { "h",	tZONE,	HOUR (- 8) },
-    { "i",	tZONE,	HOUR (- 9) },
-    { "k",	tZONE,	HOUR (-10) },
-    { "l",	tZONE,	HOUR (-11) },
-    { "m",	tZONE,	HOUR (-12) },
-    { "n",	tZONE,	HOUR (  1) },
-    { "o",	tZONE,	HOUR (  2) },
-    { "p",	tZONE,	HOUR (  3) },
-    { "q",	tZONE,	HOUR (  4) },
-    { "r",	tZONE,	HOUR (  5) },
-    { "s",	tZONE,	HOUR (  6) },
-    { "t",	tTZONE,	HOUR (  7) },
-    { "u",	tZONE,	HOUR (  8) },
-    { "v",	tZONE,	HOUR (  9) },
-    { "w",	tWZONE,	HOUR ( 10) },
-    { "x",	tZONE,	HOUR ( 11) },
-    { "y",	tZONE,	HOUR ( 12) },
-    { "z",	tZZONE,	HOUR (  0) },
-    { NULL, 0, 0 }
-};
-
-
-
-
-/* ARGSUSED */
-static int
-yyerror (s)
-     char *s ATTRIBUTE_UNUSED;
-{
-  return 0;
-}
-
-static int
-ToHour (Hours, Meridian)
-     int Hours;
-     MERIDIAN Meridian;
-{
-  switch (Meridian)
-    {
-    case MER24:
-      if (Hours < 0 || Hours > 23)
-	return -1;
-      return Hours;
-    case MERam:
-      if (Hours < 1 || Hours > 12)
-	return -1;
-      if (Hours == 12)
-	Hours = 0;
-      return Hours;
-    case MERpm:
-      if (Hours < 1 || Hours > 12)
-	return -1;
-      if (Hours == 12)
-	Hours = 0;
-      return Hours + 12;
-    default:
-      abort ();
-    }
-  /* NOTREACHED */
-}
-
-static int
-ToYear (Year)
-     int Year;
-{
-  if (Year < 0)
-    Year = -Year;
-
-  /* XPG4 suggests that years 00-68 map to 2000-2068, and
-     years 69-99 map to 1969-1999.  */
-  if (Year < 69)
-    Year += 2000;
-  else if (Year < 100)
-    Year += 1900;
-
-  return Year;
-}
-
-static int
-LookupWord (lvalp,buff)
-	YYSTYPE *lvalp;
-     char *buff;
-{
-  register char *p;
-  register char *q;
-  register const TABLE *tp;
-  int i;
-  int abbrev;
-
-  /* Make it lowercase. */
-  for (p = buff; *p; p++)
-    if (ISUPPER ((unsigned char) *p))
-      *p = tolower (*p);
-
-  if (strcmp (buff, "am") == 0 || strcmp (buff, "a.m.") == 0)
-    {
-      lvalp->Meridian = MERam;
-      return tMERIDIAN;
-    }
-  if (strcmp (buff, "pm") == 0 || strcmp (buff, "p.m.") == 0)
-    {
-      lvalp->Meridian = MERpm;
-      return tMERIDIAN;
-    }
-
-  /* See if we have an abbreviation for a month. */
-  if (strlen (buff) == 3)
-    abbrev = 1;
-  else if (strlen (buff) == 4 && buff[3] == '.')
-    {
-      abbrev = 1;
-      buff[3] = '\0';
-    }
-  else
-    abbrev = 0;
-
-  for (tp = MonthDayTable; tp->name; tp++)
-    {
-      if (abbrev)
-	{
-	  if (strncmp (buff, tp->name, 3) == 0)
-	    {
-	      lvalp->Number = tp->value;
-	      return tp->type;
-	    }
-	}
-      else if (strcmp (buff, tp->name) == 0)
-	{
-	  lvalp->Number = tp->value;
-	  return tp->type;
-	}
-    }
-
-  for (tp = TimezoneTable; tp->name; tp++)
-    if (strcmp (buff, tp->name) == 0)
-      {
-	lvalp->Number = tp->value;
-	return tp->type;
-      }
-
-  if (strcmp (buff, "dst") == 0)
-    return tDST;
-
-  for (tp = UnitsTable; tp->name; tp++)
-    if (strcmp (buff, tp->name) == 0)
-      {
-	lvalp->Number = tp->value;
-	return tp->type;
-      }
-
-  /* Strip off any plural and try the units table again. */
-  i = strlen (buff) - 1;
-  if (buff[i] == 's')
-    {
-      buff[i] = '\0';
-      for (tp = UnitsTable; tp->name; tp++)
-	if (strcmp (buff, tp->name) == 0)
-	  {
-	    lvalp->Number = tp->value;
-	    return tp->type;
-	  }
-      buff[i] = 's';		/* Put back for "this" in OtherTable. */
-    }
-
-  for (tp = OtherTable; tp->name; tp++)
-    if (strcmp (buff, tp->name) == 0)
-      {
-	lvalp->Number = tp->value;
-	return tp->type;
-      }
-
-  /* Military timezones. */
-  if (buff[1] == '\0' && ISALPHA ((unsigned char) *buff))
-    {
-      for (tp = MilitaryTable; tp->name; tp++)
-	if (strcmp (buff, tp->name) == 0)
-	  {
-	    lvalp->Number = tp->value;
-	    return tp->type;
-	  }
-    }
-
-  /* Drop out any periods and try the timezone table again. */
-  for (i = 0, p = q = buff; *q; q++)
-    if (*q != '.')
-      *p++ = *q;
-    else
-      i++;
-  *p = '\0';
-  if (i)
-    for (tp = TimezoneTable; tp->name; tp++)
-      if (strcmp (buff, tp->name) == 0)
-	{
-	  lvalp->Number = tp->value;
-	  return tp->type;
-	}
-
-  return tID;
-}
-
-int yylex (YYSTYPE *lvalp, void *parm)
-{
-  register unsigned char c;
-  register char *p;
-  char buff[20];
-  int Count;
-  int sign;
-  struct date_yy * date = (struct date_yy *)parm;
-
-  for (;;)
-    {
-      while (ISSPACE ((unsigned char) *date->yyInput))
-	date->yyInput++;
-
-      if (ISDIGIT (c = *date->yyInput) || c == '-' || c == '+')
-	{
-	  if (c == '-' || c == '+')
-	    {
-	      sign = c == '-' ? -1 : 1;
-	      if (!ISDIGIT (*++date->yyInput))
-		/* skip the '-' sign */
-		continue;
-	    }
-	  else
-	    sign = 0;
-	  for (lvalp->Number = 0; ISDIGIT (c = *date->yyInput++);)
-	    lvalp->Number = 10 * lvalp->Number + c - '0';
-	  date->yyInput--;
-	  if (sign < 0)
-	    lvalp->Number = -lvalp->Number;
-	  /* Ignore ordinal suffixes on numbers */
-	  c = *date->yyInput;
-	  if (c == 's' || c == 'n' || c == 'r' || c == 't') {
-	    c = *++date->yyInput;
-	    if (c == 't' || c == 'd' || c == 'h') {
-	      date->yyInput++;
-	    } else {
-	      date->yyInput--;
-	    }
-	  }
-	  return sign ? tSNUMBER : tUNUMBER;
-	}
-      if (ISALPHA (c))
-	{
-	  for (p = buff; (c = *date->yyInput++, ISALPHA (c)) || c == '.';)
-	    if (p < &buff[sizeof buff - 1])
-	      *p++ = c;
-	  *p = '\0';
-	  date->yyInput--;
-	  return LookupWord (lvalp, buff);
-	}
-      if (c != '(')
-	return *date->yyInput++;
-      Count = 0;
-      do
-	{
-	  c = *date->yyInput++;
-	  if (c == '\0')
-	    return c;
-	  if (c == '(')
-	    Count++;
-	  else if (c == ')')
-	    Count--;
-	}
-      while (Count > 0);
-    }
-}
-
-#define TM_YEAR_ORIGIN 1900
-
-/* Yield A - B, measured in seconds.  */
-static long
-difftm (struct tm *a, struct tm *b)
-{
-  int ay = a->tm_year + (TM_YEAR_ORIGIN - 1);
-  int by = b->tm_year + (TM_YEAR_ORIGIN - 1);
-  long days = (
-  /* difference in day of year */
-		a->tm_yday - b->tm_yday
-  /* + intervening leap days */
-		+ ((ay >> 2) - (by >> 2))
-		- (ay / 100 - by / 100)
-		+ ((ay / 100 >> 2) - (by / 100 >> 2))
-  /* + difference in years * 365 */
-		+ (long) (ay - by) * 365
-  );
-  return (60 * (60 * (24 * days + (a->tm_hour - b->tm_hour))
-		+ (a->tm_min - b->tm_min))
-	  + (a->tm_sec - b->tm_sec));
-}
-
-PHPAPI time_t php_parse_date(char *p, time_t *now)
-{
-  struct tm tm, tm0, *tmp;
-  time_t Start;
-  struct date_yy date;
-
-  date.yyInput = p;
-  Start = now ? *now : time ((time_t *) NULL);
-  tmp = localtime (&Start);
-  if (!tmp)
-    return -1;
-  date.yyYear = tmp->tm_year + TM_YEAR_ORIGIN;
-  date.yyMonth = tmp->tm_mon + 1;
-  date.yyDay = tmp->tm_mday;
-  date.yyHour = tmp->tm_hour;
-  date.yyMinutes = tmp->tm_min;
-  date.yySeconds = tmp->tm_sec;
-  tm.tm_isdst = tmp->tm_isdst;
-  date.yyMeridian = MER24;
-  date.yyRelSeconds = 0;
-  date.yyRelMinutes = 0;
-  date.yyRelHour = 0;
-  date.yyRelDay = 0;
-  date.yyRelMonth = 0;
-  date.yyRelYear = 0;
-  date.yyHaveDate = 0;
-  date.yyHaveDay = 0;
-  date.yyHaveRel = 0;
-  date.yyHaveTime = 0;
-  date.yyHaveZone = 0;
-
-  if (yyparse ((void *)&date)
-      || date.yyHaveTime > 1 || date.yyHaveZone > 1 
-	  || date.yyHaveDate > 1 || date.yyHaveDay > 1) {
-    return -1;
-  }
-  tm.tm_year = ToYear (date.yyYear) - TM_YEAR_ORIGIN + date.yyRelYear;
-  tm.tm_mon = date.yyMonth - 1 + date.yyRelMonth;
-  tm.tm_mday = date.yyDay + date.yyRelDay;
-  if (date.yyHaveTime || (date.yyHaveRel && !date.yyHaveDate && !date.yyHaveDay))
-    {
-      tm.tm_hour = ToHour (date.yyHour, date.yyMeridian);
-      if (tm.tm_hour < 0)
-	return -1;
-      tm.tm_min = date.yyMinutes;
-      tm.tm_sec = date.yySeconds;
-    }
-  else
-    {
-      tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
-    }
-  tm.tm_hour += date.yyRelHour;
-  tm.tm_min += date.yyRelMinutes;
-  tm.tm_sec += date.yyRelSeconds;
-
-  /* Let mktime deduce tm_isdst if we have an absolute timestamp,
-     or if the relative timestamp mentions days, months, or years.  */
-  if (date.yyHaveDate | date.yyHaveDay | date.yyHaveTime | date.yyRelDay | date.yyRelMonth | date.yyRelYear)
-    tm.tm_isdst = -1;
-
-  tm0 = tm;
-
-  Start = mktime (&tm);
-
-  if (Start == (time_t) -1)
-    {
-
-      /* Guard against falsely reporting errors near the time_t boundaries
-         when parsing times in other time zones.  For example, if the min
-         time_t value is 1970-01-01 00:00:00 UTC and we are 8 hours ahead
-         of UTC, then the min localtime value is 1970-01-01 08:00:00; if
-         we apply mktime to 1970-01-01 00:00:00 we will get an error, so
-         we apply mktime to 1970-01-02 08:00:00 instead and adjust the time
-         zone by 24 hours to compensate.  This algorithm assumes that
-         there is no DST transition within a day of the time_t boundaries.  */
-      if (date.yyHaveZone)
-	{
-	  tm = tm0;
-	  if (tm.tm_year <= EPOCH - TM_YEAR_ORIGIN)
-	    {
-	      tm.tm_mday++;
-	      date.yyTimezone -= 24 * 60;
-	    }
-	  else
-	    {
-	      tm.tm_mday--;
-	      date.yyTimezone += 24 * 60;
-	    }
-	  Start = mktime (&tm);
-	}
-
-      if (Start == (time_t) -1)
-	return Start;
-    }
-
-  if (date.yyHaveDay && !date.yyHaveDate)
-    {
-      tm.tm_mday += ((date.yyDayNumber - tm.tm_wday + 7) % 7
-		     + 7 * (date.yyDayOrdinal - (0 < date.yyDayOrdinal)));
-      Start = mktime (&tm);
-      if (Start == (time_t) -1)
-	return Start;
-    }
-
-  if (date.yyHaveZone)
-    {
-      long delta;
-      struct tm *gmt = gmtime (&Start);
-      if (!gmt)
-	return -1;
-      delta = date.yyTimezone * 60L + difftm (&tm, gmt);
-
-      if ((Start + delta < Start) != (delta < 0))
-	return -1;		/* time_t overflow */
-      Start += delta;
-    }
-
-  return Start;
-}
diff --git a/ext/standard/php_parsedate.h b/ext/standard/php_parsedate.h
deleted file mode 100644
index 6ba4017009..0000000000
--- a/ext/standard/php_parsedate.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2004 The PHP Group                                |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license,       |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available through the world-wide-web at the following url:           |
-   | http://www.php.net/license/3_0.txt.                                  |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Author: Sascha Schumann <sascha@schumann.cx>                         |
-   +----------------------------------------------------------------------+
- */
-
-/* $Id$ */
-
-#ifndef PHP_PARSEDATE_H
-#define PHP_PARSEDATE_H
-
-#include <time.h>
-
-PHPAPI time_t php_parse_date(char *p, time_t *now);
-
-#endif
diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index 80f9ab3215..7c708fa952 100644
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -34,7 +34,7 @@
 #include "ext/standard/php_smart_str.h"
 #include "ext/standard/html.h"
 #include "ext/standard/php_string.h"
-#include "ext/standard/php_parsedate.h"
+#include "ext/date/php_date.h"
 
 #define WDDX_BUF_LEN			256
 #define PHP_CLASS_NAME_VAR		"php_class_name"
diff --git a/genfiles b/genfiles
index c20115f2eb..502b0b11d1 100755
--- a/genfiles
+++ b/genfiles
@@ -5,7 +5,6 @@ STD='make -f Makefile.frag LEX="flex -L" YACC="bison -y -l" srcdir=Zend builddir
 (eval "$STD Zend/zend_language_parser.c Zend/zend_language_scanner.c Zend/zend_ini_parser.c Zend/zend_ini_scanner.c")
 
 set -x
-bison -d -y -l ext/standard/parsedate.y -o ext/standard/parsedate.c
 
 for f in ext/standard/url_scanner_ex.c ext/standard/var_unserializer.c; do
   cp $f $f.orig
diff --git a/netware/BisonExtStandard.bat b/netware/BisonExtStandard.bat
index 1a2e06950a..4b394d8308 100755
--- a/netware/BisonExtStandard.bat
+++ b/netware/BisonExtStandard.bat
@@ -1,3 +1,2 @@
 @echo off

 

-bison --output=ext\standard\parsedate.c -v -d -p phplib ext\standard\parsedate.y

diff --git a/netware/phplib.mak b/netware/phplib.mak
index 90b6e67427..1d22fcd104 100644
--- a/netware/phplib.mak
+++ b/netware/phplib.mak
@@ -105,7 +105,6 @@ C_SRC = ext/bcmath/bcmath.c \
         ext/standard/microtime.c \
         ext/standard/pack.c \
         ext/standard/pageinfo.c \
-        ext/standard/parsedate.c \
         ext/standard/php_fopen_wrapper.c \
         ext/standard/quot_print.c \
         ext/standard/rand.c \
@@ -368,9 +367,6 @@ cleand:
 .PHONY: cleansrc
 cleansrc:
 	@echo Deleting all generated source files...
-	-@del "ext\standard\parsedate.c"
-	-@del "ext\standard\parsedate.h"
-	-@del "ext\standard\parsedate.output"
 
 .PHONY: cleanobj
 cleanobj:
diff --git a/win32/build/Makefile b/win32/build/Makefile
index d249efa1be..a0811aedf1 100644
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -30,7 +30,6 @@ build_dirs: $(BUILD_DIR) $(BUILD_DIRS_SUB)
 generated_files: build_dirs Zend\zend_ini_parser.c \
 	Zend\zend_language_parser.c Zend\zend_ini_scanner.c \
 	Zend\zend_language_scanner.c \
-	ext\standard\parsedate.c \
 	$(PHPDEF) $(MCFILE)
 
 $(BUILD_DIR)\$(PHPDLL).def: $(PHP_DLL_DEF_SOURCES)
@@ -48,9 +47,6 @@ Zend\zend_ini_scanner.c: Zend\flex.skl Zend\zend_ini_scanner.l
 Zend\zend_language_scanner.c: Zend\flex.skl Zend\zend_language_scanner.l
 	$(FLEX) -i -SZend/flex.skl -Pzend -oZend/zend_language_scanner.c Zend/zend_language_scanner.l
 
-ext\standard\parsedate.c ext\standard\parsedate.h: ext\standard\parsedate.y
-	$(BISON) --output=ext/standard/parsedate.c -v -d ext/standard/parsedate.y 
-
 PHPDLL_RES=$(BUILD_DIR)\$(PHPDLL).res
 
 $(MCFILE): win32\build\wsyslog.mc
diff --git a/win32/php5dll.dsp b/win32/php5dll.dsp
index 43d7f97590..891a0438f0 100644
--- a/win32/php5dll.dsp
+++ b/win32/php5dll.dsp
@@ -500,10 +500,6 @@ SOURCE=..\ext\standard\pageinfo.c
 # End Source File

 # Begin Source File

 

-SOURCE=..\ext\standard\parsedate.c

-# End Source File

-# Begin Source File

-

 SOURCE=..\ext\standard\php_fopen_wrapper.c

 # End Source File

 # Begin Source File

@@ -1664,50 +1660,6 @@ SOURCE=..\win32\wfile.h
 # End Source File

 # End Group

 # End Group

-# Begin Group "Parsers"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\ext\standard\parsedate.y

-

-!IF  "$(CFG)" == "php5dll - Win32 Debug"

-

-# Begin Custom Build - Generating ext/standard/parsedate.c

-InputPath=..\ext\standard\parsedate.y

-

-"..\ext\standard\parsedate.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	cd ..\ext\standard 

-	bison --output=parsedate.c -v -d parsedate.y 

-	

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release"

-

-# Begin Custom Build - Generating ext/standard/parsedate.c

-InputPath=..\ext\standard\parsedate.y

-

-"..\ext\standard\parsedate.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	cd ..\ext\standard 

-	bison --output=parsedate.c -v -d parsedate.y 

-	

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "php5dll - Win32 Release_inline"

-

-# Begin Custom Build - Generating ext/standard/parsedate.c

-InputPath=..\ext\standard\parsedate.y

-

-"..\ext\standard\parsedate.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	cd ..\ext\standard 

-	bison --output=parsedate.c -v -d parsedate.y 

-	

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# End Group

 # Begin Group "Text Files"

 

 # PROP Default_Filter ""

diff --git a/win32/php5dllts.dsp b/win32/php5dllts.dsp
index 79048f20c7..745d800f4f 100644
--- a/win32/php5dllts.dsp
+++ b/win32/php5dllts.dsp
@@ -1704,10 +1704,6 @@ SOURCE=..\ext\standard\pageinfo.c
 # End Source File

 # Begin Source File

 

-SOURCE=..\ext\standard\parsedate.c

-# End Source File

-# Begin Source File

-

 SOURCE=..\ext\standard\php_fopen_wrapper.c

 # End Source File

 # Begin Source File

@@ -2148,61 +2144,6 @@ SOURCE=.\winutil.h
 # End Source File

 # End Group

 # End Group

-# Begin Group "Parsers"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=..\ext\standard\parsedate.y

-

-!IF  "$(CFG)" == "php5dllts - Win32 Debug_TS"

-

-# Begin Custom Build - Generating ext/standard/parsedate.c

-InputPath=..\ext\standard\parsedate.y

-

-"..\ext\standard\parsedate.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	cd ..\ext\standard 

-	bison --output=parsedate.c -v -d parsedate.y 

-	

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS"

-

-# Begin Custom Build - Generating ext/standard/parsedate.c

-InputPath=..\ext\standard\parsedate.y

-

-"..\ext\standard\parsedate.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	cd ..\ext\standard 

-	bison --output=parsedate.c -v -d parsedate.y 

-	

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TS_inline"

-

-# Begin Custom Build - Generating ext/standard/parsedate.c

-InputPath=..\ext\standard\parsedate.y

-

-"..\ext\standard\parsedate.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	cd ..\ext\standard 

-	bison --output=parsedate.c -v -d parsedate.y 

-	

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "php5dllts - Win32 Release_TSDbg"

-

-# Begin Custom Build - Generating ext/standard/parsedate.c

-InputPath=..\ext\standard\parsedate.y

-

-"..\ext\standard\parsedate.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	cd ..\ext\standard 

-	bison --output=parsedate.c -v -d parsedate.y 

-	

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# End Group

 # Begin Group "Text Files"

 

 # PROP Default_Filter ""