1 files changed, 23 insertions, 1 deletions
diff --git a/lib/rainbows/client.rb b/lib/rainbows/client.rb
index 8425e9e..3d92da1 100644
--- a/lib/rainbows/client.rb
+++ b/lib/rainbows/client.rb
@@ -3,6 +3,28 @@
  
  # this class is used for most synchronous concurrency models
  class Rainbows::Client < Kgio::Socket
-  include Rainbows::TimedRead
+  def read_expire
+    Time.now + Rainbows.keepalive_timeout
+  end
+
+  def kgio_wait_readable
+    IO.select([self], nil, nil, Rainbows.keepalive_timeout)
+  end
+
+  # used for reading headers (respecting keepalive_timeout)
+  def timed_read(buf)
+    expire = nil
+    begin
+      case rv = kgio_tryread(16384, buf)
+      when :wait_readable
+        return if expire && expire < Time.now
+        expire ||= read_expire
+        kgio_wait_readable
+      else
+        return rv
+      end
+    end while true
+  end
+
    include Rainbows::ProcessClient
  end