summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-03-05 11:22:47 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-03-05 11:22:47 +0000
commit4f46294b7d2fd58f219711081e06ce35b0afde19 (patch)
tree063483f7dc0e062c5366e8bd3e0007ce44043f13
parenta30657e815d70c52b04d9220de30eb9b0b235909 (diff)
* time.c (time_to_s): Correct the wrong format which did not
really conform to RFC 2822; pointed out by: OHARA Shigeki <os at iij.ad.jp> in [ruby-dev:30487]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11996 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--NEWS2
-rw-r--r--time.c10
-rw-r--r--version.h6
4 files changed, 15 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index f2285bc512..590b46d4f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Mar 5 20:14:49 2007 Akinori MUSHA <knu@iDaemons.org>
+
+ * time.c (time_to_s): Correct the wrong format which did not
+ really conform to RFC 2822; pointed out by: OHARA Shigeki <os at
+ iij.ad.jp> in [ruby-dev:30487].
+
Sun Mar 4 23:38:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_stat_s_utime): fixed a commit miss for the platforms
diff --git a/NEWS b/NEWS
index f4e16ab28c..9a0130ec0e 100644
--- a/NEWS
+++ b/NEWS
@@ -83,7 +83,7 @@ with all sufficient information, see the ChangeLog file.
# Before
"Wed Mar 03 12:34:56 JST 2007"
# After
- "Wed, Mar 03 2007 12:34:56 +0900"
+ "Wed, 03 Mar 2007 12:34:56 +0900"
* String#intern now raises SecurityError when $SAFE level is greater
than zero.
diff --git a/time.c b/time.c
index d919c631f4..dd5153db62 100644
--- a/time.c
+++ b/time.c
@@ -1239,11 +1239,11 @@ time_asctime(time)
* time.to_s => string
*
* Returns a string representing <i>time</i>. Equivalent to calling
- * <code>Time#strftime</code> with a format string of ``<code>%a</code>
- * <code>%b</code> <code>%d</code> <code>%H:%M:%S</code>
- * <code>%Z</code> <code>%Y</code>''.
+ * <code>Time#strftime</code> with a format string of ``<code>%a,</code>
+ * <code>%d</code> <code>%b</code> <code>%H:%M:%S</code>
+ * <code>%Z</code> <code>%Y</code>'' (the RFC 2822 style).
*
- * Time.now.to_s #=> "Wed Apr 09 08:56:04 CDT 2003"
+ * Time.now.to_s #=> "Wed 09 Apr 08:56:04 CDT 2003"
*/
static VALUE
@@ -1274,7 +1274,7 @@ time_to_s(time)
sign = '-';
off = -off;
}
- sprintf(buf2, "%%a, %%b %%d %%Y %%H:%%M:%%S %c%02d%02d",
+ sprintf(buf2, "%%a, %%d %%b %%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);
diff --git a/version.h b/version.h
index 62778ba182..f08ab3e8dc 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-03-04"
+#define RUBY_RELEASE_DATE "2007-03-05"
#define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20070304
+#define RUBY_RELEASE_CODE 20070305
#define RUBY_PATCHLEVEL 5000
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 4
+#define RUBY_RELEASE_DAY 5
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];