diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-09 20:12:02 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-09 20:12:02 +0000 |
commit | 36b3d5577ca9c9e32fa690149d73d557af996422 (patch) | |
tree | 8aa46568cdf61990c1fec5aaba1ec86dd11de8bc /ChangeLog | |
parent | 0234bcfd19aa0a7b4152809c13554144b7322f41 (diff) |
merge revision(s) 34409,34412,34417:
* io.c (argf_close): skip stdin, which should be readable again.
[ruby-dev:45160] [Bug #5952]
* io.c (argf_readlines): reinitialize after all read to be
readable again.
* io.c (argf_next_argv): reset ARGF.next_p on ARGV.replace.
r34409 breaks replacing ARGV.
[ruby-dev:45160] [Bug #5952]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34528 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 14 |
1 files changed, 14 insertions, 0 deletions
@@ -1,3 +1,17 @@ +Fri Feb 10 05:11:43 2012 NARUSE, Yui <naruse@ruby-lang.org> + + * io.c (argf_next_argv): reset ARGF.next_p on ARGV.replace. + r34409 breaks replacing ARGV. + [ruby-dev:45160] [Bug #5952] + +Fri Feb 10 05:11:43 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * io.c (argf_close): skip stdin, which should be readable again. + [ruby-dev:45160] [Bug #5952] + + * io.c (argf_readlines): reinitialize after all read to be + readable again. + Fri Feb 9 01:36:19 2012 Martin Bosslet <Martin.Bosslet@googlemail.com> * backport r34482 from trunk |