derick Mon Nov 15 11:30:47 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/ext/standard parsedate.y
Log:
- Fixed bug #28599 (strtotime fails with zero base time).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.122&r2=1.1760.2.123&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.122 php-src/NEWS:1.1760.2.123
--- php-src/NEWS:1.1760.2.122 Mon Nov 15 08:41:40 2004
+++ php-src/NEWS Mon Nov 15 11:30:43 2004
@@ -54,6 +54,7 @@
- Fixed bug #29418 (double free when openssl_csr_new fails).
(Kamesh Jayachandran).
- Fixed bug #29211 (SoapClient doesn't request wsdl through proxy). (Rob)
+- Fixed bug #28599 (strtotime fails with zero base time). (Derick)
- Fixed bug #28220 (mb_strwidth() returns wrong width values for some hangul
characters). (Moriyoshi)
- Fixed bug #27798 (private / protected variables not exposed by
http://cvs.php.net/diff.php/php-src/ext/standard/parsedate.y?r1=1.56&r2=1.56.2.1&ty=u
Index: php-src/ext/standard/parsedate.y
diff -u php-src/ext/standard/parsedate.y:1.56
php-src/ext/standard/parsedate.y:1.56.2.1
--- php-src/ext/standard/parsedate.y:1.56 Thu Apr 8 15:21:05 2004
+++ php-src/ext/standard/parsedate.y Mon Nov 15 11:30:46 2004
@@ -8,7 +8,7 @@
** This code is in the public domain and has no copyright.
*/
-/* $Id: parsedate.y,v 1.56 2004/04/08 19:21:05 derick Exp $ */
+/* $Id: parsedate.y,v 1.56.2.1 2004/11/15 16:30:46 derick Exp $ */
#include "php.h"
@@ -1079,7 +1079,7 @@
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) */)
+ if (date.yyHaveTime || (date.yyHaveRel && !date.yyHaveDate &&
!date.yyHaveDay))
{
tm.tm_hour = ToHour (date.yyHour, date.yyMeridian);
if (tm.tm_hour < 0)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
