--- embedaddon/php/ext/date/lib/parse_date.c 2012/02/21 23:47:53 1.1.1.1 +++ embedaddon/php/ext/date/lib/parse_date.c 2013/10/14 08:02:09 1.1.1.4 @@ -1,9 +1,9 @@ -/* Generated by re2c 0.13.5 on Mon Dec 5 22:02:41 2011 */ +/* Generated by re2c 0.13.5 on Sun Aug 25 14:46:08 2013 */ /* +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2010 The PHP Group | + | Copyright (c) 1997-2013 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: parse_date.c,v 1.1.1.1 2012/02/21 23:47:53 misho Exp $ */ +/* $Id: parse_date.c,v 1.1.1.4 2013/10/14 08:02:09 misho Exp $ */ #include "timelib.h" @@ -650,7 +650,8 @@ static const timelib_relunit* timelib_lookup_relunit(c char *begin = *ptr, *end; const timelib_relunit *tp, *value = NULL; - while (**ptr != '\0' && **ptr != ' ' && **ptr != ',' && **ptr != '\t') { + while (**ptr != '\0' && **ptr != ' ' && **ptr != ',' && **ptr != '\t' && **ptr != ';' && **ptr != ':' && + **ptr != '/' && **ptr != '.' && **ptr != '-' && **ptr != '(' && **ptr != ')' ) { ++*ptr; } end = *ptr; @@ -21296,6 +21297,7 @@ yy1387: s->time->is_localtime = 1; s->time->zone_type = TIMELIB_ZONETYPE_OFFSET; s->time->z = 0; + s->time->dst = 0; TIMELIB_DEINIT; return TIMELIB_RELATIVE; @@ -24972,6 +24974,7 @@ timelib_time *timelib_parse_from_format(char *format, s->time->is_localtime = 1; s->time->zone_type = TIMELIB_ZONETYPE_OFFSET; s->time->z = 0; + s->time->dst = 0; break; case 'e': /* timezone */ @@ -25023,7 +25026,7 @@ timelib_time *timelib_parse_from_format(char *format, break; case '\\': /* escaped char */ - *fptr++; + fptr++; if (*ptr == *fptr) { ++ptr; } else {