From 4544b3824c8ce74e0a92c58a3167f900904f506b Mon Sep 17 00:00:00 2001
From: tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 25 Aug 2011 23:24:33 +0000
Subject: * time.c (strftimev): Make Time#to_s default to US-ASCII encoding but
   respect Encoding.default_internal. [ruby-core:39092] *
 test/ruby/test_time.rb (class TestTime): Corresponding test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33073 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 time.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'time.c')

diff --git a/time.c b/time.c
index ebe0ab9bd9..fbd0ecf198 100644
--- a/time.c
+++ b/time.c
@@ -4347,6 +4347,8 @@ strftimev(const char *fmt, VALUE time)
     MAKE_TM(time, tobj);
     len = rb_strftime_alloc(&buf, fmt, &tobj->vtm, tobj->timew, TIME_UTC_P(tobj));
     str = rb_str_new(buf, len);
+    rb_enc_associate_index(str, rb_usascii_encindex());
+    str = rb_str_export_to_enc(str, rb_default_internal_encoding());
     if (buf != buffer) xfree(buf);
     return str;
 }
-- 
cgit v1.2.3