svn: /php/php-src/branches/PHP_5_2/ NEWS ext/date/lib/parse_date.c ext/date/lib/parse_date.re
| From: | Adam Harvey | Date: | Fri, 26 Mar 2010 10:12:43 +0000 |
| Subject: | svn: /php/php-src/branches/PHP_5_2/ NEWS ext/date/lib/parse_date.c ext/date/lib/parse_date.re | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-62136@lists.php.net to get a copy of this message | ||
aharvey Fri, 26 Mar 2010 10:12:43 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=296837
Log:
Backported the fix for bug #51393 (DateTime::createFromFormat() fails if format
string contains timezone) to PHP_5_2 per discussion with Derick.
Bug: http://bugs.php.net/51393 (Closed)
DateTime::createFromFormat() fails if format string contains timezone
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/date/lib/parse_date.c
U php/php-src/branches/PHP_5_2/ext/date/lib/parse_date.re
Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS 2010-03-26 09:50:24 UTC (rev 296836)
+++ php/php-src/branches/PHP_5_2/NEWS 2010-03-26 10:12:43 UTC (rev 296837)
@@ -9,6 +9,8 @@
- Fixed a NULL pointer dereference when processing invalid XML-RPC
requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert)
+- Fixed bug #51393 (DateTime::createFromFormat() fails if format string contains
+ timezone). (Adam)
- Fixed bug #51338 (URL-Rewriter is still enabled if use_only_cookies is
on). (Ilia, j dot jeising at gmail dot com)
- Fixed bug #51269 (zlib.output_compression Overwrites Vary Header). (Adam)
Modified: php/php-src/branches/PHP_5_2/ext/date/lib/parse_date.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/date/lib/parse_date.c 2010-03-26 09:50:24 UTC (rev 296836)
+++ php/php-src/branches/PHP_5_2/ext/date/lib/parse_date.c 2010-03-26 10:12:43 UTC (rev 296837)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Sun Mar 7 18:35:25 2010 */
+/* Generated by re2c 0.13.5 on Fri Mar 26 18:06:18 2010 */
#line 1 "ext/date/lib/parse_date.re"
/*
+----------------------------------------------------------------------+
@@ -469,7 +469,7 @@
char *begin = *ptr, *end;
long tmp;
- while (**ptr != '\0') {
+ while (isdigit(**ptr) || **ptr == ':') {
++*ptr;
}
end = *ptr;
Modified: php/php-src/branches/PHP_5_2/ext/date/lib/parse_date.re
===================================================================
--- php/php-src/branches/PHP_5_2/ext/date/lib/parse_date.re 2010-03-26 09:50:24 UTC (rev 296836)
+++ php/php-src/branches/PHP_5_2/ext/date/lib/parse_date.re 2010-03-26 10:12:43 UTC (rev 296837)
@@ -467,7 +467,7 @@
char *begin = *ptr, *end;
long tmp;
- while (**ptr != '\0') {
+ while (isdigit(**ptr) || **ptr == ':') {
++*ptr;
}
end = *ptr;