cvs: php4 /ext/standard datetime.c
| From: | Kai Schr�der | Date: | Sun, 09 Feb 2003 21:44:51 +0000 |
| Subject: | cvs: php4 /ext/standard datetime.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-18583@lists.php.net to get a copy of this message | ||
k.schroeder Sun Feb 9 16:44:51 2003 EDT
Modified files:
/php4/ext/standard datetime.c
Log:
fix for #17928
Index: php4/ext/standard/datetime.c
diff -u php4/ext/standard/datetime.c:1.103 php4/ext/standard/datetime.c:1.104
--- php4/ext/standard/datetime.c:1.103 Sun Feb 9 07:28:01 2003
+++ php4/ext/standard/datetime.c Sun Feb 9 16:44:51 2003
@@ -19,7 +19,7 @@
*/
-/* $Id: datetime.c,v 1.103 2003/02/09 12:28:01 k.schroeder Exp $ */
+/* $Id: datetime.c,v 1.104 2003/02/09 21:44:51 k.schroeder Exp $ */
#include "php.h"
@@ -343,7 +343,11 @@
#if HAVE_TM_ZONE
size += strlen(ta->tm_zone);
#elif HAVE_TZNAME
- size += strlen(tname[0]);
+ if (ta->tm_isdst > 0 ) {
+ size += strlen(tname[1]);
+ } else {
+ size += strlen(tname[0]);
+ }
#endif
break;
case 'Z': /* timezone offset in seconds */