zbatery 0.2.1 → 0.3.0

data/.manifest

@@ -27,8 +27,12 @@ t/bin/unused_listen
 t/bin/utee
 t/large-file-response.ru
 t/my-tap-lib.sh
+t/sha1-random-size.ru
 t/sleep.ru
 t/t0003-reopen-logs.sh
 t/t0005-large-file-response.sh
+t/t0020-large-sendfile-response.sh
+t/t0103-rack-input-limit.sh
 t/test-lib.sh
+t/test_isolate.rb
 zbatery.gemspec

data/ChangeLog

@@ -1,5 +1,36 @@
-ChangeLog from git://git.bogomips.org/zbatery.git (v0.1.1..v0.2.1)
+ChangeLog from git://git.bogomips.org/zbatery.git (v0.1.1..v0.3.0)
 
+    commit d4f095ed8ed0da4f190280eb957c14b3f5e9a2e9
+    Author: Eric Wong <normalperson@yhbt.net>
+    Date:   Sat Jul 10 09:56:27 2010 +0000
+    
+        Zbatery v0.3.0 - for newer Rainbows!
+        
+        Rainbows! v0.95.0 is more awesome than v0.94.0, so we've updated
+        ourselves to use it and be more awesome as well!
+    
+    commit 00f570d6c3363794ee4489fae17b05555b78b2cf
+    Author: Eric Wong <normalperson@yhbt.net>
+    Date:   Sat Jul 10 09:55:20 2010 +0000
+    
+        gemspec: small doc updates
+    
+    commit 59d3b3f6318a85e4d68592e1f7b992dd54832aa0
+    Author: Eric Wong <normalperson@yhbt.net>
+    Date:   Sat Jul 10 09:53:52 2010 +0000
+    
+        add additional tests for newish Rainbows! features
+    
+    commit bd6b2263869c271113577b88d526c7c2a6f1455d
+    Author: Eric Wong <normalperson@yhbt.net>
+    Date:   Sat Jul 10 02:41:46 2010 -0700
+    
+        updates for Rainbows! 0.95.0
+        
+        Rainbows! 0.95.0 made some incompatible changes, so update
+        everything.  Unfortunately we have to avoid subclassing here.
+        Tests use isolate now.
+    
     commit 5764336aa3785af8a08be7ec7b40846ec139eb6c
     Author: Eric Wong <normalperson@yhbt.net>
     Date:   Mon Apr 19 14:14:46 2010 -0700

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 0.2.1
+GIT_VERSION = 0.3.0

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v0.2.1.GIT
+DEF_VER=v0.3.0.GIT
 
 LF='
 '

data/GNUmakefile

@@ -1,7 +1,9 @@
 # use GNU Make to run tests in parallel, and without depending on RubyGems
 all::
+MRI = ruby
 RUBY = ruby
 RAKE = rake
+RSYNC = rsync
 GIT_URL = git://git.bogomips.org/zbatery.git
 
 GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
@@ -14,9 +16,11 @@ endif
 ifeq ($(RUBY_VERSION),)
   RUBY_VERSION := $(shell $(RUBY) -e 'puts RUBY_VERSION')
 endif
+RUBY_ENGINE := $(shell $(RUBY) -e 'puts((RUBY_ENGINE rescue "ruby"))')
 
 base_bins := zbatery
 bins := $(addprefix bin/, $(base_bins))
+man1_rdoc := $(addsuffix _1, $(base_bins))
 man1_bins := $(addsuffix .1, $(base_bins))
 man1_paths := $(addprefix man/man1/, $(man1_bins))
 
@@ -76,26 +80,52 @@ cgit_atom := http://git.bogomips.org/cgit/zbatery.git/atom/?h=master
 atom = <link rel="alternate" title="Atom feed" href="$(1)" \
              type="application/atom+xml"/>
 
-# using rdoc 2.4.1+
+# using rdoc 2.5.x+
 doc: .document NEWS ChangeLog
-	for i in $(man1_bins); do > $$i; done
-	rdoc -Na -t "$(shell sed -ne '1s/^= //p' README)"
+	for i in $(man1_rdoc); do echo > $$i; done
+	find bin lib -type f -name '*.rbc' -exec rm -f '{}' ';'
+	rdoc -t "$(shell sed -ne '1s/^= //p' README)"
 	install -m644 COPYING doc/COPYING
 	install -m644 $(shell grep '^[A-Z]' .document)  doc/
 	$(MAKE) -C Documentation install-html install-man
 	install -m644 $(man1_paths) doc/
 	cd doc && for i in $(base_bins); do \
