From c096e735efea5050b0559748633403f0387ea3b3 Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Fri, 3 Dec 2010 01:12:08 +0000
Subject: fix pipelining of requests with bodies

All synchronous models have this fixed in unicorn 3.0.1,
so only Rev and EventMachine-based concurrency models
require code changes.
---
 lib/rainbows/ev_core.rb | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'lib/rainbows/ev_core.rb')

diff --git a/lib/rainbows/ev_core.rb b/lib/rainbows/ev_core.rb
index e1f5918..8241584 100644
--- a/lib/rainbows/ev_core.rb
+++ b/lib/rainbows/ev_core.rb
@@ -26,6 +26,9 @@ module Rainbows::EvCore
     @state = :close
   end
 
+  def want_more
+  end
+
   def handle_error(e)
     msg = Rainbows::Error.response(e) and write(msg)
     ensure
@@ -62,7 +65,7 @@ module Rainbows::EvCore
     case @state
     when :headers
       @buf << data
-      @hp.parse or return
+      @hp.parse or return want_more
       @state = :body
       if 0 == @hp.content_length
         @input = NULL_IO
@@ -72,8 +75,13 @@ module Rainbows::EvCore
       end
     when :body
       if @hp.body_eof?
-        @state = :trailers
-        on_read(data)
+        if @hp.content_length
+          @input.rewind
+          app_call
+        else
+          @state = :trailers
+          on_read(data)
+        end
       elsif data.size > 0
         @hp.filter_body(@buf2, @buf << data)
         @input << @buf2
@@ -83,6 +91,8 @@ module Rainbows::EvCore
       if @hp.trailers(@env, @buf << data)
         @input.rewind
         app_call
+      else
+        want_more
       end
     end
     rescue => e
-- 
cgit v1.2.3-24-ge0c7