rainbows 0.91.1 → 0.92.0

data/t/t0105-rack-input-limit-bigger.sh

@@ -0,0 +1,105 @@
+#!/bin/sh
+. ./test-lib.sh
+
+t_plan 10 "rack.input client_max_body_size bigger"
+
+t_begin "setup and startup" && {
+	rtmpfiles curl_out curl_err cmbs_config
+	rainbows_setup $model
+	sed -e 's/client_max_body_size.*/client_max_body_size 10485760/' \
+	  < $unicorn_config > $cmbs_config
+	rainbows -D sha1-random-size.ru -c $cmbs_config
+	rainbows_wait_start
+}
+
+t_begin "stops a regular request" && {
+	rm -f $ok
+	dd if=/dev/zero bs=102485761 count=1 of=$tmp
+	curl -vsSf -T $tmp -H Expect: \
+	  http://$listen/ > $curl_out 2> $curl_err || > $ok
+	dbgcat curl_err
+	dbgcat curl_out
+	test -e $ok
+}
+
+t_begin "stops a large chunked request" && {
+	rm -f $ok
+	dd if=/dev/zero bs=102485761 count=1 | \
+	  curl -vsSf -T- -H Expect: \
+	  http://$listen/ > $curl_out 2> $curl_err || > $ok
+	dbgcat curl_err
+	dbgcat curl_out
+	test -e $ok
+}
+
+t_begin "small size sha1 chunked ok" && {
+	blob_sha1=b376885ac8452b6cbf9ced81b1080bfd570d9b91
+	rm -f $ok
+	dd if=/dev/zero bs=256 count=1 | \
+	  curl -vsSf -T- -H Expect: \
+	  http://$listen/ > $curl_out 2> $curl_err
+	dbgcat curl_err
+	dbgcat curl_out
+	test "$(cat $curl_out)" = $blob_sha1
+}
+
+t_begin "small size sha1 content-length ok" && {
+	blob_sha1=b376885ac8452b6cbf9ced81b1080bfd570d9b91
+	rm -f $ok
+	dd if=/dev/zero bs=256 count=1 of=$tmp
+	curl -vsSf -T $tmp -H Expect: \
+	  http://$listen/ > $curl_out 2> $curl_err
+	dbgcat curl_err
+	dbgcat curl_out
+	test "$(cat $curl_out)" = $blob_sha1
+}
+
+t_begin "right size sha1 chunked ok" && {
+	blob_sha1=8c206a1a87599f532ce68675536f0b1546900d7a
+	rm -f $ok
+	dd if=/dev/zero bs=10485760 count=1 | \
+	  curl -vsSf -T- -H Expect: \
+	  http://$listen/ > $curl_out 2> $curl_err
+	dbgcat curl_err
+	dbgcat curl_out
+	test "$(cat $curl_out)" = $blob_sha1
+}
+
+t_begin "right size sha1 content-length ok" && {
+	blob_sha1=8c206a1a87599f532ce68675536f0b1546900d7a
+	rm -f $ok
+	dd if=/dev/zero bs=10485760 count=1 of=$tmp
+	curl -vsSf -T $tmp -H Expect: \
+	  http://$listen/ > $curl_out 2> $curl_err
+	dbgcat curl_err
+	dbgcat curl_out
+	test "$(cat $curl_out)" = $blob_sha1
+}
+
+t_begin "default size sha1 chunked ok" && {
+	blob_sha1=3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3
+	rm -f $ok
+	dd if=/dev/zero bs=1048576 count=1 | \
+	  curl -vsSf -T- -H Expect: \
+	  http://$listen/ > $curl_out 2> $curl_err
+	dbgcat curl_err
+	dbgcat curl_out
+	test "$(cat $curl_out)" = $blob_sha1
+}
+
+t_begin "default size sha1 content-length ok" && {
+	blob_sha1=3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3
+	rm -f $ok
+	dd if=/dev/zero bs=1048576 count=1 of=$tmp
+	curl -vsSf -T $tmp -H Expect: \
+	  http://$listen/ > $curl_out 2> $curl_err
+	dbgcat curl_err
+	dbgcat curl_out
+	test "$(cat $curl_out)" = $blob_sha1
+}
+
+t_begin "shutdown" && {
+	kill $rainbows_pid
+}
+
+t_done

