diff options
Diffstat (limited to 'ext/standard/datetime.c')
| -rw-r--r-- | ext/standard/datetime.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c index 3e21b9a279..55262b57a5 100644 --- a/ext/standard/datetime.c +++ b/ext/standard/datetime.c @@ -64,21 +64,12 @@ PHPAPI char *php_std_date(time_t t TSRMLS_DC) return str; } - if (PG(y2k_compliance)) { - snprintf(str, 80, "%s, %02d %s %04d %02d:%02d:%02d GMT", - day_short_names[tm1->tm_wday], - tm1->tm_mday, - mon_short_names[tm1->tm_mon], - tm1->tm_year + 1900, - tm1->tm_hour, tm1->tm_min, tm1->tm_sec); - } else { - snprintf(str, 80, "%s, %02d-%s-%02d %02d:%02d:%02d GMT", - day_full_names[tm1->tm_wday], - tm1->tm_mday, - mon_short_names[tm1->tm_mon], - ((tm1->tm_year) % 100), - tm1->tm_hour, tm1->tm_min, tm1->tm_sec); - } + snprintf(str, 80, "%s, %02d %s %04d %02d:%02d:%02d GMT", + day_short_names[tm1->tm_wday], + tm1->tm_mday, + mon_short_names[tm1->tm_mon], + tm1->tm_year + 1900, + tm1->tm_hour, tm1->tm_min, tm1->tm_sec); str[79] = 0; return (str); |