rainbows 2.0.0 → 2.0.1

data/.manifest

@@ -34,6 +34,7 @@ lib/rainbows/const.rb
 lib/rainbows/dev_fd_response.rb
 lib/rainbows/error.rb
 lib/rainbows/ev_core.rb
+lib/rainbows/ev_core/cap_input.rb
 lib/rainbows/event_machine.rb
 lib/rainbows/event_machine/response_chunk_pipe.rb
 lib/rainbows/event_machine/response_pipe.rb
@@ -183,6 +184,7 @@ t/t0102-rack-input-short.sh
 t/t0103-rack-input-limit.sh
 t/t0104-rack-input-limit-tiny.sh
 t/t0105-rack-input-limit-bigger.sh
+t/t0106-rack-input-keepalive.sh
 t/t0200-async-response.sh
 t/t0201-async-response-no-autochunk.sh
 t/t0300-async_sinatra.sh

data/ChangeLog

@@ -1,5 +1,42 @@
-ChangeLog from git://git.bogomips.org/rainbows.git (v0.97.0..v2.0.0)
+ChangeLog from git://git.bogomips.org/rainbows.git (v0.97.0..v2.0.1)
 
+    commit b4835c6d542c6369f2523ab68fc41b0202d7c6dc
+    Author: Eric Wong <normalperson@yhbt.net>
+    Date:   Fri Dec 3 01:23:11 2010 +0000
+    
+        Rainbows! 2.0.1 - upload pipelining fixes
+        
+        For HTTP clients living on the edge and pipelining uploads, we
+        now fully support pipelined requests (as long as the application
+        consumes each request in its entirety).
+    
+    commit c096e735efea5050b0559748633403f0387ea3b3
+    Author: Eric Wong <normalperson@yhbt.net>
+    Date:   Fri Dec 3 01:12:08 2010 +0000
+    
+        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.
+    
+    commit 64889d9136fa5466269232c26a2f235dd763d8f0
+    Author: Eric Wong <normalperson@yhbt.net>
+    Date:   Thu Dec 2 07:38:14 2010 +0000
+    
+        ev_core: refactor and split cap_input out
+        
+        Hopefully it makes more sense now and is easier to
+        digest for new hackers.
+    
+    commit 945b5760d86b9dd00e65bd0625b98cf75f6a8257
+    Author: Eric Wong <normalperson@yhbt.net>
+    Date:   Wed Dec 1 21:29:34 2010 -0800
+    
+        ev_core: split out prepare_request_body
+        
+        We may have other uses for this in the future...
+    
     commit 90789761f0cc78d3726f3a2eda1c5fe95c015ac2
     Author: Eric Wong <normalperson@yhbt.net>
     Date:   Fri Nov 19 19:09:59 2010 -0800

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 2.0.0
+GIT_VERSION = 2.0.1

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.0.0.GIT
+DEF_VER=v2.0.1.GIT
 
 LF='
 '

data/NEWS

@@ -1,3 +1,9 @@
+=== 2.0.1 / 2010-12-03 01:26 UTC
+
+  For HTTP clients living on the edge and pipelining uploads, we
+  now fully support pipelined requests (as long as the application
+  consumes each request in its entirety).
+
 === 2.0.0 / 2010-11-20 03:10 UTC
 
   This release is targeted at the minority of web applications

data/lib/rainbows/const.rb

@@ -2,7 +2,7 @@
 # :enddoc:
 module Rainbows::Const
 
-  RAINBOWS_VERSION = '2.0.0'
+  RAINBOWS_VERSION = '2.0.1'
 
   include Unicorn::Const
 

data/lib/rainbows/ev_core.rb

@@ -7,6 +7,7 @@ module Rainbows::EvCore
   G = Rainbows::G
   NULL_IO = Unicorn::HttpRequest::NULL_IO
   HttpParser = Unicorn::HttpParser
+  autoload :CapInput, 'rainbows/ev_core/cap_input'
 
   # Apps may return this Rack response: AsyncResponse = [ -1, {}, [] ]
   ASYNC_CALLBACK = "async.callback".freeze
@@ -25,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
@@ -43,33 +47,41 @@ module Rainbows::EvCore
     rv
   end
 
+  def prepare_request_body
+    # since we don't do streaming input, we have no choice but
+    # to take over 100-continue handling from the Rack application
+    if @env[HTTP_EXPECT] =~ /\A100-continue\z/i
+      write(EXPECT_100_RESPONSE)
+      @env.delete(HTTP_EXPECT)
+    end
+    @input = mkinput
+    @hp.filter_body(@buf2 = "", @buf)
+    @input << @buf2
+    on_read("")
+  end
+
   # TeeInput doesn't map too well to this right now...
   def on_read(data)
     case @state
     when :headers
       @buf << data
