cvs: php4 /ext/standard datetime.c
| From: | Sascha Schumann | Date: | Sat, 24 Feb 2001 21:18:29 +0000 |
| Subject: | cvs: php4 /ext/standard datetime.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-4258@lists.php.net to get a copy of this message | ||
sas Sat Feb 24 13:18:29 2001 EDT
Modified files:
/php4/ext/standard datetime.c
Log:
Don't assume that tzname exists, if tm_zone does not exist.
PR: #9380
Index: php4/ext/standard/datetime.c
diff -u php4/ext/standard/datetime.c:1.66 php4/ext/standard/datetime.c:1.67
--- php4/ext/standard/datetime.c:1.66 Fri Feb 9 07:28:23 2001
+++ php4/ext/standard/datetime.c Sat Feb 24 13:18:28 2001
@@ -19,7 +19,7 @@
*/
-/* $Id: datetime.c,v 1.66 2001/02/09 15:28:23 rasmus Exp $ */
+/* $Id: datetime.c,v 1.67 2001/02/24 21:18:28 sas Exp $ */
#include "php.h"
@@ -260,7 +260,7 @@
case 'T': /* timezone name */
#if HAVE_TM_ZONE
size += strlen(ta->tm_zone);
-#else
+#elif HAVE_TZNAME
size += strlen(tzname[0]);
#endif
break;
@@ -452,7 +452,7 @@
case 'T': /* timezone name */
#if HAVE_TM_ZONE
strcat(return_value->value.str.val, ta->tm_zone);
-#else
+#elif HAVE_TZNAME
strcat(return_value->value.str.val, tzname[0]);
#endif
break;