From 456523e2ede3073767fd8cb73cc4b159c3608890 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 12 Apr 2016 11:40:37 +0000
Subject: [PATCH] date_core.c: preserve timezone

* ext/date/date_core.c (time_to_time): should preserve timezone
  info.  [ruby-core:74889] [Bug #12271]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54553 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                   |  5 +++++
 ext/date/date_core.c        |  4 ++--
 test/date/test_date_conv.rb | 17 +++++++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5642a38d31..7f39aeed38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Apr 12 20:40:35 2016  Kaneko Yuichiro  <spiketeika@gmail.com>
+
+	* ext/date/date_core.c (time_to_time): should preserve timezone
+	  info.  [ruby-core:74889] [Bug #12271]
+
 Tue Apr 12 11:51:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* compile.c (new_label_body): initialize bit fields, since
diff --git a/ext/date/date_core.c b/ext/date/date_core.c
index 18a3a0d709..90350b0e1d 100644
--- a/ext/date/date_core.c
+++ b/ext/date/date_core.c
@@ -8406,12 +8406,12 @@ dt_lite_jisx0301(int argc, VALUE *argv, VALUE self)
  * call-seq:
  *    t.to_time  ->  time
  *
- * Returns a copy of self as local mode.
+ * Returns self.
  */
 static VALUE
 time_to_time(VALUE self)
 {
-    return f_getlocal(self);
+    return self;
 }
 
 /*
diff --git a/test/date/test_date_conv.rb b/test/date/test_date_conv.rb
index 0d6c456163..3729476314 100644
--- a/test/date/test_date_conv.rb
+++ b/test/date/test_date_conv.rb
@@ -3,6 +3,15 @@ require 'test/unit'
 require 'date'
 
 class TestDateConv < Test::Unit::TestCase
+  def with_tz(tz)
+    old = ENV["TZ"]
+    begin
+      ENV["TZ"] = tz
+      yield
+    ensure
+      ENV["TZ"] = old
+    end
+  end
 
   def test_to_class
     [Time.now, Date.today, DateTime.now].each do |o|
@@ -22,6 +31,14 @@ class TestDateConv < Test::Unit::TestCase
     t2 = t.to_time.utc
     assert_equal([2004, 9, 19, 1, 2, 3, 456789],
 		 [t2.year, t2.mon, t2.mday, t2.hour, t2.min, t2.sec, t2.usec])
+
+    t = Time.new(2004, 9, 19, 1, 2, 3, '+03:00')
+    with_tz('Asia/Tokyo') do
+      t2 = t.to_time
+      assert_equal([2004, 9, 19, 1, 2, 3],
+       [t2.year, t2.mon, t2.mday, t2.hour, t2.min, t2.sec])
+      assert_equal(3 * 60 * 60, t2.gmt_offset)
+    end
   end
 
   def test_to_time__from_date