-      @hp.parse or return
+      @hp.parse or return want_more
       @state = :body
-      len = @hp.content_length
-      if len == 0
+      if 0 == @hp.content_length
         @input = NULL_IO
         app_call # common case
       else # nil or len > 0
-        # since we don't do streaming input, we have no choice but
-        # to take over 100-continue handling from the Rack application
-        if @env[HTTP_EXPECT] =~ /\A100-continue\z/i
-          write(EXPECT_100_RESPONSE)
-          @env.delete(HTTP_EXPECT)
-        end
-        @input = CapInput.new(len, self)
-        @hp.filter_body(@buf2 = "", @buf)
-        @input << @buf2
-        on_read("")
+        prepare_request_body
       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
@@ -79,48 +91,33 @@ module Rainbows::EvCore
       if @hp.trailers(@env, @buf << data)
         @input.rewind
         app_call
+      else
+        want_more
       end
     end
     rescue => e
       handle_error(e)
   end
 
-  class CapInput < Struct.new(:io, :client, :bytes_left)
-    MAX_BODY = Unicorn::Const::MAX_BODY
-    TmpIO = Unicorn::TmpIO
-
-    def self.err(client, msg)
-      client.write(Rainbows::Const::ERROR_413_RESPONSE)
-      client.quit
-
-      # zip back up the stack
-      raise IOError, msg, []
-    end
-
-    def self.new(len, client)
-      max = Rainbows.max_bytes
-      if len
-        if max && (len > max)
-          err(client, "Content-Length too big: #{len} > #{max}")
-        end
-        len <= MAX_BODY ? StringIO.new("") : TmpIO.new
-      else
-        max ? super(TmpIO.new, client, max) : TmpIO.new
-      end
-    end
+  def err_413(msg)
+    write(Rainbows::Const::ERROR_413_RESPONSE)
+    quit
+    # zip back up the stack
+    raise IOError, msg, []
+  end
 
-    def <<(buf)
-      if (self.bytes_left -= buf.size) < 0
-        io.close
-        CapInput.err(client, "chunked request body too big")
+  MAX_BODY = Unicorn::Const::MAX_BODY
+  TmpIO = Unicorn::TmpIO
+  def mkinput
+    max = Rainbows.max_bytes
+    len = @hp.content_length
+    if len
+      if max && (len > max)
+        err_413("Content-Length too big: #{len} > #{max}")
       end
-      io << buf
+      len <= MAX_BODY ? StringIO.new("") : TmpIO.new
+    else
+      max ? CapInput.new(TmpIO.new, self) : TmpIO.new
     end
-
-    def gets; io.gets; end
-    def each(&block); io.each(&block); end
-    def size; io.size; end
-    def rewind; io.rewind; end
-    def read(*args); io.read(*args); end
   end
 end

data/lib/rainbows/ev_core/cap_input.rb

@@ -0,0 +1,21 @@
+# -*- encoding: binary -*-
+# :enddoc:
+class Rainbows::EvCore::CapInput
+  def initialize(io, client)
+    @io, @client, @bytes_left = io, client, Rainbows.max_bytes
+  end
+
+  def <<(buf)
+    if (@bytes_left -= buf.size) < 0
+      @io.close
+      @client.err_413("chunked request body too big")
+    end
+    @io << buf
+  end
+
+  def gets; @io.gets; end
+  def each(&block); @io.each(&block); end
+  def size; @io.size; end
+  def rewind; @io.rewind; end
+  def read(*args); @io.read(*args); end
+end

data/lib/rainbows/rev/client.rb

@@ -16,6 +16,10 @@ module Rainbows
         @deferred = nil
       end
 
+      def want_more
+        enable unless enabled?
+      end
+
       def quit
         super
         close if @deferred.nil? && @_write_buffer.empty?
@@ -143,13 +147,13 @@ module Rainbows
         when :close
           close if @_write_buffer.empty?
         when :headers
-          if @hp.parse
-            app_call
-          else
+          if @buf.empty?
             unless enabled?
               enable
               KATO[self] = Time.now
             end
+          else
+            on_read("")
           end
         end
         rescue => e

data/t/t0106-rack-input-keepalive.sh

