diff options
| -rw-r--r-- | ext/standard/datetime.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c index e1344a72e2..91185c6caa 100644 --- a/ext/standard/datetime.c +++ b/ext/standard/datetime.c @@ -236,6 +236,9 @@ php_date(INTERNAL_FUNCTION_PARAMETERS, int gm) } for (i = 0; i < (*format)->value.str.len; i++) { switch ((*format)->value.str.val[i]) { + case 'O': /* GMT offset in [+-]HHMM format */ + size += 5; + break; case 'U': /* seconds since the epoch */ size += 10; break; @@ -406,6 +409,14 @@ php_date(INTERNAL_FUNCTION_PARAMETERS, int gm) sprintf(tmp_buff, "%01d", ta->tm_wday); /* SAFE */ strcat(return_value->value.str.val, tmp_buff); break; + case 'O': /* GMT offset in [+-]HHMM format */ +#if HAVE_TM_GMTOFF + sprintf(tmp_buff, "%c%02d%02d", (ta->tm_gmtoff < 0) ? '-' : '+', abs(ta->tm_gmtoff / 3600), abs( ta->tm_gmtoff % 3600)); +#else + sprintf(tmp_buff, "%c%02d%02d", ((ta->tm_isdst ? timezone - 3600:timezone)<0)?'-':'+',abs((ta->tm_isdst ? timezone - 3600 : timezone) / 3600), abs((ta->tm_isdst ? timezone - 3600 : timezone) % 3600)); +#endif + strcat(return_value->value.str.val, tmp_buff); + break; case 'Z': /* timezone offset in seconds */ #if HAVE_TM_GMTOFF sprintf(tmp_buff, "%ld", ta->tm_gmtoff); |