diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | time.c | 29 |
2 files changed, 17 insertions, 17 deletions
@@ -1,3 +1,8 @@ +Mon Sep 4 23:15:34 2006 Yukihiro Matsumoto <matz@ruby-lang.org> + + * time.c (time_to_s): make it conform to RFC2822 date format. + [ruby-dev:29467] + Mon Sep 4 21:43:57 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/dbm/extconf.rb: create makefile according to the result of check @@ -1253,32 +1253,27 @@ time_to_s(time) struct time_object *tobj; char buf[128]; int len; + time_t off; + char buf2[32]; + char sign = '+'; GetTimeval(time, tobj); if (tobj->tm_got == 0) { time_get_tm(time, tobj->gmt); } - if (tobj->gmt == 1) { - len = strftime(buf, 128, "%a %b %d %H:%M:%S UTC %Y", &tobj->tm); - } - else { - time_t off; - char buf2[32]; - char sign = '+'; #if defined(HAVE_STRUCT_TM_TM_GMTOFF) - off = tobj->tm.tm_gmtoff; + off = tobj->tm.tm_gmtoff; #else - VALUE tmp = time_utc_offset(time); - off = NUM2INT(tmp); + VALUE tmp = time_utc_offset(time); + off = NUM2INT(tmp); #endif - if (off < 0) { - sign = '-'; - off = -off; - } - sprintf(buf2, "%%a %%b %%d %%H:%%M:%%S %c%02d%02d %%Y", - sign, (int)(off/3600), (int)(off%3600/60)); - len = strftime(buf, 128, buf2, &tobj->tm); + if (off < 0) { + sign = '-'; + off = -off; } + sprintf(buf2, "%%a, %%b %%d %%Y %%H:%%M:%%S %c%02d%02d", + sign, (int)(off/3600), (int)(off%3600/60)); + len = strftime(buf, 128, buf2, &tobj->tm); return rb_str_new(buf, len); } |