github
/
ruby
зеркало из https://github.com/github/ruby.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fix vtm_add_offset yday on last day of year. 

* time.c (vtm_add_offset): Fix yday on last day of year.
  [ruby-core:72878] [Bug #11994] Fixed by Andrew White.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56599 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2016-11-05 14:59:51 +00:00
Родитель 85e749080e
Коммит a03411b63e
3 изменённых файлов: 25 добавлений и 3 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

9
ChangeLog
Просмотреть файл

@ -1,3 +1,8 @@
Sat Nov 5 23:46:03 2016 Tanaka Akira <akr@fsij.org>
* time.c (vtm_add_offset): Fix yday on last day of year.
[ruby-core:72878] [Bug #11994] Fixed by Andrew White.
Sat Nov 5 23:30:41 2016 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/http.rb (Net::HTTP.post): new convenience method to send
@ -64,7 +69,7 @@ Sat Nov 5 17:29:06 2016 Tanaka Akira <akr@fsij.org>
* lib/resolv.rb (Resolv::DNS#extract_resources): Use each_resource
instead of each_answer.
[ruby-core:75461] [Bug#12372] reported by Rafael Fernandez Lopez.
[ruby-core:75461] [Bug #12372] reported by Rafael Fernandez Lopez.
Sat Nov 5 17:18:24 2016 NARUSE, Yui <naruse@ruby-lang.org>
@ -106,7 +111,7 @@ Sat Nov 5 13:52:52 2016 Akinori MUSHA <knu@iDaemons.org>
Sat Nov 5 12:14:31 2016 Tanaka Akira <akr@fsij.org>
* ext/pathname/pathname.c (Pathname#empty?): New method.
[ruby-core:76404] [Feature#12596] Proposed by John Backus.
[ruby-core:76404] [Feature #12596] Proposed by John Backus.
Sat Nov 5 11:53:02 2016 Shugo Maeda <shugo@ruby-lang.org>

17
test/ruby/test_time.rb
Просмотреть файл

@ -1072,4 +1072,21 @@ class TestTime < Test::Unit::TestCase
assert_equal now2, now3
assert_equal now2.zone, now3.zone
end
def test_strftime_yearday_on_last_day_of_year
t = Time.utc(2015, 12, 31, 0, 0, 0)
assert_equal("365", t.strftime("%j"))
t = Time.utc(2016, 12, 31, 0, 0, 0)
assert_equal("366", t.strftime("%j"))
t = Time.utc(2015, 12, 30, 20, 0, 0).getlocal("+05:00")
assert_equal("365", t.strftime("%j"))
t = Time.utc(2016, 12, 30, 20, 0, 0).getlocal("+05:00")
assert_equal("366", t.strftime("%j"))
t = Time.utc(2016, 1, 1, 1, 0, 0).getlocal("-05:00")
assert_equal("365", t.strftime("%j"))
t = Time.utc(2017, 1, 1, 1, 0, 0).getlocal("-05:00")
assert_equal("366", t.strftime("%j"))
end
end

2
time.c
Просмотреть файл

@ -1889,7 +1889,7 @@ vtm_add_offset(struct vtm *vtm, VALUE off)
vtm->mday = 31;
vtm->mon = 12; /* December */
vtm->year = sub(vtm->year, INT2FIX(1));
vtm->yday = leap_year_v_p(vtm->year) ? 365 : 364;
vtm->yday = leap_year_v_p(vtm->year) ? 366 : 365;
}
else if (vtm->mday == 1) {
const int *days_in_month = leap_year_v_p(vtm->year) ?