--- embedaddon/php/ext/date/lib/parse_date.re	2012/05/29 12:34:37	1.1.1.2
+++ embedaddon/php/ext/date/lib/parse_date.re	2013/10/14 08:02:09	1.1.1.4
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | 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        |
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: parse_date.re,v 1.1.1.2 2012/05/29 12:34:37 misho Exp $ */
+/* $Id: parse_date.re,v 1.1.1.4 2013/10/14 08:02:09 misho Exp $ */
 
 #include "timelib.h"
 
@@ -649,7 +649,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;
@@ -1073,6 +1074,7 @@ weekdayof        = (reltextnumber|reltexttext) space (
 		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;
@@ -2077,6 +2079,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 */
@@ -2128,7 +2131,7 @@ timelib_time *timelib_parse_from_format(char *format, 
 				break;
 
 			case '\\': /* escaped char */
-				*fptr++;
+				fptr++;
 				if (*ptr == *fptr) {
 					++ptr;
 				} else {