summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-03-18 15:16:52 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-03-18 15:16:52 +0000
commitc17242100cd5ef5a5cb7165e1ffe237f1d120318 (patch)
treea5172521051ac1b38f381e5452efca814db9c721 /ChangeLog
parent541f4f250276c1f999c651a6f5699565e77d850b (diff)
merge revision(s) 60160: [Backport #13998]
parse.y: token info with BOM * parse.y (parser_prepare): set token_info_enabled flag first, before returning at BOM. [ruby-dev:50288] [Bug #13998] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@62822 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d62f7a5f27..6ac2d4a62e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Mar 19 00:16:28 2018 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ parse.y: token info with BOM
+
+ * parse.y (parser_prepare): set token_info_enabled flag first, before
+ returning at BOM. [Bug #13998]
+
Mon Mar 19 00:06:43 2018 Hiroshi Shirosaki <h.shirosaki@gmail.com>
io.c: fix segfault with closing socket on Windows