merges r29951 from trunk into ruby_1_9_2.

--
* time.c (leap_year_v_p): fixed typo.  [ruby-dev:42631]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 10 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index f28b40ff0a..6159b57ad6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Nov 27 18:08:18 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (leap_year_v_p): fixed typo.  [ruby-dev:42631]
+
 Fri Nov 26 09:48:45 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* re.c (rb_reg_initialize_str): should succeed the taint status from
diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb
index 95d36c597f..13b95b94f9 100644
--- a/test/ruby/test_time.rb
+++ b/test/ruby/test_time.rb
@@ -19,6 +19,10 @@ class TestTime < Test::Unit::TestCase
     assert_equal(Time.utc(2000,2,10), Time.new(2000,2,9, 13,0,0, -3600*11))
     assert_equal(Time.utc(2000,2,10), Time.new(2000,2,10, 11,0,0, "+11:00"))
     assert_equal(Rational(1,2), Time.new(2000,2,10, 11,0,5.5, "+11:00").subsec)
+    bug4090 = '[ruby-dev:42631]'
+    tm = [2001,2,28,23,59,30]
+    t = Time.new(*tm, "-12:00")
+    assert_equal([2001,2,28,23,59,30,-43200], [t.year, t.month, t.mday, t.hour, t.min, t.sec, t.gmt_offset], bug4090)
   end
 
   def test_time_add()
diff --git a/time.c b/time.c
index b60aedbe82..0cde020b89 100644
--- a/time.c
+++ b/time.c
@@ -853,7 +853,7 @@ static const char *find_time_t(struct tm *tptr, int utc_p, time_t *tp);
 static struct vtm *localtimew(wideval_t timew, struct vtm *result);
 
 static int leap_year_p(long y);
-#define leap_year_v_p(y) leap_year_p(NUM2LONG(mod(v, INT2FIX(400))))
+#define leap_year_v_p(y) leap_year_p(NUM2LONG(mod((y), INT2FIX(400))))
 
 #ifdef HAVE_GMTIME_R
 #define rb_gmtime_r(t, tm) gmtime_r(t, tm)
diff --git a/version.h b/version.h
index 0674908469..15dbe6de45 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 107
+#define RUBY_PATCHLEVEL 108
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1