+	  $(RM) 1.html $${i}.1.html; \
 	  sed -e '/"documentation">/r man1/'$$i'.1.html' \
-		< $${i}_1.html > tmp && mv tmp $${i}_1.html; done
-	$(RUBY) -i -p -e \
+		< $${i}_1.html > tmp && mv tmp $${i}_1.html; \
+	  ln $${i}_1.html $${i}.1.html; \
+	  done
+	$(MRI) -i -p -e \
 	  '$$_.gsub!("</title>",%q{\&$(call atom,$(cgit_atom))})' \
 	  doc/ChangeLog.html
-	$(RUBY) -i -p -e \
+	$(MRI) -i -p -e \
 	  '$$_.gsub!("</title>",%q{\&$(call atom,$(news_atom))})' \
 	  doc/NEWS.html doc/README.html
 	$(RAKE) -s news_atom > doc/NEWS.atom.xml
 	cd doc && ln README.html tmp && mv tmp index.html
-	$(RM) $(man1_bins)
+	$(RM) $(man1_rdoc)
+
+# publishes docs to http://zbatery.bogomip.org/
+publish_doc:
+	-git set-file-times
+	$(RM) -r doc ChangeLog NEWS
+	$(MAKE) doc LOG_VERSION=$(shell git tag -l | tail -1)
+	awk 'BEGIN{RS="=== ";ORS=""}NR==2{sub(/\n$$/,"");print RS""$$0 }' \
+	 < NEWS > doc/LATEST
+	find doc/images doc/js -type f | \
+		TZ=UTC xargs touch -d '1970-01-01 00:00:01' doc/rdoc.css
+	$(MAKE) doc_gz
+	chmod 644 $$(find doc -type f)
+	$(RSYNC) -av doc/ zbatery.bogomip.org:/srv/zbatery/
+	git ls-files | xargs touch
+
+# Create gzip variants of the same timestamp as the original so nginx
+# "gzip_static on" can serve the gzipped versions directly.
+doc_gz: docs = $(shell find doc -type f ! -regex '^.*\.\(gif\|jpg\|png\|gz\)$$')
+doc_gz:
+	touch doc/NEWS.atom.xml -d "$$(awk 'NR==1{print $$4,$$5,$$6}' NEWS)"
+	for i in $(docs); do \
+	  gzip --rsyncable -9 < $$i > $$i.gz; touch -r $$i $$i.gz; done
 
 ifneq ($(VERSION),)
 rfproject := rainbows
@@ -152,11 +182,13 @@ release: verify package $(release_notes) $(release_changes)
 	# make tgz release on RubyForge
 	rubyforge add_release -f -n $(release_notes) -a $(release_changes) \
 	  $(rfproject) $(rfpackage) $(VERSION) $(pkgtgz)
-	# push gem to Gemcutter
+	# push gem to RubyGems.org
 	gem push $(pkggem)
 	# in case of gem downloads from RubyForge releases page
 	-rubyforge add_file \
 	  $(rfproject) $(rfpackage) $(VERSION) $(pkggem)
+	$(RAKE) raa_update VERSION=$(VERSION)
+	$(RAKE) fm_update VERSION=$(VERSION)
 else
 gem install-gem: GIT-VERSION-FILE
 	$(MAKE) $@ VERSION=$(GIT_VERSION)

data/NEWS

@@ -1,3 +1,8 @@
+=== 0.3.0 / 2010-07-10 09:58 UTC
+
+  Rainbows! v0.95.0 is more awesome than v0.94.0, so we've updated
+  ourselves to use it and be more awesome as well!
+
 === 0.2.1 / 2010-04-19 21:16 UTC
 
   This release fixes a denial-of-service vector for deployments

data/Rakefile

@@ -1,4 +1,5 @@
 # -*- encoding: binary -*-
+autoload :Gem, 'rubygems'
 
 # most tasks are in the GNUmakefile which offers better parallelism
 
@@ -89,8 +90,6 @@ end
 
 desc "print release notes for Rubyforge"
 task :release_notes do
-  require 'rubygems'
-
   spec = Gem::Specification.load('zbatery.gemspec')
   puts spec.description.strip
   puts ""
@@ -121,7 +120,6 @@ end
 
 desc "post to RAA"
 task :raa_update do
-  require 'rubygems'
   require 'net/http'
   require 'net/netrc'
   rc = Net::Netrc.locate('zbatery-raa') or abort "~/.netrc not found"
@@ -156,3 +154,32 @@ task :raa_update do
   p res
   puts res.body
 end
