diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-07-07 03:17:25 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-07-07 03:17:25 +0000 |
commit | ea0bf82630a1aa8ad6c56b9d50c297ba1aab6fb5 (patch) | |
tree | 0f59cbd0eeffd43bfe5a3b88db25f0fe8004c52b /lib | |
parent | 5ff287ad67935ac4646beafaf8d9e31884917345 (diff) |
merge revision(s) 46457,46458: [Backport #9949]
* lib/net/ftp.rb (gets, readline): read lines without LF properly.
[ruby-core:63205] [Bug #9949]
* test/net/ftp/test_buffered_socket.rb: related test.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@46735 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/net/ftp.rb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index c2cf5f3af4..20b8faa134 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -1102,13 +1102,16 @@ module Net end def gets - return readuntil("\n") - rescue EOFError - return nil + line = readuntil("\n", true) + return line.empty? ? nil : line end def readline - return readuntil("\n") + line = gets + if line.nil? + raise EOFError, "end of file reached" + end + return line end end # :startdoc: |