data/t/t0401-em-async-tailer.sh

@@ -55,7 +55,7 @@ t_begin "kill curls and wait for termination" && {
 }
 
 t_begin "termination signal sent" && {
-	kill $rainbows_pid
+	kill -QUIT $rainbows_pid
 }
 
 t_begin "no errors from curl" && {

data/t/t0600-rack-fiber_pool.sh

@@ -0,0 +1,49 @@
+#!/bin/sh
+. ./test-lib.sh
+case $model in
+EventMachine) ;;
+*)
+	t_info "skipping $T since it's not compatible with $model"
+	exit 0
+	;;
+esac
+
+require_check rack/fiber_pool Rack::FiberPool
+
+t_plan 7 "basic test with rack-fiber_pool gem"
+
+CONFIG_RU=rack-fiber_pool/app.ru
+
+t_begin "setup and start" && {
+	rainbows_setup
+	rtmpfiles curl_err curl_out
+
+	rainbows -D -c $unicorn_config $CONFIG_RU
+	rainbows_wait_start
+}
+
+t_begin "send requests off in parallel" && {
+	curl --no-buffer -sSf http://$listen/ >> $curl_out 2>> $curl_err &
+	curl --no-buffer -sSf http://$listen/ >> $curl_out 2>> $curl_err &
+	curl --no-buffer -sSf http://$listen/ >> $curl_out 2>> $curl_err &
+}
+
+t_begin "wait for curl terminations" && {
+	wait
+}
+
+t_begin "termination signal sent" && {
+	kill $rainbows_pid
+}
+
+t_begin "no errors from curl" && {
+	test ! -s $curl_err
+}
+
+t_begin "no errors in stderr" && check_stderr
+
+t_begin "ensure we hit 3 separate fibers" && {
+	test x3 = x"$(sort < $curl_out | uniq | wc -l)"
+}
+
+t_done

data/t/t0700-app-deferred.sh

@@ -0,0 +1,45 @@
+#!/bin/sh
+. ./test-lib.sh
+case $model in
+EventMachine) ;;
+*)
+	t_info "skipping $T since it's not compatible with $model"
+	exit 0
+	;;
+esac
+
+t_plan 5 "basic test for app.deferred? usage"
+
+CONFIG_RU=app_deferred.ru
+
+t_begin "setup and start" && {
+	rainbows_setup
+	rtmpfiles deferred_err deferred_out sync_err sync_out
+	rainbows -D -c $unicorn_config $CONFIG_RU
+	rainbows_wait_start
+}
+
+t_begin "synchronous requests run in the same thread" && {
+	curl --no-buffer -sSf http://$listen/ >> $sync_out 2>> $sync_err &
+	curl --no-buffer -sSf http://$listen/ >> $sync_out 2>> $sync_err &
+	curl --no-buffer -sSf http://$listen/ >> $sync_out 2>> $sync_err &
+	wait
+	test ! -s $sync_err
+	test 3 -eq "$(wc -l < $sync_out)"
+	test 1 -eq "$(uniq < $sync_out | wc -l)"
+}
+
+t_begin "deferred requests run in a different thread" && {
+	curl -sSf http://$listen/deferred >> $deferred_out 2>> $deferred_err
+	test ! -s $deferred_err
+	sync_thread="$(uniq < $sync_out)"
+	test x"$(uniq < $deferred_out)" != x"$sync_thread"
+}
+
+t_begin "termination signal sent" && {
+	kill $rainbows_pid
+}
+
+t_begin "no errors in stderr" && check_stderr
+
+t_done

data/t/test-lib.sh

@@ -113,6 +113,7 @@ EOF
 		# boxes and sometimes sleep 1s in tests
 		kato=5
 		echo 'Rainbows! do'
+		echo "  client_max_body_size nil"
 		if test $# -ge 1
 		then
 			echo "  use :$1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rainbows
 version: !ruby/object:Gem::Version 
-  version: 0.91.1
+  version: 0.92.0
 platform: ruby
 authors: 
 - Rainbows! hackers
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-19 00:00:00 +00:00
+date: 2010-05-04 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,12 +18,15 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 0.97.1
+    - - <
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
     version: 
 description: |-
