summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerick Rethans <derick@php.net>2008-02-25 18:28:18 +0000
committerDerick Rethans <derick@php.net>2008-02-25 18:28:18 +0000
commit08e237cc6db931ffd727f3257085d8f54410a458 (patch)
tree8ba89bbefcb8a2724da00dd63f6ea0bb2a11f349
parentd4e61a304263d676647c69fe9af69dac007b664a (diff)
downloadphp-git-08e237cc6db931ffd727f3257085d8f54410a458.tar.gz
- MFH: Fixed a problem with parsing timezones as part of a format.
#- It doesn't actually fix anything, but atleast it's consistent with HEAD.
-rw-r--r--ext/date/lib/parse_date.c4
-rw-r--r--ext/date/lib/parse_date.re2
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c
index ef95b1903c..20919cb700 100644
--- a/ext/date/lib/parse_date.c
+++ b/ext/date/lib/parse_date.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.12.1 on Sat Jan 26 16:10:48 2008 */
+/* Generated by re2c 0.12.1 on Mon Feb 25 19:27:05 2008 */
#line 1 "ext/date/lib/parse_date.re"
/*
+----------------------------------------------------------------------+
@@ -669,7 +669,7 @@ static long timelib_lookup_zone(char **ptr, int *dst, char **tz_abbr, int *found
long value = 0;
const timelib_tz_lookup_table *tp;
- while (**ptr != '\0' && **ptr != ')') {
+ while (**ptr != '\0' && **ptr != ')' && **ptr != ' ') {
++*ptr;
}
end = *ptr;
diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re
index 72816a955a..732038ef08 100644
--- a/ext/date/lib/parse_date.re
+++ b/ext/date/lib/parse_date.re
@@ -667,7 +667,7 @@ static long timelib_lookup_zone(char **ptr, int *dst, char **tz_abbr, int *found
long value = 0;
const timelib_tz_lookup_table *tp;
- while (**ptr != '\0' && **ptr != ')') {
+ while (**ptr != '\0' && **ptr != ')' && **ptr != ' ') {
++*ptr;
}
end = *ptr;