+
+desc "post to FM"
+task :fm_update do
+  require 'tempfile'
+  require 'net/http'
+  require 'net/netrc'
+  require 'json'
+  version = ENV['VERSION'] or abort "VERSION= needed"
+  uri = URI.parse('http://freshmeat.net/projects/zbatery/releases.json')
+  rc = Net::Netrc.locate('zbatery-fm') or abort "~/.netrc not found"
+  api_token = rc.password
+  changelog = tags.find { |t| t[:tag] == "v#{version}" }[:body]
+  tmp = Tempfile.new('fm-changelog')
+  tmp.syswrite(changelog)
+  system(ENV["VISUAL"], tmp.path) or abort "#{ENV["VISUAL"]} failed: #$?"
+  changelog = File.read(tmp.path).strip
+
+  req = {
+    "auth_code" => api_token,
+    "release" => {
+      "tag_list" => "Stable",
+      "version" => version,
+      "changelog" => changelog,
+    },
+  }.to_json
+  Net::HTTP.start(uri.host, uri.port) do |http|
+    p http.post(uri.path, req, {'Content-Type'=>'application/json'})
+  end
+end

data/lib/zbatery.rb

@@ -1,17 +1,18 @@
 # -*- encoding: binary -*-
+# :enddoc:
 require 'rainbows'
 
 module Zbatery
 
   # current version of Zbatery
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 
   class << self
 
     # runs the Zbatery HttpServer with +app+ and +options+ and does
     # not return until the server has exited.
     def run(app, options = {})
-      HttpServer.new(app, options).start.join
+      Rainbows::HttpServer.new(app, options).start.join
     end
   end
 
@@ -32,7 +33,37 @@ module Zbatery
   # config files...
   FORK_HOOK = lambda { |_,_| }
 
-  class HttpServer < Rainbows::HttpServer
+end
+
+# :stopdoc:
+# override stuff we don't need or can't use portably
+module Rainbows
+
+  module Base
+    # master == worker in our case
+    def init_worker_process(worker)
+      after_fork.call(self, worker)
+      worker.user(*user) if user.kind_of?(Array) && ! worker.switched
+      build_app! unless preload_app
+      Rainbows::Response.setup(self.class)
+      Rainbows::MaxBody.setup
+
+      # avoid spurious wakeups and blocking-accept() with 1.8 green threads
+      if RUBY_VERSION.to_f < 1.9
+        require "io/nonblock"
+        HttpServer::LISTENERS.each { |l| l.nonblock = true }
+      end
+
+      logger.info "Zbatery #@use worker_connections=#@worker_connections"
+    end
+  end
+
+  # we can't/don't need to do the fchmod heartbeat Unicorn/Rainbows! does
+  def G.tick
+    alive
+  end
+
+  class HttpServer
 
     # this class is only used to avoid breaking Unicorn user switching
     class DeadIO
@@ -115,47 +146,20 @@ module Zbatery
 
     def before_fork
       hook = super
-      hook == FORK_HOOK or
+      hook == Zbatery::FORK_HOOK or
         logger.warn "calling before_fork without forking"
       hook
     end
 
     def after_fork
       hook = super
-      hook == FORK_HOOK or
+      hook == Zbatery::FORK_HOOK or
         logger.warn "calling after_fork without having forked"
       hook
     end
   end
 end
 
-# :stopdoc:
-# override stuff we don't need or can't use portably
-module Rainbows
-
-  module Base
-    # master == worker in our case
-    def init_worker_process(worker)
-      after_fork.call(self, worker)
-      worker.user(*user) if user.kind_of?(Array) && ! worker.switched
-      build_app! unless preload_app
-
-      # avoid spurious wakeups and blocking-accept() with 1.8 green threads
-      if RUBY_VERSION.to_f < 1.9
-        require "io/nonblock"
-        HttpServer::LISTENERS.each { |l| l.nonblock = true }
-      end
-
-      logger.info "Zbatery #@use worker_connections=#@worker_connections"
-    end
-  end
-
-  # we can't/don't need to do the fchmod heartbeat Unicorn/Rainbows! does
-  def G.tick
-    alive
-  end
-end
-
 module Unicorn
 
   class Configurator

data/t/.gitignore

@@ -1,4 +1,6 @@
 /test-results-*
-/test-bin-*
+/bin-*
 /random_blob
 /.dep+*
+/trash
+/tmp

data/t/GNUmakefile

@@ -4,6 +4,7 @@ all::
 
 pid := $(shell echo $$PPID)
 
