From 59fadede2bbfa78362e81680e416fdce54e27baf Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 22 Apr 2016 09:20:38 +0000
Subject: merge revision(s) 54169: [Backport #12189]

	* ext/date/date_core.c (datetime_to_time): preserve timezone info
	  [Bug #12189] [Fix GH-1295]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54694 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/date/date_core.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'ext')

diff --git a/ext/date/date_core.c b/ext/date/date_core.c
index b93d362bbd..da7d82a76a 100644
--- a/ext/date/date_core.c
+++ b/ext/date/date_core.c
@@ -8581,21 +8581,24 @@ date_to_datetime(VALUE self)
 static VALUE
 datetime_to_time(VALUE self)
 {
-    volatile VALUE dup = dup_obj_with_new_offset(self, 0);
+    volatile VALUE dup = dup_obj(self);
     {
 	VALUE t;
 
 	get_d1(dup);
 
-	t = f_utc6(rb_cTime,
+	t = rb_funcall(rb_cTime,
+		   rb_intern("new"),
+                   7,
 		   m_real_year(dat),
 		   INT2FIX(m_mon(dat)),
 		   INT2FIX(m_mday(dat)),
 		   INT2FIX(m_hour(dat)),
 		   INT2FIX(m_min(dat)),
 		   f_add(INT2FIX(m_sec(dat)),
-			 m_sf_in_sec(dat)));
-	return f_getlocal(t);
+			 m_sf_in_sec(dat)),
+		   INT2FIX(m_of(dat)));
+	return t;
     }
 }
 
-- 
cgit v1.2.3