-  Rainbows! is an HTTP server for sleepy Rack applications.  It is based on
+  \Rainbows! is an HTTP server for sleepy Rack applications.  It is based on
   Unicorn, but designed to handle applications that expect long
   request/response times and/or slow clients.  For Rack applications not
   heavily bound by slow external network dependencies, consider Unicorn
@@ -46,7 +49,6 @@ extra_rdoc_files:
 - lib/rainbows/error.rb
 - lib/rainbows/ev_core.rb
 - lib/rainbows/event_machine.rb
-- lib/rainbows/event_machine_defer.rb
 - lib/rainbows/fiber.rb
 - lib/rainbows/fiber/base.rb
 - lib/rainbows/fiber/io.rb
@@ -56,6 +58,7 @@ extra_rdoc_files:
 - lib/rainbows/fiber_spawn.rb
 - lib/rainbows/http_response.rb
 - lib/rainbows/http_server.rb
+- lib/rainbows/max_body.rb
 - lib/rainbows/never_block.rb
 - lib/rainbows/never_block/event_machine.rb
 - lib/rainbows/rev.rb
@@ -69,7 +72,7 @@ extra_rdoc_files:
 - lib/rainbows/rev_thread_pool.rb
 - lib/rainbows/rev_thread_spawn.rb
 - lib/rainbows/revactor.rb
-- lib/rainbows/revactor/tee_input.rb
+- lib/rainbows/tee_input.rb
 - lib/rainbows/thread_pool.rb
 - lib/rainbows/thread_spawn.rb
 - LICENSE
@@ -105,6 +108,8 @@ files:
 - TODO
 - TUNING
 - bin/rainbows
+- config/.gitignore
+- config/isolate.rb
 - lib/rainbows.rb
 - lib/rainbows/actor_spawn.rb
 - lib/rainbows/app_pool.rb
@@ -114,7 +119,6 @@ files:
 - lib/rainbows/error.rb
 - lib/rainbows/ev_core.rb
 - lib/rainbows/event_machine.rb
-- lib/rainbows/event_machine_defer.rb
 - lib/rainbows/fiber.rb
 - lib/rainbows/fiber/base.rb
 - lib/rainbows/fiber/io.rb
@@ -124,6 +128,7 @@ files:
 - lib/rainbows/fiber_spawn.rb
 - lib/rainbows/http_response.rb
 - lib/rainbows/http_server.rb
+- lib/rainbows/max_body.rb
 - lib/rainbows/never_block.rb
 - lib/rainbows/never_block/event_machine.rb
 - lib/rainbows/rev.rb
@@ -137,7 +142,7 @@ files:
 - lib/rainbows/rev_thread_pool.rb
 - lib/rainbows/rev_thread_spawn.rb
 - lib/rainbows/revactor.rb
-- lib/rainbows/revactor/tee_input.rb
+- lib/rainbows/tee_input.rb
 - lib/rainbows/thread_pool.rb
 - lib/rainbows/thread_spawn.rb
 - local.mk.sample
@@ -147,6 +152,7 @@ files:
 - t/.gitignore
 - t/GNUmakefile
 - t/README
+- t/app_deferred.ru
 - t/async-response-no-autochunk.ru
 - t/async-response.ru
 - t/async_examples/README
@@ -166,11 +172,11 @@ files:
 - t/heartbeat-timeout.ru
 - t/large-file-response.ru
 - t/my-tap-lib.sh
+- t/rack-fiber_pool/app.ru
 - t/sha1-random-size.ru
 - t/sha1.ru
 - t/simple-http_Base.ru
 - t/simple-http_EventMachine.ru
-- t/simple-http_EventMachineDefer.ru
 - t/simple-http_FiberPool.ru
 - t/simple-http_FiberSpawn.ru
 - t/simple-http_NeverBlock.ru
@@ -200,15 +206,21 @@ files:
 - t/t0012-spurious-wakeups-quiet.sh
 - t/t0013-reload-bad-config.sh
 - t/t0014-config-conflict.sh
-- t/t0100-rack-input-hammer.sh
+- t/t0100-rack-input-hammer-chunked.sh
+- t/t0100-rack-input-hammer-content-length.sh
 - t/t0101-rack-input-trailer.sh
 - 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/t0200-async-response.sh
 - t/t0201-async-response-no-autochunk.sh
 - t/t0300-async_sinatra.sh
 - t/t0400-em-async-app.sh
 - t/t0401-em-async-tailer.sh
 - t/t0500-cramp-streaming.sh