+MRI = ruby
 RUBY = ruby
 zbatery_lib := $(shell cd ../lib && pwd)
 -include ../local.mk
@@ -15,13 +16,11 @@ ifeq ($(RUBY_VERSION),)
   $(error unable to detect RUBY_VERSION)
 endif
 
-ifeq ($(RUBYLIB),)
-  RUBYLIB := $(zbatery_lib)
-else
-  RUBYLIB := $(zbatery_lib):$(RUBYLIB)
-endif
-export RUBYLIB RUBY_VERSION
+RUBY_ENGINE := $(shell $(RUBY) -e 'puts((RUBY_ENGINE rescue "ruby"))')
+export RUBY_VERSION RUBY_ENGINE
 
+models += WriterThreadPool
+models += WriterThreadSpawn
 models += ThreadPool
 models += ThreadSpawn
 models += Rev
@@ -30,13 +29,19 @@ models += NeverBlock
 models += RevThreadSpawn
 models += RevThreadPool
 
-rp := )
-ONENINE := $(shell case $(RUBY_VERSION) in 1.9.*$(rp) echo true;;esac)
-ifeq ($(ONENINE),true)
-  models += Revactor
-  models += FiberSpawn
-  models += RevFiberSpawn
-  models += FiberPool
+ifeq ($(RUBY_ENGINE),ruby)
+  rp := )
+  ONENINE := $(shell case $(RUBY_VERSION) in 1.9.*$(rp) echo true;;esac)
+  ifeq ($(ONENINE),true)
+    models += Revactor
+    models += FiberSpawn
+    models += RevFiberSpawn
+    models += FiberPool
+  endif
+endif
+
+ifeq ($(RUBY_ENGINE),rbx)
+  models += ActorSpawn
 endif
 all_models := $(models) Base
 
@@ -63,7 +68,7 @@ $(all_models):
 all:: $(T)
 
 # can't rely on "set -o pipefail" since we don't require bash or ksh93 :<
-t_pfx = trash/$@-$(RUBY_VERSION)
+t_pfx = trash/$@-$(RUBY_ENGINE)-$(RUBY_VERSION)
 TEST_OPTS =
 # TRACER = strace -f -o $(t_pfx).strace -s 100000
 # TRACER = /usr/bin/time -o $(t_pfx).time
@@ -76,11 +81,13 @@ ifdef V
   endif
 endif
 
-test-bin-$(RUBY_VERSION)/zbatery: ruby_bin = $(shell which $(RUBY))
-test-bin-$(RUBY_VERSION)/zbatery: ../bin/zbatery
+bindir := $(CURDIR)/bin-$(RUBY_ENGINE)-$(RUBY_VERSION)
+bin_zbatery := $(bindir)/zbatery
+$(bin_zbatery): ruby_bin = $(shell which $(RUBY))
+$(bin_zbatery): ../bin/zbatery
 	mkdir -p $(@D)
 	install -m 755 $^ $@.$(pid)
-	$(RUBY) -i -p -e '$$_.gsub!(%r{^#!.*$$},"#!$(ruby_bin)")' $@.$(pid)
+	$(MRI) -i -p -e '$$_.gsub!(%r{^#!.*$$},"#!$(ruby_bin)")' $@.$(pid)
 	mv $@.$(pid) $@
 
 random_blob:
@@ -97,21 +104,28 @@ $(deps):
 	@test -s $@.$(pid) || \
 	  { echo >&2 "E '$(dep_bin)' not found in PATH=$(PATH)"; exit 1; }
 	@mv $@.$(pid) $@
-dep: $(deps)
+
+libs := tmp/isolate/$(RUBY_ENGINE)-$(RUBY_VERSION)/.libs
+$(libs): test_isolate.rb
+	mkdir -p $(@D)
+	$(RUBY) $< > $@+
+	mv $@+ $@
+t_deps := $(libs) $(deps) $(bin_zbatery) trash/.gitignore
+$(T): $(t_deps)
 
 $(MODEL_T): export model = $(firstword $(subst ., ,$@))
 $(MODEL_T): script = $(subst $(model).,,$@)
-$(MODEL_T): trash/.gitignore
 $(MODEL_T): export RUBY := $(RUBY)
