cvs: php4 /ext/standard datetime.c

chagenbu Sat Nov 11 09:28:20 2000 EDT Modified files: /php4/ext/standard datetime.c Log: RFC822 does specify two digit years, but practically every decent mail client I could check is using 4-digit years these days. Index: php4/ext/standard/datetime.c diff -u php4/ext/standard/datetime.c:1.56 php4/ext/standard/datetime.c:1.57 --- php4/ext/standard/datetime.c:1.56 Thu Nov 9 13:30:03 2000 +++ php4/ext/standard/datetime.c Sat Nov 11 09:28:20 2000 @@ -19,7 +19,7 @@ */ -/* $Id: datetime.c,v 1.56 2000/11/09 21:30:03 cmv Exp $ */ +/* $Id: datetime.c,v 1.57 2000/11/11 17:28:20 chagenbu Exp $ */ #include "php.h" @@ -248,7 +248,7 @@ for (i = 0; i < (*format)->value.str.len; i++) { switch ((*format)->value.str.val[i]) { case 'r': /* rfc822 format */ - size += 29; + size += 31; break; case 'U': /* seconds since the epoch */ size += 10; @@ -462,11 +462,11 @@ break; case 'r': #if HAVE_TM_GMTOFF - sprintf(tmp_buff, "%3s, %2d %3s %02d %02d:%02d:%02d %c%02d%02d", + sprintf(tmp_buff, "%3s, %2d %3s %04d %02d:%02d:%02d %c%02d%02d", day_short_names[ta->tm_wday], ta->tm_mday, mon_short_names[ta->tm_mon], - ((ta->tm_year)%100), + ta->tm_year + 1900, ta->tm_hour, ta->tm_min, ta->tm_sec, @@ -475,11 +475,11 @@ abs( ta->tm_gmtoff % 3600) ); #else - sprintf(tmp_buff, "%3s, %2d %3s %02d %02d:%02d:%02d %c%02d%02d", + sprintf(tmp_buff, "%3s, %2d %3s %04d %02d:%02d:%02d %c%02d%02d", day_short_names[ta->tm_wday], ta->tm_mday, mon_short_names[ta->tm_mon], - ((ta->tm_year)%100), + ta->tm_year + 1900, ta->tm_hour, ta->tm_min, ta->tm_sec,