+- t/t0600-rack-fiber_pool.sh
+- t/t0700-app-deferred.sh
 - t/t9000-rack-app-pool.sh
 - t/t9000.ru
 - t/test-lib.sh

data/lib/rainbows/event_machine_defer.rb

@@ -1,59 +0,0 @@
-# -*- encoding: binary -*-
-# :stopdoc:
-# FIXME: fails many tests, experimental
-require 'rainbows/event_machine'
-
-module Rainbows
-
-  # This is currently highly experimental
-  module EventMachineDefer
-    include Rainbows::EventMachine
-
-    class Client < Rainbows::EventMachine::Client
-      undef_method :app_call
-
-      def defer_op
-        @env[RACK_INPUT] = @input
-        @env[REMOTE_ADDR] = @remote_addr
-        @env[ASYNC_CALLBACK] = method(:response_write)
-        catch(:async) { APP.call(@env.update(RACK_DEFAULTS)) }
-        rescue => e
-          handle_error(e)
-          nil
-      end
-
-      def defer_callback(response)
-        # too tricky to support pipelining with :async since the
-        # second (pipelined) request could be a stuck behind a
-        # long-running async response
-        (response.nil? || -1 == response.first) and return @state = :close
-
-        resume
-
-        alive = @hp.keepalive? && G.alive
-        out = [ alive ? CONN_ALIVE : CONN_CLOSE ] if @hp.headers?
-        response_write(response, out, alive)
-        if alive
-          @env.clear
-          @hp.reset
-          @state = :headers
-          if @hp.headers(@env, @buf)
-            EM.next_tick(method(:app_call))
-          else
-            set_comm_inactivity_timeout(G.kato)
-          end
-        else
-          quit
-        end
-      end
-
-      def app_call
-        pause
-        set_comm_inactivity_timeout(0)
-        # defer_callback(defer_op)
-        EM.defer(method(:defer_op), method(:defer_callback))
-      end
-    end
-
-  end
-end

data/lib/rainbows/revactor/tee_input.rb

@@ -1,52 +0,0 @@
-# -*- encoding: binary -*-
-require 'rainbows/revactor'
-
-module Rainbows
-  module Revactor
-
-    # acts like tee(1) on an input input to provide a input-like stream
-    # while providing rewindable semantics through a File/StringIO
-    # backing store.  On the first pass, the input is only read on demand
-    # so your Rack application can use input notification (upload progress
-    # and like).  This should fully conform to the Rack::InputWrapper
-    # specification on the public API.  This class is intended to be a
-    # strict interpretation of Rack::InputWrapper functionality and will
-    # not support any deviations from it.
-    class TeeInput < ::Unicorn::TeeInput
-
-    private
-
-      # tees off a +length+ chunk of data from the input into the IO
-      # backing store as well as returning it.  +dst+ must be specified.
-      # returns nil if reading from the input returns nil
-      def tee(length, dst)
-        unless parser.body_eof?
-          if parser.filter_body(dst, buf << socket.read).nil?
-            tmp.write(dst)
-            diff = dst.size - length
-            if diff > 0
-              dst.replace(dst[0,length])
-              tmp.seek(-diff, IO::SEEK_CUR)
-            end
-            return dst
-          end
-        end
-        finalize_input
-        rescue => e
-          client_error(e)
-      end
-
-      def finalize_input
-        while parser.trailers(req, buf).nil?
-          # Don't worry about raising ClientShutdown here on EOFError, tee()
-          # will catch EOFError when app is processing it, otherwise in
-          # initialize we never get any chance to enter the app so the
-          # EOFError will just get trapped by Unicorn and not the Rack app
-          buf << socket.read
-        end
-        self.socket = nil
-      end
-
-    end
-  end
-end

data/t/simple-http_EventMachineDefer.ru

@@ -1,11 +0,0 @@
-use Rack::ContentLength
-use Rack::ContentType
-run lambda { |env|
-  if env['rack.multithread'] == true &&
-     EM.reactor_running? &&
-     env['rainbows.model'] == :EventMachineDefer
-    [ 200, {}, [ env.inspect << "\n" ] ]
-  else
-    raise "incorrect parameters"
-  end
-}