-$(MODEL_T): export PATH := $(CURDIR)/test-bin-$(RUBY_VERSION):$(PATH)
-$(MODEL_T): test-bin-$(RUBY_VERSION)/zbatery dep
-	$(TRACER) $(SHELL) $(SH_TEST_OPTS) $(script) $(TEST_OPTS)
+$(MODEL_T): export PATH := $(bindir):$(PATH)
+$(MODEL_T): $(t_deps)
+	RUBYLIB=$(zbatery_lib):$$(cat $(libs)) \
+	   $(TRACER) $(SHELL) $(SH_TEST_OPTS) $(script) $(TEST_OPTS)
 
 trash/.gitignore:
 	mkdir -p $(@D)
 	echo '*' > $@
 
 clean:
-	$(RM) -r trash/*.log trash/*.code test-bin-$(RUBY_VERSION)
+	$(RM) -r trash/*.log trash/*.code $(bindir)
 
 .PHONY: $(T) clean

data/t/my-tap-lib.sh

@@ -188,9 +188,10 @@ then
 
 	(
 		# use a subshell so seds are not waitable
-		$SED -e 's/^/#: /' $t_stdout &
-		$SED -e 's/^/#! /' $t_stderr &
+		$SED -e 's/^/#: /' < $t_stdout &
+		$SED -e 's/^/#! /' < $t_stderr &
 	) &
+	wait
 	exec > $t_stdout 2> $t_stderr
 else
 	exec > /dev/null 2> /dev/null

data/t/sha1-random-size.ru

@@ -0,0 +1,19 @@
+# SHA1 checksum generator
+require 'digest/sha1'
+use Rack::ContentLength
+cap = 16384
+app = lambda do |env|
+  /\A100-continue\z/i =~ env['HTTP_EXPECT'] and
+    return [ 100, {}, [] ]
+  digest = Digest::SHA1.new
+  input = env['rack.input']
+  if buf = input.read(rand(cap))
+    begin
+      raise "#{buf.size} > #{cap}" if buf.size > cap
+      digest.update(buf)
+    end while input.read(rand(cap), buf)
+  end
+
+  [ 200, {'Content-Type' => 'text/plain'}, [ digest.hexdigest << "\n" ] ]
+end
+run app

data/t/t0005-large-file-response.sh

@@ -12,13 +12,14 @@ t_plan 10 "large file response slurp avoidance for $model"
 
 t_begin "setup and startup" && {
 	rtmpfiles curl_out
-	zbatery_setup $model
+	zbatery_setup $model 1
 	# can't load Rack::Lint here since it'll cause Rev to slurp
 	zbatery -E none -D large-file-response.ru -c $unicorn_config
 	zbatery_wait_start
 }
 
-t_begin "read random blob size" && {
+t_begin "read random blob sha1 and size" && {
+	random_blob_sha1=$(rsha1 < random_blob)
 	random_blob_size=$(wc -c < random_blob)
 }
 
@@ -32,29 +33,29 @@ t_begin "read current RSS" && {
 t_begin "send a series HTTP/1.1 requests sequentially" && {
 	for i in a b c
 	do
-		size=$( (curl -sSfv http://$listen/random_blob &&
-			 echo ok >$ok) |wc -c)
-		test $size -eq $random_blob_size
+		sha1=$( (curl -sSfv http://$listen/random_blob &&
+			 echo ok >$ok) | rsha1)
+		test $sha1 = $random_blob_sha1
 		test xok = x$(cat $ok)
 	done
 }
 
 # this was a problem during development
 t_begin "HTTP/1.0 test" && {
-	size=$( (curl -0 -sSfv http://$listen/random_blob &&
-	         echo ok >$ok) |wc -c)
-	test $size -eq $random_blob_size
+	sha1=$( (curl -0 -sSfv http://$listen/random_blob &&
+	         echo ok >$ok) | rsha1)
+	test $sha1 = $random_blob_sha1
 	test xok = x$(cat $ok)
 }
 
 t_begin "HTTP/0.9 test" && {
 	(
 		printf 'GET /random_blob\r\n'
-		cat $fifo > $tmp &
+		rsha1 < $fifo > $tmp &
 		wait
 		echo ok > $ok
 	) | socat - TCP:$listen > $fifo
-	cmp $tmp random_blob
+	test $(cat $tmp) = $random_blob_sha1
 	test xok = x$(cat $ok)
 }
 
@@ -72,8 +73,12 @@ t_begin "shutdown server" && {
 
 t_begin "compare RSS before and after" && {
 	diff=$(( $rss_after - $rss_before ))
+
+	# default GC malloc limit in MRI:
+	fudge=$(( 8 * 1024 * 1024 ))
+
 	t_info "test diff=$diff < orig=$random_blob_size"
-	test $diff -le $random_blob_size
+	test $diff -le $(( $random_blob_size + $fudge ))
 }
 
 dbgcat r_err

data/t/t0020-large-sendfile-response.sh

@@ -0,0 +1,141 @@
+#!/bin/sh
+. ./test-lib.sh
+test -r random_blob || die "random_blob required, run with 'make $0'"
+case $RUBY_ENGINE in
+ruby) ;;
+*)
+	t_info "skipping $T since it can't load the sendfile gem, yet"
+	exit 0
+	;;
+esac
+
+t_plan 12 "large sendfile response for $model"
+
+t_begin "setup and startup" && {
+	rtmpfiles curl_out a b c slow_a slow_b
+	zbatery_setup $model
+	echo 'require "sendfile"' >> $unicorn_config
+	echo 'def (::IO).copy_stream(*x); abort "NO"; end' >> $unicorn_config
+
+	# can't load Rack::Lint here since it clobbers body#to_path
+	zbatery -E none -D large-file-response.ru -c $unicorn_config
+	zbatery_wait_start
+}
+
+t_begin "read random blob sha1" && {
+	random_blob_sha1=$(rsha1 < random_blob)
+	three_sha1=$(cat random_blob random_blob random_blob | rsha1)
+}
+
+t_begin "send keepalive HTTP/1.1 requests in parallel" && {
+	for i in $a $b $c $slow_a $slow_b
+	do
+		curl -sSf http://$listen/random_blob \
+		          http://$listen/random_blob \
+		          http://$listen/random_blob | rsha1 > $i &
+	done
+	wait
+	for i in $a $b $c $slow_a $slow_b
+	do
+		test x$(cat $i) = x$three_sha1
+	done
+}
+
+t_begin "send a batch of abortive HTTP/1.1 requests in parallel" && {
+	for i in $a $b $c $slow_a $slow_b
+	do
+		rm -f $i
+		(
+			curl -sSf --max-time 5 --limit-rate 1K \
+			  http://$listen/random_blob >/dev/null || echo ok > $i
+		) &
+	done
+	wait
+}
+
+t_begin "all requests timed out" && {
+	for i in $a $b $c $slow_a $slow_b
+	do
+		test x$(cat $i) = xok
+	done
+}
+
+s='$NF ~ /worker_connections=[0-9]+/{gsub(/[^0-9]/,"",$3); print $3; exit}'
+t_begin "check proc to ensure file is closed properly (Linux only)" && {
+	worker_pid=$(awk "$s" < $r_err)
+	test -n "$worker_pid"
+	if test -d /proc/$worker_pid/fd
+	then
+		if ls -l /proc/$worker_pid/fd | grep random_blob
+		then
+			t_info "random_blob file is open ($model)"
+		fi
+	else
+		t_info "/proc/$worker_pid/fd not found"
+	fi
+}
+
+t_begin "send a bunch of HTTP/1.1 requests in parallel" && {
+	(
+		curl -sSf --limit-rate 1M http://$listen/random_blob | \
+		  rsha1 > $slow_a
+	) &
+	(
+		curl -sSf --limit-rate 750K http://$listen/random_blob | \
+		  rsha1 > $slow_b
+	) &
+	for i in $a $b $c
+	do
+		(
+			curl -sSf http://$listen/random_blob | rsha1 > $i
+		) &
+	done
+	wait
+	for i in $a $b $c $slow_a $slow_b
+	do
+		test x$(cat $i) = x$random_blob_sha1
+	done
+}
+
+# this was a problem during development
+t_begin "HTTP/1.0 test" && {
+	sha1=$( (curl -0 -sSf http://$listen/random_blob &&
+	         echo ok >$ok) | rsha1)
+	test $sha1 = $random_blob_sha1
+	test xok = x$(cat $ok)
+}
+
+t_begin "HTTP/0.9 test" && {
+	(
+		printf 'GET /random_blob\r\n'
+		rsha1 < $fifo > $tmp &
+		wait
+		echo ok > $ok
+	) | socat - TCP:$listen > $fifo
+	test $(cat $tmp) = $random_blob_sha1
+	test xok = x$(cat $ok)
+}
+
+t_begin "check proc to ensure file is closed properly (Linux only)" && {
+	worker_pid=$(awk "$s" < $r_err)
+	test -n "$worker_pid"
+	if test -d /proc/$worker_pid/fd
+	then
+		if ls -l /proc/$worker_pid/fd | grep random_blob
+		then
+			t_info "random_blob file is open ($model)"
+		fi
+	else
+		t_info "/proc/$worker_pid/fd not found"
+	fi
+}
+
+t_begin "shutdown server" && {
+	kill -QUIT $zbatery_pid
+}
+
+dbgcat r_err
+
+t_begin "check stderr" && check_stderr
+
+t_done

data/t/t0103-rack-input-limit.sh

@@ -0,0 +1,61 @@
+#!/bin/sh
+. ./test-lib.sh
+test -r random_blob || die "random_blob required, run with 'make $0'"
+req_curl_chunked_upload_err_check
+
+t_plan 6 "rack.input client_max_body_size default"
+
+t_begin "setup and startup" && {
+	rtmpfiles curl_out curl_err cmbs_config
+	zbatery_setup $model
+	grep -v client_max_body_size < $unicorn_config > $cmbs_config
+	zbatery -D sha1-random-size.ru -c $cmbs_config
+	zbatery_wait_start
+}
+
+t_begin "regular request" && {
+	rm -f $ok
+	curl -vsSf -T random_blob -H Expect: \
+	  http://$listen/ > $curl_out 2> $curl_err || > $ok
+	dbgcat curl_err
+	dbgcat curl_out
+	test -e $ok
+}
+
+t_begin "chunked request" && {
+	rm -f $ok
+	curl -vsSf -T- < random_blob -H Expect: \
+	  http://$listen/ > $curl_out 2> $curl_err || > $ok
+	dbgcat curl_err
+	dbgcat curl_out
+	test -e $ok
+}
+
+t_begin "default size sha1 chunked" && {
+	blob_sha1=3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3
+	rm -f $ok
+	> $r_err
+	dd if=/dev/zero bs=1048576 count=1 | \
+	  curl -vsSf -T- -H Expect: \
+	  http://$listen/ > $curl_out 2> $curl_err
+	test "$(cat $curl_out)" = $blob_sha1
+	dbgcat curl_err
+	dbgcat curl_out
+}
+
+t_begin "default size sha1 content-length" && {
+	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
+	test "$(cat $curl_out)" = $blob_sha1
+	dbgcat curl_err
+	dbgcat curl_out
+}
+
+t_begin "shutdown" && {
+	kill $zbatery_pid
+}
+
+t_done

data/t/test-lib.sh

@@ -3,6 +3,12 @@
 . ./my-tap-lib.sh
 
 set +u
+
+# sometimes we rely on http_proxy to avoid wasting bandwidth with Isolate
+# and multiple Ruby versions
+NO_PROXY=${UNICORN_TEST_ADDR-127.0.0.1}
+export NO_PROXY
+
 if test -z "$model"
 then
 	# defaulting to Base would unfortunately fail some concurrency tests
@@ -13,7 +19,7 @@ fi
 set -e
 RUBY="${RUBY-ruby}"
 RUBY_VERSION=${RUBY_VERSION-$($RUBY -e 'puts RUBY_VERSION')}
-t_pfx=$PWD/trash/$model.$T-$RUBY_VERSION
+t_pfx=$PWD/trash/$model.$T-$RUBY_ENGINE-$RUBY_VERSION
 set -u
 
 PATH=$PWD/bin:$PATH
@@ -21,16 +27,6 @@ export PATH
 
 test -x $PWD/bin/unused_listen || die "must be run in 't' directory"
 
-wait_for_pid () {
-	path="$1"
-	nr=30
-	while ! test -s "$path" && test $nr -gt 0
-	do
-		nr=$(($nr - 1))
-		sleep 1
-	done
-}
-
 # requires $1 and prints out the value of $2
 require_check () {
 	lib=$1
@@ -42,6 +38,19 @@ require_check () {
 	fi
 }
 
+skip_models () {
+	for i in "$@"
+	do
+		if test x"$model" != x"$i"
+		then
+			continue
+		fi
+		t_info "skipping $T since it is not compatible with $model"
+		exit 0
+	done
+}
+
+
 # given a list of variable names, create temporary files and assign
 # the pathnames to those variables
 rtmpfiles () {
@@ -113,6 +122,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"
@@ -145,7 +155,22 @@ rsha1 () {
 
 	# last resort, see comments in sha1sum.rb for reasoning
 	test -n "$_cmd" || _cmd=sha1sum.rb
-	expr "$($_cmd < random_blob)" : '\([a-f0-9]\{40\}\)'
+	expr "$($_cmd)" : '\([a-f0-9]\{40\}\)'
+}
+
+req_curl_chunked_upload_err_check () {
+	set +e
+	curl --version 2>/dev/null | awk '$1 == "curl" {
+		split($2, v, /\./)
+		if ((v[1] < 7) || (v[1] == 7 && v[2] < 18))
+			code = 1
+	}
+	END { exit(code) }'
+	if test $? -ne 0
+	then
+		t_info "curl >= 7.18.0 required for $T"
+		exit 0
+	fi
 }
 
 case $model in

data/t/test_isolate.rb

@@ -0,0 +1,43 @@
+require 'rubygems'
+require 'isolate'
+engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
+
+path = "tmp/isolate/#{engine}-#{RUBY_VERSION}"
+opts = {
+  :system => false,
+  # we want "ruby-1.8.7" and not "ruby-1.8", so disable multiruby
+  :multiruby => false,
+  :path => path,
+}
+
+old_out = $stdout.dup
+$stdout.reopen($stderr)
+
+Isolate.now!(opts) do
+  gem 'rack', '1.1.0'
+  gem 'unicorn', '1.1.0'
+  gem 'rainbows', '0.95.0'
+
+  if engine == "ruby"
+    gem 'sendfile', '1.0.0' # next Rubinius should support this
+
+    gem 'iobuffer', '0.1.3'
+    gem 'rev', '0.3.2'
+
+    gem 'eventmachine', '0.12.10'
+    gem 'sinatra', '1.0.0'
+    gem 'async_sinatra', '0.2.1'
+
+    gem 'neverblock', '0.1.6.2'
+    gem 'cramp', '0.11'
+  end
+
+  if defined?(::Fiber) && engine == "ruby"
+    gem 'case', '0.5'
+    gem 'revactor', '0.1.5'
+    gem 'rack-fiber_pool', '0.9.0'
+  end
+end
+
+$stdout.reopen(old_out)
+puts Dir["#{path}/gems/*-*/lib"].map { |x| File.expand_path(x) }.join(':')

