cvs: php4 /ext/standard datetime.c
| From: | Jani Taskinen | Date: | Sun, 06 Apr 2003 22:37:45 +0000 |
| Subject: | cvs: php4 /ext/standard datetime.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-20145@lists.php.net to get a copy of this message | ||
sniper Sun Apr 6 18:37:45 2003 EDT
Modified files:
/php4/ext/standard datetime.c
Log:
Fixed bug #23071 (when DST in effect, date("T") crashed PHP)
Index: php4/ext/standard/datetime.c
diff -u php4/ext/standard/datetime.c:1.107 php4/ext/standard/datetime.c:1.108
--- php4/ext/standard/datetime.c:1.107 Tue Mar 25 03:07:12 2003
+++ php4/ext/standard/datetime.c Sun Apr 6 18:37:45 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: datetime.c,v 1.107 2003/03/25 08:07:12 sebastian Exp $ */
+/* $Id: datetime.c,v 1.108 2003/04/06 22:37:45 sniper Exp $ */
#include "php.h"
#include "zend_operators.h"
@@ -535,7 +535,7 @@
#if HAVE_TM_ZONE
strcat(Z_STRVAL_P(return_value), ta->tm_zone);
#elif HAVE_TZNAME
- strcat(Z_STRVAL_P(return_value), tname[0]);
+ strcat(Z_STRVAL_P(return_value), ta->tm_isdst ? tname[1] : tname[0]);
#endif
break;
case 'B': /* Swatch Beat a.k.a. Internet Time */