From d2f240d7ea11738ba889668a669ffb7845d06e7b Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 6 Jul 2010 09:58:40 +0000 Subject: fix string slicing under 1.9 after short writes Fortunately this only affects the hardly-used FiberSpawn and FiberPool concurrency models, and also unreleased revisions of Rev. 1.9 encoding is tricky to handle right when doing I/O in Ruby... --- lib/rainbows/fiber/io.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/rainbows/fiber') diff --git a/lib/rainbows/fiber/io.rb b/lib/rainbows/fiber/io.rb index d4f2512..f6b8bdf 100644 --- a/lib/rainbows/fiber/io.rb +++ b/lib/rainbows/fiber/io.rb @@ -7,6 +7,7 @@ module Rainbows # interface that yields away from the current Fiber whenever # the underlying IO object cannot read or write class IO < Struct.new(:to_io, :f) + include Rainbows::ByteSlice # :stopdoc: LOCALHOST = Unicorn::HttpRequest::LOCALHOST @@ -58,8 +59,8 @@ module Rainbows def write(buf) begin - (w = to_io.write_nonblock(buf)) == buf.size and return - buf = buf[w..-1] + (w = to_io.write_nonblock(buf)) == buf.bytesize and return + buf = byte_slice(buf, w..-1) rescue Errno::EAGAIN wait_writable retry -- cgit v1.2.3-24-ge0c7