mirror of
https://github.com/php/php-src.git
synced 2024-11-26 03:16:33 +08:00
@- Fixed 'Z' flag in date() to adjust for daylight savings time. (Andrei)
This commit is contained in:
parent
b51aa1f36f
commit
3570258050
@ -54,6 +54,7 @@ char *day_short_names[] =
|
||||
|
||||
#if !defined(HAVE_TM_ZONE) && !defined(_TIMEZONE) && !defined(HAVE_DECLARED_TIMEZONE)
|
||||
extern time_t timezone;
|
||||
extern int daylight;
|
||||
#endif
|
||||
|
||||
static int phpday_tab[2][12] =
|
||||
@ -404,9 +405,9 @@ php_date(INTERNAL_FUNCTION_PARAMETERS, int gm)
|
||||
break;
|
||||
case 'Z': /* timezone offset in seconds */
|
||||
#if HAVE_TM_GMTOFF
|
||||
sprintf(tmp_buff, "%ld", ta->tm_gmtoff );
|
||||
sprintf(tmp_buff, "%ld", ta->tm_isdst ? ta->tm_gmtoff-3600 : ta->tm_gmtoff);
|
||||
#else
|
||||
sprintf(tmp_buff, "%ld", timezone);
|
||||
sprintf(tmp_buff, "%ld", daylight ? timezone-3600 : timezone);
|
||||
#endif
|
||||
strcat(return_value->value.str.val, tmp_buff);
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user