data/zbatery.gemspec

@@ -34,13 +34,13 @@ Gem::Specification.new do |s|
   s.files = manifest
   s.homepage = %q{http://zbatery.bogomip.org/}
   s.summary = %q{Rack HTTP server without a fork stuck in it}
-  s.rdoc_options = [ "-Na", "-t", "Zbatery - #{s.summary}" ]
+  s.rdoc_options = [ "-t", "Zbatery - #{s.summary}" ]
   s.require_paths = %w(lib)
   s.rubyforge_project = %q{rainbows}
 
   s.test_files = test_files
 
-  # rainbows has a boatload of dependencies
+  # rainbows has a boatload of optional dependencies
   # required:
   #   unicorn + rack
   # optional:
@@ -54,7 +54,8 @@ Gem::Specification.new do |s|
   # Unicorn were vulnerable to a remote DoS when exposed directly to
   # untrusted clients (a configuration only supported by Zbatery and Rainbows!,
   # Unicorn has never and will never be supported without trusted LAN clients.
-  s.add_dependency(%q<rainbows>, [">= 0.91.1", "<= 1.0.0"])
+  s.add_dependency(%q<rainbows>, [">= 0.95.0", "<= 1.0.0"])
+  s.add_development_dependency(%q<isolate>, "~> 2.1.0")
 
   # s.licenses = %w(GPLv2 Ruby) # accessor not compatible with older RubyGems
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zbatery
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  hash: 19
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Zbatery hackers
@@ -9,22 +15,49 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-19 00:00:00 +00:00
+date: 2010-07-10 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rainbows
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.91.1
+        hash: 355
+        segments: 
+        - 0
+        - 95
+        - 0
+        version: 0.95.0
     - - <=
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: isolate
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 1
+        - 0
+        version: 2.1.0
+  type: :development
+  version_requirements: *id002
 description: |-
   Zbatery is an HTTP server for Rack applications on systems that either
   do not support fork(), or have no memory (nor need) to run the
@@ -75,10 +108,14 @@ files:
 - t/bin/utee
 - t/large-file-response.ru
 - t/my-tap-lib.sh
+- t/sha1-random-size.ru
 - t/sleep.ru
 - t/t0003-reopen-logs.sh
 - t/t0005-large-file-response.sh
+- t/t0020-large-sendfile-response.sh
+- t/t0103-rack-input-limit.sh
 - t/test-lib.sh
+- t/test_isolate.rb
 - zbatery.gemspec
 has_rdoc: true
 homepage: http://zbatery.bogomip.org/
@@ -86,27 +123,32 @@ licenses: []
 
 post_install_message: 
 rdoc_options: 
-- -Na
 - -t
 - Zbatery - Rack HTTP server without a fork stuck in it
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rainbows
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Rack HTTP server without a fork stuck in it