rainbows 3.0.0 → 3.1.0

data/t/t0050-response-body-close-has-env.sh

@@ -33,6 +33,8 @@ req_pipelined () {
 
 reload () {
 	t_begin 'reloading Rainbows! to ensure writeout' && {
+		# ensure worker is loaded before HUP
+		curl -s http://$listen/ >/dev/null
 		# reload to ensure everything is flushed
 		kill -HUP $rainbows_pid
 		test xSTART = x"$(cat $fifo)"
@@ -85,7 +87,6 @@ check_log pipe
 
 t_begin "enable sendfile gem" && {
 	echo "require 'sendfile'" >> $unicorn_config
-	curl http://$listen/ >/dev/null # ensure worker is loaded before HUP
 }
 
 reload

data/t/t0104-rack-input-limit-tiny.sh

@@ -6,11 +6,13 @@ req_curl_chunked_upload_err_check
 t_plan 18 "rack.input client_max_body_size tiny"
 
 t_begin "setup and startup" && {
-	rtmpfiles curl_out curl_err cmbs_config
+	rtmpfiles curl_out curl_err
 	rainbows_setup $model
-	sed -e 's/client_max_body_size.*/client_max_body_size 256/' \
-	  < $unicorn_config > $cmbs_config
-	rainbows -D sha1-random-size.ru -c $cmbs_config
+	ed -s $unicorn_config <<EOF
+,s/client_max_body_size.*/client_max_body_size 256/
+w
+EOF
+	rainbows -D sha1-random-size.ru -c $unicorn_config
 	rainbows_wait_start
 }
 

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

@@ -6,11 +6,13 @@ req_curl_chunked_upload_err_check
 t_plan 10 "rack.input client_max_body_size bigger"
 
 t_begin "setup and startup" && {
-	rtmpfiles curl_out curl_err cmbs_config
+	rtmpfiles curl_out curl_err
 	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
+	ed -s $unicorn_config <<EOF
+,s/client_max_body_size.*/client_max_body_size 10485760/
+w
+EOF
+	rainbows -D sha1-random-size.ru -c $unicorn_config
 	rainbows_wait_start
 }
 

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

@@ -17,6 +17,8 @@ t_begin "setup and startup" && {
 t_begin "send big pipelined chunked requests" && {
 	(
 		cat $fifo > $tmp &
+		Connection=keep-alive
+		export Connection
 		content-md5-put < random_blob
 		content-md5-put < random_blob
 		content-md5-put < random_blob

data/t/t0107-rack-input-limit-zero.sh

@@ -0,0 +1,60 @@
+#!/bin/sh
+. ./test-lib.sh
+req_curl_chunked_upload_err_check
+
+t_plan 6 "rack.input client_max_body_size zero"
+
+t_begin "setup and startup" && {
+	rtmpfiles curl_out curl_err
+	rainbows_setup $model
+	ed -s $unicorn_config <<EOF
+,s/client_max_body_size.*/client_max_body_size 0/
+w
+EOF
+	rainbows -D sha1-random-size.ru -c $unicorn_config
+	rainbows_wait_start
+	empty_sha1=da39a3ee5e6b4b0d3255bfef95601890afd80709
+}
+
+t_begin "regular request" && {
+	curl -vsSf -H Expect: http://$listen/ > $curl_out 2> $curl_err
+	dbgcat curl_err
+	dbgcat curl_out
+	test x"$(cat $curl_out)" = x$empty_sha1
+}
+
+t_begin "chunked request" && {
+	curl -vsSf -T- < /dev/null -H Expect: \
+	  http://$listen/ > $curl_out 2> $curl_err
+	dbgcat curl_err
+	dbgcat curl_out
+	test x"$(cat $curl_out)" = x$empty_sha1
+}
+
+t_begin "small input chunked" && {
+	rm -f $ok
+	echo | \
+	  curl -vsSf -T- -H Expect: \
+	  http://$listen/ > $curl_out 2> $curl_err || > $ok
+	dbgcat curl_err
+	dbgcat curl_out
+	fgrep 413 $curl_err
+	test -e $ok
+}
+
+t_begin "small input content-length" && {
+	rm -f $ok
+	echo > $tmp
+	curl -vsSf -T $tmp -H Expect: \
+	  http://$listen/ > $curl_out 2> $curl_err || > $ok
+	fgrep 413 $curl_err
+	dbgcat curl_err
+	dbgcat curl_out
+	test -e $ok
+}
+
+t_begin "shutdown" && {
+	kill $rainbows_pid
+}
+
+t_done

data/t/t0113-rewindable-input-false.sh

@@ -3,6 +3,7 @@
 skip_models EventMachine NeverBlock
 skip_models Rev RevThreadSpawn RevThreadPool
 skip_models Coolio CoolioThreadSpawn CoolioThreadPool
+skip_models Epoll XEpoll
 
 t_plan 4 "rewindable_input toggled to false"
 

data/t/t0114-rewindable-input-true.sh

@@ -3,6 +3,7 @@
 skip_models EventMachine NeverBlock
 skip_models Rev RevThreadSpawn RevThreadPool
 skip_models Coolio CoolioThreadSpawn CoolioThreadPool
+skip_models Epoll XEpoll
 
 t_plan 4 "rewindable_input toggled to true"
 

data/t/t0202-async-response-one-oh.sh

@@ -0,0 +1,56 @@
+#!/bin/sh
+CONFIG_RU=${CONFIG_RU-'async-response.ru'}
+. ./test-lib.sh
+
+skip_models Base WriterThreadPool WriterThreadSpawn
+
+t_plan 6 "async HTTP/1.0 response for $model"
+
+t_begin "setup and start" && {
+	rainbows_setup
+	rtmpfiles a b c a_err b_err c_err
+	# can't load Rack::Lint here since it'll cause Rev to slurp
+	rainbows -E none -D $CONFIG_RU -c $unicorn_config
+	rainbows_wait_start
+}
+
+t_begin "send async requests off in parallel" && {
+	t0=$(date +%s)
+	curl="curl -0 --no-buffer -vsSf http://$listen/"
+	( $curl 2>> $a_err | utee $a) &
+	( $curl 2>> $b_err | utee $b) &
+	( $curl 2>> $c_err | utee $c) &
+	wait
+	t1=$(date +%s)
+}
+
+t_begin "ensure elapsed requests were processed in parallel" && {
+	elapsed=$(( $t1 - $t0 ))
+	echo "elapsed=$elapsed < 30"
+	test $elapsed -lt 30
+}
+
+t_begin "termination signal sent" && {
+	kill $rainbows_pid
+}
+
+dbgcat a
+dbgcat b
+dbgcat c
+dbgcat a_err
+
+t_begin "no errors from curl" && {
+	if grep -i Transfer-Encoding $a_err $b_err $c_err
+	then
+		die "Unexpected Transfer-Encoding: header"
+	fi
+	for i in $a_err $b_err $c_err
+	do
+		grep 'Connection: close' $i
+	done
+}
+
+dbgcat r_err
+t_begin "no errors in stderr" && check_stderr
+
+t_done

data/t/test_isolate.rb

@@ -16,8 +16,9 @@ $stdout.reopen($stderr)
 lock = File.open(__FILE__, "rb")
 lock.flock(File::LOCK_EX)
 Isolate.now!(opts) do
-  gem 'unicorn', '3.3.1'
+  gem 'unicorn', '3.4.0'
   gem 'kcar', '0.1.2'
+  gem 'raindrops', '0.4.1'
 
   if engine == "ruby"
     gem 'sendfile', '1.0.0' # next Rubinius should support this
@@ -31,8 +32,10 @@ Isolate.now!(opts) do
 
   if defined?(::Fiber) && engine == "ruby"
     gem 'revactor', '0.1.5'
-    gem 'rack-fiber_pool', '0.9.0'
+    gem 'rack-fiber_pool', '0.9.1'
   end
+
+  gem 'sleepy_penguin', '1.4.0' if RUBY_PLATFORM =~ /linux/
 end
 
 $stdout.reopen(old_out)

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rainbows
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
-  segments: 
-  - 3
-  - 0
-  - 0
-  version: 3.0.0
+  prerelease: 
+  version: 3.1.0
 platform: ruby
 authors: 
 - Rainbows! hackers
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-12 00:00:00 +00:00
+date: 2011-02-11 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,10 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
         version: "1.1"
   type: :runtime
   version_requirements: *id001
@@ -41,11 +32,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 3
-        version: "3.3"
+        version: "3.4"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -56,11 +43,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :development
   version_requirements: *id003
@@ -72,11 +54,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
+        version: "1.5"
   type: :development
   version_requirements: *id004
 description: |-
@@ -116,6 +94,11 @@ extra_rdoc_files:
 - lib/rainbows/coolio_thread_spawn.rb
 - lib/rainbows/coolio_thread_spawn/client.rb
 - lib/rainbows/dev_fd_response.rb
+- lib/rainbows/epoll.rb
+- lib/rainbows/epoll/client.rb
+- lib/rainbows/epoll/response_chunk_pipe.rb
+- lib/rainbows/epoll/response_pipe.rb
+- lib/rainbows/epoll/server.rb
 - lib/rainbows/error.rb
 - lib/rainbows/ev_core.rb
 - lib/rainbows/ev_core/cap_input.rb
@@ -144,6 +127,7 @@ extra_rdoc_files:
 - lib/rainbows/http_parser.rb
 - lib/rainbows/http_response.rb
 - lib/rainbows/http_server.rb
+- lib/rainbows/join_threads.rb
 - lib/rainbows/max_body.rb
 - lib/rainbows/max_body/rewindable_wrapper.rb
 - lib/rainbows/max_body/wrapper.rb
@@ -152,7 +136,6 @@ extra_rdoc_files:
 - lib/rainbows/never_block/event_machine.rb
 - lib/rainbows/process_client.rb
 - lib/rainbows/queue_pool.rb
-- lib/rainbows/rack_input.rb
 - lib/rainbows/response.rb
 - lib/rainbows/rev.rb
 - lib/rainbows/rev_fiber_spawn.rb
@@ -163,6 +146,12 @@ extra_rdoc_files:
 - lib/rainbows/revactor/client/methods.rb
 - lib/rainbows/revactor/client/tee_socket.rb
 - lib/rainbows/revactor/proxy.rb
+- lib/rainbows/reverse_proxy.rb
+- lib/rainbows/reverse_proxy/coolio.rb
+- lib/rainbows/reverse_proxy/ev_client.rb
+- lib/rainbows/reverse_proxy/event_machine.rb
+- lib/rainbows/reverse_proxy/multi_thread.rb
+- lib/rainbows/reverse_proxy/synchronous.rb
 - lib/rainbows/sendfile.rb
 - lib/rainbows/server_token.rb
 - lib/rainbows/socket_proxy.rb
@@ -176,6 +165,8 @@ extra_rdoc_files:
 - lib/rainbows/writer_thread_pool/client.rb
 - lib/rainbows/writer_thread_spawn.rb
 - lib/rainbows/writer_thread_spawn/client.rb
+- lib/rainbows/xepoll.rb
+- lib/rainbows/xepoll/client.rb
 - LATEST
 - LICENSE
 - NEWS
@@ -216,6 +207,7 @@ files:
 - TUNING
 - Test_Suite
 - bin/rainbows
+- examples/reverse_proxy.ru
 - lib/rainbows.rb
 - lib/rainbows/actor_spawn.rb
 - lib/rainbows/app_pool.rb
@@ -240,6 +232,11 @@ files:
 - lib/rainbows/coolio_thread_spawn.rb
 - lib/rainbows/coolio_thread_spawn/client.rb
 - lib/rainbows/dev_fd_response.rb
+- lib/rainbows/epoll.rb
+- lib/rainbows/epoll/client.rb
+- lib/rainbows/epoll/response_chunk_pipe.rb
+- lib/rainbows/epoll/response_pipe.rb
+- lib/rainbows/epoll/server.rb
 - lib/rainbows/error.rb
 - lib/rainbows/ev_core.rb
 - lib/rainbows/ev_core/cap_input.rb
@@ -268,6 +265,7 @@ files:
 - lib/rainbows/http_parser.rb
 - lib/rainbows/http_response.rb
 - lib/rainbows/http_server.rb
+- lib/rainbows/join_threads.rb
 - lib/rainbows/max_body.rb
 - lib/rainbows/max_body/rewindable_wrapper.rb
 - lib/rainbows/max_body/wrapper.rb
@@ -276,7 +274,6 @@ files:
 - lib/rainbows/never_block/event_machine.rb
 - lib/rainbows/process_client.rb
 - lib/rainbows/queue_pool.rb
-- lib/rainbows/rack_input.rb
 - lib/rainbows/response.rb
 - lib/rainbows/rev.rb
 - lib/rainbows/rev_fiber_spawn.rb
@@ -287,6 +284,12 @@ files:
 - lib/rainbows/revactor/client/methods.rb
 - lib/rainbows/revactor/client/tee_socket.rb
 - lib/rainbows/revactor/proxy.rb
+- lib/rainbows/reverse_proxy.rb
+- lib/rainbows/reverse_proxy/coolio.rb
+- lib/rainbows/reverse_proxy/ev_client.rb
+- lib/rainbows/reverse_proxy/event_machine.rb
+- lib/rainbows/reverse_proxy/multi_thread.rb
+- lib/rainbows/reverse_proxy/synchronous.rb
 - lib/rainbows/sendfile.rb
 - lib/rainbows/server_token.rb
 - lib/rainbows/socket_proxy.rb
@@ -300,8 +303,11 @@ files:
 - lib/rainbows/writer_thread_pool/client.rb
 - lib/rainbows/writer_thread_spawn.rb
 - lib/rainbows/writer_thread_spawn/client.rb
+- lib/rainbows/xepoll.rb
+- lib/rainbows/xepoll/client.rb
 - local.mk.sample
 - man/man1/rainbows.1
+- pkg.mk
 - rainbows.gemspec
 - setup.rb
 - t/.gitignore
@@ -345,6 +351,7 @@ files:
 - t/simple-http_CoolioFiberSpawn.ru
 - t/simple-http_CoolioThreadPool.ru
 - t/simple-http_CoolioThreadSpawn.ru
+- t/simple-http_Epoll.ru
 - t/simple-http_EventMachine.ru
 - t/simple-http_FiberPool.ru
 - t/simple-http_FiberSpawn.ru
@@ -358,6 +365,7 @@ files:
 - t/simple-http_ThreadSpawn.ru
 - t/simple-http_WriterThreadPool.ru
 - t/simple-http_WriterThreadSpawn.ru
+- t/simple-http_XEpoll.ru
 - t/sleep.ru
 - t/t0000-simple-http.sh
 - t/t0000.ru
@@ -395,6 +403,7 @@ files:
 - t/t0034-pipelined-pipe-response.sh
 - t/t0035-kgio-pipe-response.sh
 - t/t0040-keepalive_requests-setting.sh
+- t/t0041-optional-pool-size.sh
 - t/t0050-response-body-close-has-env.sh
 - t/t0100-rack-input-hammer-chunked.sh
 - t/t0100-rack-input-hammer-content-length.sh
@@ -404,12 +413,14 @@ files:
 - t/t0104-rack-input-limit-tiny.sh
 - t/t0105-rack-input-limit-bigger.sh
 - t/t0106-rack-input-keepalive.sh
+- t/t0107-rack-input-limit-zero.sh
 - t/t0113-rewindable-input-false.sh
 - t/t0113.ru
 - t/t0114-rewindable-input-true.sh
 - t/t0114.ru
 - t/t0200-async-response.sh
 - t/t0201-async-response-no-autochunk.sh
+- t/t0202-async-response-one-oh.sh
 - t/t0300-async_sinatra.sh
 - t/t0400-em-async-app.sh
 - t/t0401-em-async-tailer.sh
@@ -444,7 +455,7 @@ rdoc_options:
 - -t
 - Rainbows! - Unicorn for sleepy apps and slow clients
 - -W
-- http://git.bogomips.org/cgit/rainbows.git/tree/%s
+- http://bogomips.org/rainbows.git/tree/%s
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -452,23 +463,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rainbows
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: "- Unicorn for sleepy apps and slow clients"