@@ -0,0 +1,72 @@
+#!/bin/sh
+. ./test-lib.sh
+t_plan 7 "rack.input pipelining test"
+
+t_begin "setup and startup" && {
+	rainbows_setup $model
+        rtmpfiles req
+	rainbows -D sha1.ru -c $unicorn_config
+	body=hello
+	body_size=$(printf $body | wc -c)
+	body_sha1=$(printf $body | rsha1)
+	rainbows_wait_start
+}
+
+t_begin "send pipelined identity requests" && {
+
+	{
+		printf 'PUT / HTTP/1.0\r\n'
+		printf 'Connection: keep-alive\r\n'
+		printf 'Content-Length: %d\r\n\r\n%s' $body_size $body
+		printf 'PUT / HTTP/1.1\r\nHost: example.com\r\n'
+		printf 'Content-Length: %d\r\n\r\n%s' $body_size $body
+		printf 'PUT / HTTP/1.0\r\n'
+		printf 'Content-Length: %d\r\n\r\n%s' $body_size $body
+	} > $req
+	(
+		cat $fifo > $tmp &
+		cat $req
+		wait
+		echo ok > $ok
+	) | socat - TCP4:$listen > $fifo
+	test x"$(cat $ok)" = xok
+}
+
+t_begin "check responses" && {
+	dbgcat tmp
+	test 3 -eq $(grep $body_sha1 $tmp | wc -l)
+}
+
+t_begin "send pipelined chunked requests" && {
+
+	{
+		printf 'PUT / HTTP/1.0\r\n'
+		printf 'Connection: keep-alive\r\n'
+		printf 'Transfer-Encoding: chunked\r\n\r\n'
+		printf '%x\r\n%s\r\n0\r\n\r\n' $body_size $body
+		printf 'PUT / HTTP/1.1\r\nHost: example.com\r\n'
+		printf 'Transfer-Encoding: chunked\r\n\r\n'
+		printf '%x\r\n%s\r\n0\r\n\r\n' $body_size $body
+		printf 'PUT / HTTP/1.0\r\n'
+		printf 'Transfer-Encoding: chunked\r\n\r\n'
+		printf '%x\r\n%s\r\n0\r\n\r\n' $body_size $body
+	} > $req
+	(
+		cat $fifo > $tmp &
+		cat $req
+		wait
+		echo ok > $ok
+	) | socat - TCP4:$listen > $fifo
+	test x"$(cat $ok)" = xok
+}
+
+t_begin "check responses" && {
+	dbgcat tmp
+	test 3 -eq $(grep $body_sha1 $tmp | wc -l)
+}
+
+t_begin "kill server" && kill $rainbows_pid
+
+t_begin "no errors in stderr log" && check_stderr
+
+t_done

data/t/test_isolate.rb

@@ -16,7 +16,7 @@ $stdout.reopen($stderr)
 Isolate.now!(opts) do
   gem 'rack', '1.1.0' # Cramp currently requires ~> 1.1.0
   gem 'kgio', '2.0.0'
-  gem 'unicorn', '3.0.0'
+  gem 'unicorn', '3.0.1'
   gem 'kcar', '0.1.1'
 
   if engine == "ruby"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rainbows
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Rainbows! hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-20 00:00:00 +00:00
+date: 2010-12-03 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,6 +88,7 @@ extra_rdoc_files:
 - lib/rainbows/dev_fd_response.rb
 - lib/rainbows/error.rb
 - lib/rainbows/ev_core.rb
+- lib/rainbows/ev_core/cap_input.rb
 - lib/rainbows/event_machine.rb
 - lib/rainbows/event_machine/response_chunk_pipe.rb
 - lib/rainbows/event_machine/response_pipe.rb
@@ -192,6 +193,7 @@ files:
 - lib/rainbows/dev_fd_response.rb
 - lib/rainbows/error.rb
 - lib/rainbows/ev_core.rb
+- lib/rainbows/ev_core/cap_input.rb
 - lib/rainbows/event_machine.rb
 - lib/rainbows/event_machine/response_chunk_pipe.rb
 - lib/rainbows/event_machine/response_pipe.rb
@@ -341,6 +343,7 @@ files:
 - t/t0103-rack-input-limit.sh
 - t/t0104-rack-input-limit-tiny.sh
 - t/t0105-rack-input-limit-bigger.sh
+- t/t0106-rack-input-keepalive.sh
 - t/t0200-async-response.sh
 - t/t0201-async-response-no-autochunk.sh
 - t/t0300-async_sinatra.sh