rasmus Fri Mar 12 12:29:53 2004 EDT
Modified files:
/php-src/ext/standard datetime.c
Log:
Fix/workaround for http://bugs.php.net/27533
http://cvs.php.net/diff.php/php-src/ext/standard/datetime.c?r1=1.116&r2=1.117&ty=u
Index: php-src/ext/standard/datetime.c
diff -u php-src/ext/standard/datetime.c:1.116 php-src/ext/standard/datetime.c:1.117
--- php-src/ext/standard/datetime.c:1.116 Mon Mar 8 18:11:43 2004
+++ php-src/ext/standard/datetime.c Fri Mar 12 12:29:52 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: datetime.c,v 1.116 2004/03/08 23:11:43 abies Exp $ */
+/* $Id: datetime.c,v 1.117 2004/03/12 17:29:52 rasmus Exp $ */
#include "php.h"
#include "zend_operators.h"
@@ -189,8 +189,14 @@
/* fall-through */
case 1: /* hour */
val = (*arguments[0])->value.lval;
- if (val < 1) {
- chgsecs += (1-val) * 60*60; val = 1;
+ /*
+ We don't use 1 here to work around problems in some mktime
implementations
+ when it comes to daylight savings time. Setting it to 2 and
working back from
+ there with the chgsecs offset makes us immune to these problems.
+ See http://bugs.php.net/27533 for more info.
+ */
+ if (val < 2) {
+ chgsecs += (2-val) * 60*60; val = 2;
}
ta->tm_hour = val;
/* fall-through */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
