k.schroeder             Sun Feb  9 16:42:31 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php4/ext/standard  datetime.c 
  Log:
  fix for #17928
  
Index: php4/ext/standard/datetime.c
diff -u php4/ext/standard/datetime.c:1.96.2.5 php4/ext/standard/datetime.c:1.96.2.6
--- php4/ext/standard/datetime.c:1.96.2.5       Sun Feb  9 07:28:31 2003
+++ php4/ext/standard/datetime.c        Sun Feb  9 16:42:31 2003
@@ -19,7 +19,7 @@
  */
 
 
-/* $Id: datetime.c,v 1.96.2.5 2003/02/09 12:28:31 k.schroeder Exp $ */
+/* $Id: datetime.c,v 1.96.2.6 2003/02/09 21:42:31 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 */



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to