From 60f40519f00ab9841a40afcaefbc6efc36a760cd Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 4 Sep 2006 17:32:30 +0000 Subject: * time.c (time_to_s): make it conform to RFC2822 date format. [ruby-dev:29467] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10860 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ time.c | 29 ++++++++++++----------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 36884ae4b8..e7aab926e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Sep 4 23:15:34 2006 Yukihiro Matsumoto + + * time.c (time_to_s): make it conform to RFC2822 date format. + [ruby-dev:29467] + Mon Sep 4 21:43:57 2006 Nobuyoshi Nakada * ext/dbm/extconf.rb: create makefile according to the result of check diff --git a/time.c b/time.c index 11443e3959..50d537b6cd 100644 --- a/time.c +++ b/time.c @@ -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); } -- cgit v1.2.3