unicorn 0.4.1 → 0.4.2

data/CHANGELOG

@@ -1,3 +1,4 @@
+v0.4.2 - fix Rails ARStore, FD leak prevention, descriptive proctitles
 v0.4.1 - Rails support, per-listener backlog and {snd,rcv}buf
 v0.2.3 - Unlink Tempfiles after use (they were closed, just not unlinked)
 v0.2.2 - small bug fixes, fix Rack multi-value headers (Set-Cookie:)

data/GNUmakefile

@@ -84,11 +84,15 @@ $(T): export RUBYLIB := $(test_prefix)/lib:$(RUBYLIB)
 $(T): $(test_prefix)/.stamp
 	$(run_test)
 
-install: bin/unicorn
+install: bin/unicorn bin/unicorn_rails
 	$(prep_setup_rb)
-	git diff --quiet $<
+	$(RM) -r .install-tmp
+	mkdir .install-tmp
+	cp -p $^ .install-tmp
 	$(ruby) setup.rb all
-	git checkout $<
+	$(RM) $^
+	mv $(addprefix .install-tmp/,$(^F)) bin/
+	$(RM) -r .install-tmp
 	$(prep_setup_rb)
 
 clean-http11:

data/Manifest

@@ -6,6 +6,7 @@ DESIGN
 GNUmakefile
 LICENSE
 Manifest
+PHILOSOPHY
 README
 Rakefile
 SIGNALS
@@ -31,6 +32,7 @@ lib/unicorn/http_response.rb
 lib/unicorn/launcher.rb
 lib/unicorn/socket.rb
 lib/unicorn/util.rb
+local.mk.sample
 setup.rb
 test/aggregate.rb
 test/benchmark/README
@@ -41,6 +43,7 @@ test/benchmark/response.rb
 test/exec/README
 test/exec/test_exec.rb
 test/rails/app-1.2.3/.gitignore
+test/rails/app-1.2.3/Rakefile
 test/rails/app-1.2.3/app/controllers/application.rb
 test/rails/app-1.2.3/app/controllers/foo_controller.rb
 test/rails/app-1.2.3/app/helpers/application_helper.rb
@@ -51,9 +54,11 @@ test/rails/app-1.2.3/config/environments/development.rb
 test/rails/app-1.2.3/config/environments/production.rb
 test/rails/app-1.2.3/config/routes.rb
 test/rails/app-1.2.3/db/.gitignore
+test/rails/app-1.2.3/log/.gitignore
 test/rails/app-1.2.3/public/404.html
 test/rails/app-1.2.3/public/500.html
 test/rails/app-2.0.2/.gitignore
+test/rails/app-2.0.2/Rakefile
 test/rails/app-2.0.2/app/controllers/application.rb
 test/rails/app-2.0.2/app/controllers/foo_controller.rb
 test/rails/app-2.0.2/app/helpers/application_helper.rb
@@ -64,9 +69,26 @@ test/rails/app-2.0.2/config/environments/development.rb
 test/rails/app-2.0.2/config/environments/production.rb
 test/rails/app-2.0.2/config/routes.rb
 test/rails/app-2.0.2/db/.gitignore
+test/rails/app-2.0.2/log/.gitignore
 test/rails/app-2.0.2/public/404.html
 test/rails/app-2.0.2/public/500.html
+test/rails/app-2.1.2/.gitignore
+test/rails/app-2.1.2/Rakefile
+test/rails/app-2.1.2/app/controllers/application.rb
+test/rails/app-2.1.2/app/controllers/foo_controller.rb
+test/rails/app-2.1.2/app/helpers/application_helper.rb
+test/rails/app-2.1.2/config/boot.rb
+test/rails/app-2.1.2/config/database.yml
+test/rails/app-2.1.2/config/environment.rb
+test/rails/app-2.1.2/config/environments/development.rb
+test/rails/app-2.1.2/config/environments/production.rb
+test/rails/app-2.1.2/config/routes.rb
+test/rails/app-2.1.2/db/.gitignore
+test/rails/app-2.1.2/log/.gitignore
+test/rails/app-2.1.2/public/404.html
+test/rails/app-2.1.2/public/500.html
 test/rails/app-2.2.2/.gitignore
+test/rails/app-2.2.2/Rakefile
 test/rails/app-2.2.2/app/controllers/application.rb
 test/rails/app-2.2.2/app/controllers/foo_controller.rb
 test/rails/app-2.2.2/app/helpers/application_helper.rb
@@ -77,9 +99,11 @@ test/rails/app-2.2.2/config/environments/development.rb
 test/rails/app-2.2.2/config/environments/production.rb
 test/rails/app-2.2.2/config/routes.rb
 test/rails/app-2.2.2/db/.gitignore
+test/rails/app-2.2.2/log/.gitignore
 test/rails/app-2.2.2/public/404.html
 test/rails/app-2.2.2/public/500.html
 test/rails/app-2.3.2.1/.gitignore
+test/rails/app-2.3.2.1/Rakefile
 test/rails/app-2.3.2.1/app/controllers/application_controller.rb
 test/rails/app-2.3.2.1/app/controllers/foo_controller.rb
 test/rails/app-2.3.2.1/app/helpers/application_helper.rb
@@ -90,6 +114,7 @@ test/rails/app-2.3.2.1/config/environments/development.rb
 test/rails/app-2.3.2.1/config/environments/production.rb
 test/rails/app-2.3.2.1/config/routes.rb
 test/rails/app-2.3.2.1/db/.gitignore
+test/rails/app-2.3.2.1/log/.gitignore
 test/rails/app-2.3.2.1/public/404.html
 test/rails/app-2.3.2.1/public/500.html
 test/rails/test_rails.rb

data/PHILOSOPHY

@@ -0,0 +1,139 @@
+= The Philosophy Behind Unicorn
+
+Being a server that only runs on Unix-like platforms, Unicorn is
+strongly tied to the Unix philosophy of doing one thing and (hopefully)
+doing it well.  Despite using HTTP, Unicorn is strictly a _backend_
+application server for running Rack-based Ruby applications.
+
+== Avoid Complexity
+
+Instead of attempting to be efficient at serving slow clients, Unicorn
+relies on a buffering reverse proxy to efficiently deal with slow
+clients.
+
+Unicorn uses an old-fashioned preforking worker model with blocking I/O.
+Our processing model is the antithesis of more modern (and theoretically
+more efficient) server processing models using threads or non-blocking
+I/O with events.
+
+=== Threads and Events Are Hard
+
+...to many developers.  Reasons for this is beyond the scope of this
+document.  Unicorn avoids concurrency within each worker process so you
+have fewer things to worry about when developing your application.  Of
+course Unicorn can use multiple worker processes to utilize multiple
+CPUs or spindles.  Applications can still use threads internally, however.
+
+== Slow Clients Are Problematic
+
+Most benchmarks we've seen don't tell you this, and Unicorn doesn't
+care about slow clients... but <i>you</i> should.
+
+A "slow client" can be any client outside of your datacenter.  Network
+traffic within a local network is always faster than traffic that
+crosses outside of it.  The laws of physics do not allow otherwise.
+
+Persistent connections were introduced in HTTP/1.1 reduce latency from
+connection establishment and TCP slow start.  They also waste server
+resources when clients are idle.
+
+Persistent connections mean one of the Unicorn worker processes
+(depending on your application, it can be very memory hungry) would
+spend a significant amount of its time idle keeping the connection alive
+<i>and not doing anything else</i>.  Being single-threaded and using
+blocking I/O, a worker cannot serve other clients while keeping a
+connection alive.  Thus Unicorn does not implement persistent
+connections.
+
+If your application responses are larger than the socket buffer or if
+you're handling large requests (uploads), worker processes will also be
+bottlenecked by the speed of the *client* connection.  You should
+not allow Unicorn to serve clients outside of your local network.
+
+== Application Concurrency != Network Concurrency
+
+Performance is asymmetric across the different subsystems of the machine
+and parts of the network.  CPUs and main memory can process gigabytes of
+data in a second; clients on the Internet are usually only capable of a
+tiny fraction of that.  Unicorn deployments should avoid dealing with
+slow clients directly and instead rely on a reverse proxy to shield it
+from the effects of slow I/O.
+
+== Improved Performance Through Reverse Proxying
+
+By acting as a buffer to shield Unicorn from slow I/O, a reverse proxy
+will inevitably incur overhead in the form of extra data copies.
+However, as I/O within a local network is fast (and faster still
+with local sockets), this overhead is neglible for the vast majority
+of HTTP requests and responses.
+
+The ideal reverse proxy complements the weaknesses of Unicorn.
+A reverse proxy for Unicorn should meet the following requirements:
+
+  1. It should fully buffer all HTTP requests (and large responses).
+     Each request should be "corked" in the reverse proxy and sent
+     as fast as possible to the backend Unicorn processes.  This is
+     the most important feature to look for when choosing a
+     reverse proxy for Unicorn.
+
+  2. It should spend minimal time in userspace.  Network (and disk) I/O
+     are system-level tasks and usually managed by the kernel.
+     This may change if userspace TCP stacks become more popular in the
+     future; but the reverse proxy should not waste time with
+     application-level logic.  These concerns should be separated
+
+  3. It should avoid context switches and CPU scheduling overhead.
+     In many (most?) cases, network devices and their interrupts are
+     only be handled by one CPU at a time.  It should avoid contention
+     within the system by serializing all network I/O into one (or few)
+     userspace procceses.  Network I/O is not a CPU-intensive task and
+     it is not helpful to use multiple CPU cores (at least not for GigE).
+
+  4. It should efficiently manage persistent connections (and
+     pipelining) to slow clients.  If you care to serve slow clients
+     outside your network, then these features of HTTP/1.1 will help.
+
+  5. It should (optionally) serve static files.  If you have static
+     files on your site (especially large ones), they are far more
+     efficiently served with as few data copies as possible (e.g. with
+     sendfile() to completely avoid copying the data to userspace).
+
+nginx is the only (Free) solution we know of that meets the above
+requirements.
+
+Indeed, the author of Unicorn has deployed nginx as a reverse-proxy not
+only for Ruby applications, but also for production applications running
+Apache/mod_perl, Apache/mod_php and Apache Tomcat.  In every single
+case, performance improved because application servers were able to use
+backend resources more efficiently and spend less time waiting on slow
+I/O.
+
+== Worse Is Better
+
+Requirements and scope for applications change frequently and
+drastically.  Thus languages like Ruby and frameworks like Rails were
+built to give developers fewer things to worry about in the face of
+rapid change.
+
+On the other hand, stable protocols which host your applications (HTTP
+and TCP) only change rarely.  This is why we recommend you NOT tie your
+rapidly-changing application logic directly into the processes that deal
+with the stable outside world.  Instead, use HTTP as a common RPC
+protocol to communicate between your frontend and backend.
+
+In short: separate your concerns.
+
+Of course a theoretical "perfect" solution would combine the pieces
+and _maybe_ give you better performance at the end of the day, but
+that is not the Unix way.
+
+== Just Worse in Some Cases
+
+Unicorn is not suited for all applications.  Unicorn is optimized for
+applications that are CPU/memory/disk intensive and spend little time
+waiting on external resources (e.g. a database server or external API).
+
+Unicorn is highly inefficient for Comet/reverse-HTTP/push applications
+where the HTTP connection spends a large amount of time idle.
+Nevertheless, the ease of troubleshooting, debugging, and management of
+Unicorn may still outweigh the drawbacks for these applications.

data/bin/unicorn

@@ -117,40 +117,35 @@ end
 
 require 'pp' if $DEBUG
 
-# require Rack as late as possible in case $LOAD_PATH is modified
-# in config.ru or command-line
-require 'rack'
-
-inner_app = case config
-when /\.ru$/
-  raw = File.open(config, "rb") { |fp| fp.sysread(fp.stat.size) }
-  lambda { || eval("Rack::Builder.new {(#{raw}\n)}.to_app", nil, config) }
-else
-  lambda do ||
+app = lambda do ||
+  # require Rack as late as possible in case $LOAD_PATH is modified
+  # in config.ru or command-line
+  require 'rack'
+  inner_app = case config
+  when /\.ru$/
+    raw = File.open(config, "rb") { |fp| fp.sysread(fp.stat.size) }
+    eval("Rack::Builder.new {(#{raw}\n)}.to_app", nil, config)
+  else
     require config
     Object.const_get(File.basename(config, '.rb').capitalize)
   end
-end
-
-app = case env
-when "development"
-  lambda do ||
+  pp({ :inner_app => inner_app }) if $DEBUG
+  case env
+  when "development"
     Rack::Builder.new do
       use Rack::CommonLogger, $stderr
       use Rack::ShowExceptions
       use Rack::Lint
-      run inner_app.call
+      run inner_app
     end.to_app
-  end
-when "deployment"
-  lambda do ||
+  when "deployment"
     Rack::Builder.new do
       use Rack::CommonLogger, $stderr
-      run inner_app.call
+      run inner_app
     end.to_app
+  else
+    inner_app
   end
-else
-  inner_app
 end
 
 listeners << "#{host}:#{port}" if set_listener
@@ -159,7 +154,6 @@ if $DEBUG
   pp({
     :unicorn_options => options,
     :app => app,
-    :inner_app => inner_app,
     :daemonize => daemonize,
   })
 end

data/bin/unicorn_rails

@@ -121,10 +121,6 @@ require 'pp' if $DEBUG
 rails_loader = lambda do ||
   begin
     require 'config/boot'
-    defined?(::RAILS_ROOT) or abort "RAILS_ROOT not defined by config/boot"
-    defined?(::RAILS_ENV) or abort "RAILS_ENV not defined by config/boot"
-    defined?(::Rails::VERSION::STRING) or
-      abort "Rails::VERSION::STRING not defined by config/boot"
   rescue LoadError => err
     abort "#$0 must be run inside RAILS_ROOT: #{err.inspect}"
   end
@@ -135,43 +131,36 @@ rails_loader = lambda do ||
 
   case config
   when nil
-    lambda do ||
-      require 'config/environment'
-
-      # it seems Rails >=2.2 support Rack, but only >=2.3 requires it
-      old_rails = case ::Rails::VERSION::MAJOR
-      when 0, 1 then true
-      when 2 then Rails::VERSION::MINOR < 3 ? true : false
-      else
-        false
-      end
+    require 'config/environment'
 
-      if old_rails
-        require 'rack'
-        require 'unicorn/app/old_rails'
-        Unicorn::App::OldRails.new
-      else
-        ActionController::Dispatcher.new
-      end
+    # it seems Rails >=2.2 support Rack, but only >=2.3 requires it
+    old_rails = case ::Rails::VERSION::MAJOR
+    when 0, 1 then true
+    when 2 then Rails::VERSION::MINOR < 3 ? true : false
+    else
+      false
+    end
+
+    if old_rails
+      require 'rack'
+      require 'unicorn/app/old_rails'
+      Unicorn::App::OldRails.new
+    else
+      ActionController::Dispatcher.new
     end
   when /\.ru$/
     raw = File.open(config, "rb") { |fp| fp.sysread(fp.stat.size) }
-    lambda { || eval("Rack::Builder.new {(#{raw}\n)}.to_app", nil, config) }
+    eval("Rack::Builder.new {(#{raw}\n)}.to_app", nil, config)
   else
-    lambda do ||
-      require config
-      Object.const_get(File.basename(config, '.rb').capitalize)
-    end
+    require config
+    Object.const_get(File.basename(config, '.rb').capitalize)
   end
 end
 
 # this won't run until after forking if preload_app is false
 app = lambda do ||
-  inner_app = rails_loader.call
-  require 'active_support'
-  require 'action_controller'
   map_path ||= '/'
-  inner_app = inner_app.call
+  inner_app = rails_loader.call
   Rack::Builder.new do
     if inner_app.class.to_s == "Unicorn::App::OldRails"
       if map_path != '/'

data/lib/unicorn.rb

@@ -1,4 +1,5 @@
 require 'logger'
+require 'fcntl'
 
 require 'unicorn/socket'
 require 'unicorn/const'
@@ -93,8 +94,8 @@ module Unicorn
       raise ArgumentError, "no listeners" if @listeners.empty?
       self.pid = @config[:pid]
       build_app! if @preload_app
-      $stderr.reopen(File.open(@stderr_path, "a")) if @stderr_path
-      $stdout.reopen(File.open(@stdout_path, "a")) if @stdout_path
+      File.open(@stderr_path, "a") { |fp| $stderr.reopen(fp) } if @stderr_path
+      File.open(@stdout_path, "a") { |fp| $stdout.reopen(fp) } if @stdout_path
       $stderr.sync = $stdout.sync = true
       spawn_missing_workers
       self
@@ -166,7 +167,7 @@ module Unicorn
 
       QUEUE_SIGS.each { |sig| trap_deferred(sig) }
       trap(:CHLD) { |sig_nr| awaken_master }
-      $0 = "unicorn master"
+      proc_name 'master'
       logger.info "master process ready" # test_exec.rb relies on this message
       begin
         loop do
@@ -285,7 +286,7 @@ module Unicorn
             logger.error "reaped #{status.inspect} exec()-ed"
             @reexec_pid = 0
             self.pid = @pid.chomp('.oldbin') if @pid
-            $0 = "unicorn master"
+            proc_name 'master'
           else
             worker = @workers.delete(pid)
             worker.tempfile.close rescue nil
@@ -325,20 +326,29 @@ module Unicorn
       end
 
       @reexec_pid = fork do
-        @rd_sig.close if @rd_sig
-        @wr_sig.close if @wr_sig
-        @workers.values.each { |other| other.tempfile.close rescue nil }
-
         ENV.replace(@start_ctx[:environ])
-        ENV['UNICORN_FD'] = @listeners.map { |sock| sock.fileno }.join(',')
+        listener_fds = @listeners.map { |sock| sock.fileno }
+        ENV['UNICORN_FD'] = listener_fds.join(',')
         File.umask(@start_ctx[:umask])
         Dir.chdir(@start_ctx[:cwd])
         cmd = [ @start_ctx[:zero] ] + @start_ctx[:argv]
+
+        # avoid leaking FDs we don't know about, but let before_exec
+        # unset FD_CLOEXEC, if anything else in the app eventually
+        # relies on FD inheritence.
+        purgatory = [] # prevent GC of IO objects
+        (3..1024).each do |io|
+          next if listener_fds.include?(io)
+          io = IO.for_fd(io) rescue nil
+          io or next
+          purgatory << io
+          io.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+        end
         logger.info "executing #{cmd.inspect} (in #{Dir.pwd})"
         @before_exec.call(self) if @before_exec
         exec(*cmd)
       end
-      $0 = "unicorn master (old)"
+      proc_name 'master (old)'
     end
 
     # forcibly terminate all workers that haven't checked in in @timeout
@@ -418,16 +428,17 @@ module Unicorn
       QUEUE_SIGS.each { |sig| trap(sig, 'IGNORE') }
       trap(:CHLD, 'DEFAULT')
 
-      $0 = "unicorn worker[#{worker.nr}]"
+      proc_name "worker[#{worker.nr}]"
       @rd_sig.close if @rd_sig
       @wr_sig.close if @wr_sig
       @workers.values.each { |other| other.tempfile.close rescue nil }
       @workers.clear
       @start_ctx.clear
       @start_ctx = @workers = @rd_sig = @wr_sig = nil
-      @listeners.each { |sock| set_cloexec(sock) }
+      @listeners.each { |sock| sock.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) }
       ENV.delete('UNICORN_FD')
       @after_fork.call(self, worker.nr) if @after_fork
+      worker.tempfile.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
       @request = HttpRequest.new(logger)
     end
 
@@ -447,6 +458,8 @@ module Unicorn
         @listeners.each { |sock| sock.close rescue nil } # break IO.select
       end
       reopen_logs, (rd, wr) = false, IO.pipe
+      rd.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+      wr.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
       trap(:USR1) { reopen_logs = true; rd.close rescue nil } # break IO.select
       @logger.info "worker=#{worker.nr} ready"
 
@@ -458,6 +471,8 @@ module Unicorn
           @logger.info "worker=#{worker.nr} done rotating logs"
           wr.close rescue nil
           rd, wr = IO.pipe
+          rd.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+          wr.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
         end
         # we're a goner in @timeout seconds anyways if tempfile.chmod
         # breaks, so don't trap the exception.  Using fchmod() since
@@ -573,5 +588,10 @@ module Unicorn
       @app = @app.call if @app.respond_to?(:arity) && @app.arity == 0
     end
 
+    def proc_name(tag)
+      $0 = ([ File.basename(@start_ctx[:zero]), tag ] +
+              @start_ctx[:argv]).join(' ')
+    end
+
   end
 end

data/lib/unicorn/const.rb

@@ -58,7 +58,7 @@ module Unicorn
     REQUEST_URI='REQUEST_URI'.freeze
     REQUEST_PATH='REQUEST_PATH'.freeze
     
-    UNICORN_VERSION="0.4.1".freeze
+    UNICORN_VERSION="0.4.2".freeze
 
     UNICORN_TMP_BASE="unicorn".freeze
 

data/lib/unicorn/socket.rb

@@ -1,4 +1,3 @@
-require 'fcntl'
 require 'socket'
 require 'io/nonblock'
 
@@ -48,10 +47,6 @@ module Unicorn
       sock.setsockopt(SOL_TCP, TCP_CORK, 1) if defined?(TCP_CORK)
     end
 
-    def set_cloexec(io)
-      io.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) if defined?(Fcntl::FD_CLOEXEC)
-    end
-
     def set_server_sockopt(sock)
       if defined?(TCP_DEFER_ACCEPT)
         sock.setsockopt(SOL_TCP, TCP_DEFER_ACCEPT, 1) rescue nil

data/local.mk.sample

@@ -0,0 +1,43 @@
+# this is the local.mk file used by Eric Wong on his dev boxes.
+# GNUmakefile will source local.mk in the top-level source tree
+# if it is present.
+#
+# This is depends on a bunch of GNU-isms from bash, sed, touch.
+
+DLEXT := so
+rack_ver := 0.9.1
+
+# Avoid loading rubygems to speed up tests because gmake is
+# fork+exec heavy with Ruby.
+ifeq ($(r19),)
+  ruby := $(HOME)/bin/ruby
+  RUBYLIB := $(HOME)/lib/ruby/gems/1.8/gems/rack-$(rack_ver)/lib
+else
+  export PATH := $(HOME)/ruby-1.9/bin:$(PATH)
+  ruby := $(HOME)/ruby-1.9/bin/ruby --disable-gems
+  RUBYLIB := $(HOME)/ruby-1.9/lib/ruby/gems/1.9.1/gems/rack-$(rack_ver)/lib
+endif
+
+# pipefail is THE reason to use bash (v3+)
+SHELL := /bin/bash -e -o pipefail
+
+full-test: test-18 test-19
+test-18:
+	$(MAKE) test 2>&1 | sed -u -e 's!^!1.8 !'
+test-19:
+	$(MAKE) test r19=1 2>&1 | sed -u -e 's!^!1.9 !'
+
+# publishes docs to http://unicorn.bogomips.org
+publish_doc:
+	-git set-file-times
+	$(MAKE) doc
+	$(MAKE) doc_gz
+	rsync -av --delete doc/ dcvr:/srv/unicorn/
+
+# Create gzip variants of the same timestamp as the original so nginx
+# "gzip_static on" can serve the gzipped versions directly.
+doc_gz: suf := html js css
+doc_gz: globs := $(addprefix doc/*.,$(suf)) $(addprefix doc/*/*.,$(suf))
+doc_gz: docs := $(wildcard $(globs))
+doc_gz:
+	for i in $(docs); do gzip < $$i > $$i.gz; touch -r $$i $$i.gz; done

data/test/exec/test_exec.rb

@@ -245,6 +245,38 @@ end
     assert_shutdown(pid)
   end
 
+  def test_unicorn_config_per_worker_listen
+    port2 = unused_port
+    pid_spit = 'use Rack::ContentLength;' \
+      'run proc { |e| [ 200, {"Content-Type"=>"text/plain"}, ["#$$\\n"] ] }'
+    File.open("config.ru", "wb") { |fp| fp.syswrite(pid_spit) }
+    tmp = Tempfile.new('test.socket')
+    File.unlink(tmp.path)
+    ucfg = Tempfile.new('unicorn_test_config')
+    ucfg.syswrite("listen '#@addr:#@port'\n")
+    ucfg.syswrite("before_fork { |s,nr|\n")
+    ucfg.syswrite("  s.listen('#{tmp.path}', :backlog => 5, :sndbuf => 8192)\n")
+    ucfg.syswrite("  s.listen('#@addr:#{port2}', :rcvbuf => 8192)\n")
+    ucfg.syswrite("\n}\n")
+    pid = xfork do
+      redirect_test_io { exec($unicorn_bin, "-c#{ucfg.path}") }
+    end
+    results = retry_hit(["http://#{@addr}:#{@port}/"])
+    assert_equal String, results[0].class
+    worker_pid = results[0].to_i
+    assert_not_equal pid, worker_pid
+    s = UNIXSocket.new(tmp.path)
+    s.syswrite("GET / HTTP/1.0\r\n\r\n")
+    results = ''
+    loop { results << s.sysread(4096) } rescue nil
+    assert_nothing_raised { s.close }
+    assert_equal worker_pid, results.split(/\r\n/).last.to_i
+    results = hit(["http://#@addr:#{port2}/"])
+    assert_equal String, results[0].class
+    assert_equal worker_pid, results[0].to_i
+    assert_shutdown(pid)
+  end
+
   def test_unicorn_config_listen_augments_cli
     port2 = unused_port(@addr)
     File.open("config.ru", "wb") { |fp| fp.syswrite(HI) }
@@ -467,4 +499,67 @@ end
     reexec_usr2_quit_test(new_pid, pid_file)
   end
 
+  def test_reexec_fd_leak
+    unless RUBY_PLATFORM =~ /linux/ # Solaris may work, too, but I forget...
+      warn "FD leak test only works on Linux at the moment"
+      return
+    end
+    pid_file = "#{@tmpdir}/test.pid"
+    log = Tempfile.new('unicorn_test_log')
+    log.sync = true
+    ucfg = Tempfile.new('unicorn_test_config')
+    ucfg.syswrite("pid \"#{pid_file}\"\n")
+    ucfg.syswrite("logger Logger.new('#{log.path}')\n")
+    ucfg.syswrite("stderr_path '#{log.path}'\n")
+    ucfg.syswrite("stdout_path '#{log.path}'\n")
+    ucfg.close
+
+    File.open("config.ru", "wb") { |fp| fp.syswrite(HI) }
+    pid = xfork do
+      redirect_test_io do
+        exec($unicorn_bin, "-D", "-l#{@addr}:#{@port}", "-c#{ucfg.path}")
+      end
+    end
+
+    wait_master_ready(log.path)
+    wait_for_file(pid_file)
+    orig_pid = pid = File.read(pid_file).to_i
+    orig_fds = `ls -l /proc/#{pid}/fd`.split(/\n/)
+    assert $?.success?
+    expect_size = orig_fds.size
+
+    assert_nothing_raised do
+      Process.kill(:USR2, pid)
+      wait_for_file("#{pid_file}.oldbin")
+      Process.kill(:QUIT, pid)
+    end
+    wait_for_death(pid)
+
+    wait_for_file(pid_file)
+    pid = File.read(pid_file).to_i
+    assert_not_equal orig_pid, pid
+    curr_fds = `ls -l /proc/#{pid}/fd`.split(/\n/)
+    assert $?.success?
+
+    # we could've inherited descriptors the first time around
+    assert expect_size >= curr_fds.size
+    expect_size = curr_fds.size
+
+    assert_nothing_raised do
+      Process.kill(:USR2, pid)
+      wait_for_file("#{pid_file}.oldbin")
+      Process.kill(:QUIT, pid)
+    end
+    wait_for_death(pid)
+
+    wait_for_file(pid_file)
+    pid = File.read(pid_file).to_i
+    curr_fds = `ls -l /proc/#{pid}/fd`.split(/\n/)
+    assert $?.success?
+    assert_equal expect_size, curr_fds.size
+
+    Process.kill(:QUIT, pid)
+    wait_for_death(pid)
+  end
+
 end if do_test

data/test/rails/app-1.2.3/Rakefile

@@ -0,0 +1,7 @@
+require(File.join(File.dirname(__FILE__), 'config', 'boot'))
+
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+require 'tasks/rails'

data/test/rails/app-1.2.3/config/environment.rb

@@ -7,4 +7,5 @@ require File.join(File.dirname(__FILE__), 'boot')
 
 Rails::Initializer.run do |config|
   config.frameworks -= [ :action_web_service, :action_mailer ]
+  config.action_controller.session_store = :active_record_store
 end

data/test/rails/app-2.0.2/Rakefile

@@ -0,0 +1,7 @@
+require(File.join(File.dirname(__FILE__), 'config', 'boot'))
+
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+require 'tasks/rails'

data/test/rails/app-2.0.2/config/environment.rb

@@ -7,6 +7,7 @@ require File.join(File.dirname(__FILE__), 'boot')
 
 Rails::Initializer.run do |config|
   config.frameworks -= [ :action_web_service, :action_mailer ]
+  config.action_controller.session_store = :active_record_store
   config.action_controller.session = {
     :session_key => "_unicorn_rails_test.#{rand}",
     :secret => "#{rand}#{rand}#{rand}#{rand}",

data/test/rails/app-2.1.2/.gitignore

@@ -0,0 +1,2 @@
+/tmp
+/vendor

data/test/rails/app-2.1.2/Rakefile

@@ -0,0 +1,7 @@
+require(File.join(File.dirname(__FILE__), 'config', 'boot'))
+
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+require 'tasks/rails'

data/test/rails/app-2.1.2/app/controllers/application.rb

@@ -0,0 +1,2 @@
+class ApplicationController < ActionController::Base
+end

data/test/rails/app-2.1.2/app/controllers/foo_controller.rb

@@ -0,0 +1,34 @@
+require 'digest/sha1'
+class FooController < ApplicationController
+  def index
+    render :text => "FOO\n"
+  end
+
+  def xcookie
+    cookies["foo"] = "cookie #$$"
+    render :text => ""
+  end
+
+  def xnotice
+    flash[:notice] = "session #$$"
+    render :text => ""
+  end
+
+  def xpost
+    if request.post?
+      digest = Digest::SHA1.new
+      out = "params: #{params.inspect}\n"
+      if file = params[:file]
+        loop do
+          buf = file.read(4096) or break
+          digest.update(buf)
+        end
+        out << "sha1: #{digest.to_s}\n"
+      end
+      headers['content-type'] = 'text/plain'
+      render :text => out
+    else
+      render :status => 403, :text => "need post\n"
+    end
+  end
+end

data/test/rails/app-2.1.2/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/test/rails/app-2.1.2/config/boot.rb

@@ -0,0 +1,109 @@
+# Don't change this file!
+# Configure your app in config/environment.rb and config/environments/*.rb
+
+RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
+
+module Rails
+  class << self
+    def boot!
+      unless booted?
+        preinitialize
+        pick_boot.run
+      end
+    end
+
+    def booted?
+      defined? Rails::Initializer
+    end
+
+    def pick_boot
+      (vendor_rails? ? VendorBoot : GemBoot).new
+    end
+
+    def vendor_rails?
+      File.exist?("#{RAILS_ROOT}/vendor/rails")
+    end
+
+    def preinitialize
+      load(preinitializer_path) if File.exist?(preinitializer_path)
+    end
+
+    def preinitializer_path
+      "#{RAILS_ROOT}/config/preinitializer.rb"
+    end
+  end
+
+  class Boot
+    def run
+      load_initializer
+      Rails::Initializer.run(:set_load_path)
+    end
+  end
+
+  class VendorBoot < Boot
+    def load_initializer
+      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+      Rails::Initializer.run(:install_gem_spec_stubs)
+    end
+  end
+
+  class GemBoot < Boot
+    def load_initializer
+      self.class.load_rubygems
+      load_rails_gem
+      require 'initializer'
+    end
+
+    def load_rails_gem
+      if version = self.class.gem_version
+        gem 'rails', version
+      else
+        gem 'rails'
+      end
+    rescue Gem::LoadError => load_error
+      $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
+      exit 1
+    end
+
+    class << self
+      def rubygems_version
+        Gem::RubyGemsVersion rescue nil
+      end
+
+      def gem_version
+        if defined? RAILS_GEM_VERSION
+          RAILS_GEM_VERSION
+        elsif ENV.include?('RAILS_GEM_VERSION')
+          ENV['RAILS_GEM_VERSION']
+        else
+          parse_gem_version(read_environment_rb)
+        end
+      end
+
+      def load_rubygems
+        require 'rubygems'
+        min_version = '1.3.1'
+        unless rubygems_version >= min_version
+          $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
+          exit 1
+        end
+
+      rescue LoadError
+        $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
+        exit 1
+      end
+
+      def parse_gem_version(text)
+        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
+      end
+
+      private
+        def read_environment_rb
+          File.read("#{RAILS_ROOT}/config/environment.rb")
+        end
+    end
+  end
+end
+
+# All that for this:
+Rails.boot!

data/test/rails/app-2.1.2/config/database.yml

@@ -0,0 +1,12 @@
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  timeout: 5000
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  timeout: 5000
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  timeout: 5000

data/test/rails/app-2.1.2/config/environment.rb

@@ -0,0 +1,15 @@
+unless defined? RAILS_GEM_VERSION
+  RAILS_GEM_VERSION = ENV['UNICORN_RAILS_VERSION']
+end
+
+# Bootstrap the Rails environment, frameworks, and default configuration
+require File.join(File.dirname(__FILE__), 'boot')
+
+Rails::Initializer.run do |config|
+  config.frameworks -= [ :action_web_service, :action_mailer ]
+  config.action_controller.session_store = :active_record_store
+  config.action_controller.session = {
+    :session_key => "_unicorn_rails_test.#{rand}",
+    :secret => "#{rand}#{rand}#{rand}#{rand}",
+  }
+end

data/test/rails/app-2.1.2/config/environments/development.rb

@@ -0,0 +1,5 @@
+config.cache_classes = false
+config.whiny_nils = true
+config.action_controller.consider_all_requests_local = true
+config.action_controller.perform_caching = false
+config.action_view.debug_rjs = true

data/test/rails/app-2.1.2/config/environments/production.rb

@@ -0,0 +1,3 @@
+config.cache_classes = true
+config.action_controller.consider_all_requests_local = false
+config.action_controller.perform_caching             = true

data/test/rails/app-2.1.2/config/routes.rb

@@ -0,0 +1,4 @@
+ActionController::Routing::Routes.draw do |map|
+  map.connect ':controller/:action/:id.:format'
+  map.connect ':controller/:action/:id'
+end

data/test/rails/app-2.1.2/public/404.html

@@ -0,0 +1 @@
+404 Not Found

data/test/rails/app-2.1.2/public/500.html

@@ -0,0 +1 @@
+500 Internal Server Error

data/test/rails/app-2.2.2/Rakefile

@@ -0,0 +1,7 @@
+require(File.join(File.dirname(__FILE__), 'config', 'boot'))
+
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+require 'tasks/rails'

data/test/rails/app-2.2.2/config/environment.rb

@@ -7,6 +7,7 @@ require File.join(File.dirname(__FILE__), 'boot')
 
 Rails::Initializer.run do |config|
   config.frameworks -= [ :action_web_service, :action_mailer ]
+  config.action_controller.session_store = :active_record_store
   config.action_controller.session = {
     :session_key => "_unicorn_rails_test.#{rand}",
     :secret => "#{rand}#{rand}#{rand}#{rand}",

data/test/rails/app-2.3.2.1/Rakefile

@@ -0,0 +1,7 @@
+require(File.join(File.dirname(__FILE__), 'config', 'boot'))
+
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+require 'tasks/rails'

data/test/rails/app-2.3.2.1/config/environment.rb

@@ -6,7 +6,8 @@ end
 require File.join(File.dirname(__FILE__), 'boot')
 
 Rails::Initializer.run do |config|
-  config.frameworks -= [ :active_record, :active_resource, :action_mailer ]
+  config.frameworks -= [ :active_resource, :action_mailer ]
+  config.action_controller.session_store = :active_record_store
   config.action_controller.session = {
     :session_key => "_unicorn_rails_test.#{rand}",
     :secret => "#{rand}#{rand}#{rand}#{rand}",

data/test/rails/test_rails.rb

@@ -74,6 +74,10 @@ logger Logger.new('#{COMMON_TMP.path}')
     Dir.chdir("#@tmpdir/vendor/rails") do
       system('git', 'reset', '-q', '--hard', "v#{UNICORN_RAILS_TEST_VERSION}")
     end
+
+    assert(system('rake', 'db:sessions:create'))
+    assert(system('rake', 'db:migrate'))
+
     @addr = ENV['UNICORN_TEST_ADDR'] || '127.0.0.1'
     @port = unused_port(@addr)
     @start_pid = $$

data/test/unit/test_upload.rb

@@ -74,6 +74,12 @@ class UploadTest < Test::Unit::TestCase
     sock.close
     assert path != path2
 
+    # make sure the next request comes in so the unlink got processed
+    sock = TCPSocket.new(@addr, @port)
+    sock.syswrite("GET ?lasdf\r\n\r\n\r\n\r\n")
+    sock.sysread(4096) rescue nil
+    sock.close
+
     assert ! File.exist?(path)
   end
 

data/unicorn.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{unicorn}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Wong"]
-  s.date = %q{2009-04-01}
+  s.date = %q{2009-04-02}
   s.description = %q{A small fast HTTP library and server for Rack applications.}
   s.email = %q{normalperson@yhbt.net}
   s.executables = ["unicorn", "unicorn_rails"]
   s.extensions = ["ext/unicorn/http11/extconf.rb"]
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "TODO", "bin/unicorn", "bin/unicorn_rails", "ext/unicorn/http11/ext_help.h", "ext/unicorn/http11/extconf.rb", "ext/unicorn/http11/http11.c", "ext/unicorn/http11/http11_parser.c", "ext/unicorn/http11/http11_parser.h", "ext/unicorn/http11/http11_parser.rl", "ext/unicorn/http11/http11_parser_common.rl", "lib/unicorn.rb", "lib/unicorn/app/exec_cgi.rb", "lib/unicorn/app/old_rails.rb", "lib/unicorn/app/old_rails/static.rb", "lib/unicorn/cgi_wrapper.rb", "lib/unicorn/configurator.rb", "lib/unicorn/const.rb", "lib/unicorn/http_request.rb", "lib/unicorn/http_response.rb", "lib/unicorn/launcher.rb", "lib/unicorn/socket.rb", "lib/unicorn/util.rb"]
-  s.files = [".document", ".gitignore", "CHANGELOG", "CONTRIBUTORS", "DESIGN", "GNUmakefile", "LICENSE", "Manifest", "README", "Rakefile", "SIGNALS", "TODO", "bin/unicorn", "bin/unicorn_rails", "ext/unicorn/http11/ext_help.h", "ext/unicorn/http11/extconf.rb", "ext/unicorn/http11/http11.c", "ext/unicorn/http11/http11_parser.c", "ext/unicorn/http11/http11_parser.h", "ext/unicorn/http11/http11_parser.rl", "ext/unicorn/http11/http11_parser_common.rl", "lib/unicorn.rb", "lib/unicorn/app/exec_cgi.rb", "lib/unicorn/app/old_rails.rb", "lib/unicorn/app/old_rails/static.rb", "lib/unicorn/cgi_wrapper.rb", "lib/unicorn/configurator.rb", "lib/unicorn/const.rb", "lib/unicorn/http_request.rb", "lib/unicorn/http_response.rb", "lib/unicorn/launcher.rb", "lib/unicorn/socket.rb", "lib/unicorn/util.rb", "setup.rb", "test/aggregate.rb", "test/benchmark/README", "test/benchmark/big_request.rb", "test/benchmark/dd.ru", "test/benchmark/request.rb", "test/benchmark/response.rb", "test/exec/README", "test/exec/test_exec.rb", "test/rails/app-1.2.3/.gitignore", "test/rails/app-1.2.3/app/controllers/application.rb", "test/rails/app-1.2.3/app/controllers/foo_controller.rb", "test/rails/app-1.2.3/app/helpers/application_helper.rb", "test/rails/app-1.2.3/config/boot.rb", "test/rails/app-1.2.3/config/database.yml", "test/rails/app-1.2.3/config/environment.rb", "test/rails/app-1.2.3/config/environments/development.rb", "test/rails/app-1.2.3/config/environments/production.rb", "test/rails/app-1.2.3/config/routes.rb", "test/rails/app-1.2.3/db/.gitignore", "test/rails/app-1.2.3/public/404.html", "test/rails/app-1.2.3/public/500.html", "test/rails/app-2.0.2/.gitignore", "test/rails/app-2.0.2/app/controllers/application.rb", "test/rails/app-2.0.2/app/controllers/foo_controller.rb", "test/rails/app-2.0.2/app/helpers/application_helper.rb", "test/rails/app-2.0.2/config/boot.rb", "test/rails/app-2.0.2/config/database.yml", "test/rails/app-2.0.2/config/environment.rb", "test/rails/app-2.0.2/config/environments/development.rb", "test/rails/app-2.0.2/config/environments/production.rb", "test/rails/app-2.0.2/config/routes.rb", "test/rails/app-2.0.2/db/.gitignore", "test/rails/app-2.0.2/public/404.html", "test/rails/app-2.0.2/public/500.html", "test/rails/app-2.2.2/.gitignore", "test/rails/app-2.2.2/app/controllers/application.rb", "test/rails/app-2.2.2/app/controllers/foo_controller.rb", "test/rails/app-2.2.2/app/helpers/application_helper.rb", "test/rails/app-2.2.2/config/boot.rb", "test/rails/app-2.2.2/config/database.yml", "test/rails/app-2.2.2/config/environment.rb", "test/rails/app-2.2.2/config/environments/development.rb", "test/rails/app-2.2.2/config/environments/production.rb", "test/rails/app-2.2.2/config/routes.rb", "test/rails/app-2.2.2/db/.gitignore", "test/rails/app-2.2.2/public/404.html", "test/rails/app-2.2.2/public/500.html", "test/rails/app-2.3.2.1/.gitignore", "test/rails/app-2.3.2.1/app/controllers/application_controller.rb", "test/rails/app-2.3.2.1/app/controllers/foo_controller.rb", "test/rails/app-2.3.2.1/app/helpers/application_helper.rb", "test/rails/app-2.3.2.1/config/boot.rb", "test/rails/app-2.3.2.1/config/database.yml", "test/rails/app-2.3.2.1/config/environment.rb", "test/rails/app-2.3.2.1/config/environments/development.rb", "test/rails/app-2.3.2.1/config/environments/production.rb", "test/rails/app-2.3.2.1/config/routes.rb", "test/rails/app-2.3.2.1/db/.gitignore", "test/rails/app-2.3.2.1/public/404.html", "test/rails/app-2.3.2.1/public/500.html", "test/rails/test_rails.rb", "test/test_helper.rb", "test/tools/trickletest.rb", "test/unit/test_configurator.rb", "test/unit/test_http_parser.rb", "test/unit/test_request.rb", "test/unit/test_response.rb", "test/unit/test_server.rb", "test/unit/test_socket_helper.rb", "test/unit/test_upload.rb", "unicorn.gemspec"]
+  s.files = [".document", ".gitignore", "CHANGELOG", "CONTRIBUTORS", "DESIGN", "GNUmakefile", "LICENSE", "Manifest", "PHILOSOPHY", "README", "Rakefile", "SIGNALS", "TODO", "bin/unicorn", "bin/unicorn_rails", "ext/unicorn/http11/ext_help.h", "ext/unicorn/http11/extconf.rb", "ext/unicorn/http11/http11.c", "ext/unicorn/http11/http11_parser.c", "ext/unicorn/http11/http11_parser.h", "ext/unicorn/http11/http11_parser.rl", "ext/unicorn/http11/http11_parser_common.rl", "lib/unicorn.rb", "lib/unicorn/app/exec_cgi.rb", "lib/unicorn/app/old_rails.rb", "lib/unicorn/app/old_rails/static.rb", "lib/unicorn/cgi_wrapper.rb", "lib/unicorn/configurator.rb", "lib/unicorn/const.rb", "lib/unicorn/http_request.rb", "lib/unicorn/http_response.rb", "lib/unicorn/launcher.rb", "lib/unicorn/socket.rb", "lib/unicorn/util.rb", "local.mk.sample", "setup.rb", "test/aggregate.rb", "test/benchmark/README", "test/benchmark/big_request.rb", "test/benchmark/dd.ru", "test/benchmark/request.rb", "test/benchmark/response.rb", "test/exec/README", "test/exec/test_exec.rb", "test/rails/app-1.2.3/.gitignore", "test/rails/app-1.2.3/Rakefile", "test/rails/app-1.2.3/app/controllers/application.rb", "test/rails/app-1.2.3/app/controllers/foo_controller.rb", "test/rails/app-1.2.3/app/helpers/application_helper.rb", "test/rails/app-1.2.3/config/boot.rb", "test/rails/app-1.2.3/config/database.yml", "test/rails/app-1.2.3/config/environment.rb", "test/rails/app-1.2.3/config/environments/development.rb", "test/rails/app-1.2.3/config/environments/production.rb", "test/rails/app-1.2.3/config/routes.rb", "test/rails/app-1.2.3/db/.gitignore", "test/rails/app-1.2.3/log/.gitignore", "test/rails/app-1.2.3/public/404.html", "test/rails/app-1.2.3/public/500.html", "test/rails/app-2.0.2/.gitignore", "test/rails/app-2.0.2/Rakefile", "test/rails/app-2.0.2/app/controllers/application.rb", "test/rails/app-2.0.2/app/controllers/foo_controller.rb", "test/rails/app-2.0.2/app/helpers/application_helper.rb", "test/rails/app-2.0.2/config/boot.rb", "test/rails/app-2.0.2/config/database.yml", "test/rails/app-2.0.2/config/environment.rb", "test/rails/app-2.0.2/config/environments/development.rb", "test/rails/app-2.0.2/config/environments/production.rb", "test/rails/app-2.0.2/config/routes.rb", "test/rails/app-2.0.2/db/.gitignore", "test/rails/app-2.0.2/log/.gitignore", "test/rails/app-2.0.2/public/404.html", "test/rails/app-2.0.2/public/500.html", "test/rails/app-2.1.2/.gitignore", "test/rails/app-2.1.2/Rakefile", "test/rails/app-2.1.2/app/controllers/application.rb", "test/rails/app-2.1.2/app/controllers/foo_controller.rb", "test/rails/app-2.1.2/app/helpers/application_helper.rb", "test/rails/app-2.1.2/config/boot.rb", "test/rails/app-2.1.2/config/database.yml", "test/rails/app-2.1.2/config/environment.rb", "test/rails/app-2.1.2/config/environments/development.rb", "test/rails/app-2.1.2/config/environments/production.rb", "test/rails/app-2.1.2/config/routes.rb", "test/rails/app-2.1.2/db/.gitignore", "test/rails/app-2.1.2/log/.gitignore", "test/rails/app-2.1.2/public/404.html", "test/rails/app-2.1.2/public/500.html", "test/rails/app-2.2.2/.gitignore", "test/rails/app-2.2.2/Rakefile", "test/rails/app-2.2.2/app/controllers/application.rb", "test/rails/app-2.2.2/app/controllers/foo_controller.rb", "test/rails/app-2.2.2/app/helpers/application_helper.rb", "test/rails/app-2.2.2/config/boot.rb", "test/rails/app-2.2.2/config/database.yml", "test/rails/app-2.2.2/config/environment.rb", "test/rails/app-2.2.2/config/environments/development.rb", "test/rails/app-2.2.2/config/environments/production.rb", "test/rails/app-2.2.2/config/routes.rb", "test/rails/app-2.2.2/db/.gitignore", "test/rails/app-2.2.2/log/.gitignore", "test/rails/app-2.2.2/public/404.html", "test/rails/app-2.2.2/public/500.html", "test/rails/app-2.3.2.1/.gitignore", "test/rails/app-2.3.2.1/Rakefile", "test/rails/app-2.3.2.1/app/controllers/application_controller.rb", "test/rails/app-2.3.2.1/app/controllers/foo_controller.rb", "test/rails/app-2.3.2.1/app/helpers/application_helper.rb", "test/rails/app-2.3.2.1/config/boot.rb", "test/rails/app-2.3.2.1/config/database.yml", "test/rails/app-2.3.2.1/config/environment.rb", "test/rails/app-2.3.2.1/config/environments/development.rb", "test/rails/app-2.3.2.1/config/environments/production.rb", "test/rails/app-2.3.2.1/config/routes.rb", "test/rails/app-2.3.2.1/db/.gitignore", "test/rails/app-2.3.2.1/log/.gitignore", "test/rails/app-2.3.2.1/public/404.html", "test/rails/app-2.3.2.1/public/500.html", "test/rails/test_rails.rb", "test/test_helper.rb", "test/tools/trickletest.rb", "test/unit/test_configurator.rb", "test/unit/test_http_parser.rb", "test/unit/test_request.rb", "test/unit/test_response.rb", "test/unit/test_server.rb", "test/unit/test_socket_helper.rb", "test/unit/test_upload.rb", "unicorn.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://unicorn.bogomips.org}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Unicorn", "--main", "README"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: unicorn
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Eric Wong
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-01 00:00:00 -07:00
+date: 2009-04-02 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -55,6 +55,7 @@ files:
 - GNUmakefile
 - LICENSE
 - Manifest
+- PHILOSOPHY
 - README
 - Rakefile
 - SIGNALS
@@ -80,6 +81,7 @@ files:
 - lib/unicorn/launcher.rb
 - lib/unicorn/socket.rb
 - lib/unicorn/util.rb
+- local.mk.sample
 - setup.rb
 - test/aggregate.rb
 - test/benchmark/README
@@ -90,6 +92,7 @@ files:
 - test/exec/README
 - test/exec/test_exec.rb
 - test/rails/app-1.2.3/.gitignore
+- test/rails/app-1.2.3/Rakefile
 - test/rails/app-1.2.3/app/controllers/application.rb
 - test/rails/app-1.2.3/app/controllers/foo_controller.rb
 - test/rails/app-1.2.3/app/helpers/application_helper.rb
@@ -100,9 +103,11 @@ files:
 - test/rails/app-1.2.3/config/environments/production.rb
 - test/rails/app-1.2.3/config/routes.rb
 - test/rails/app-1.2.3/db/.gitignore
+- test/rails/app-1.2.3/log/.gitignore
 - test/rails/app-1.2.3/public/404.html
 - test/rails/app-1.2.3/public/500.html
 - test/rails/app-2.0.2/.gitignore
+- test/rails/app-2.0.2/Rakefile
 - test/rails/app-2.0.2/app/controllers/application.rb
 - test/rails/app-2.0.2/app/controllers/foo_controller.rb
 - test/rails/app-2.0.2/app/helpers/application_helper.rb
@@ -113,9 +118,26 @@ files:
 - test/rails/app-2.0.2/config/environments/production.rb
 - test/rails/app-2.0.2/config/routes.rb
 - test/rails/app-2.0.2/db/.gitignore
+- test/rails/app-2.0.2/log/.gitignore
 - test/rails/app-2.0.2/public/404.html
 - test/rails/app-2.0.2/public/500.html
+- test/rails/app-2.1.2/.gitignore
+- test/rails/app-2.1.2/Rakefile
+- test/rails/app-2.1.2/app/controllers/application.rb
+- test/rails/app-2.1.2/app/controllers/foo_controller.rb
+- test/rails/app-2.1.2/app/helpers/application_helper.rb
+- test/rails/app-2.1.2/config/boot.rb
+- test/rails/app-2.1.2/config/database.yml
+- test/rails/app-2.1.2/config/environment.rb
+- test/rails/app-2.1.2/config/environments/development.rb
+- test/rails/app-2.1.2/config/environments/production.rb
+- test/rails/app-2.1.2/config/routes.rb
+- test/rails/app-2.1.2/db/.gitignore
+- test/rails/app-2.1.2/log/.gitignore
+- test/rails/app-2.1.2/public/404.html
+- test/rails/app-2.1.2/public/500.html
 - test/rails/app-2.2.2/.gitignore
+- test/rails/app-2.2.2/Rakefile
 - test/rails/app-2.2.2/app/controllers/application.rb
 - test/rails/app-2.2.2/app/controllers/foo_controller.rb
 - test/rails/app-2.2.2/app/helpers/application_helper.rb
@@ -126,9 +148,11 @@ files:
 - test/rails/app-2.2.2/config/environments/production.rb
 - test/rails/app-2.2.2/config/routes.rb
 - test/rails/app-2.2.2/db/.gitignore
+- test/rails/app-2.2.2/log/.gitignore
 - test/rails/app-2.2.2/public/404.html
 - test/rails/app-2.2.2/public/500.html
 - test/rails/app-2.3.2.1/.gitignore
+- test/rails/app-2.3.2.1/Rakefile
 - test/rails/app-2.3.2.1/app/controllers/application_controller.rb
 - test/rails/app-2.3.2.1/app/controllers/foo_controller.rb
 - test/rails/app-2.3.2.1/app/helpers/application_helper.rb
@@ -139,6 +163,7 @@ files:
 - test/rails/app-2.3.2.1/config/environments/production.rb
 - test/rails/app-2.3.2.1/config/routes.rb
 - test/rails/app-2.3.2.1/db/.gitignore
+- test/rails/app-2.3.2.1/log/.gitignore
 - test/rails/app-2.3.2.1/public/404.html
 - test/rails/app-2.3.2.1/public/500.html
 - test/rails/test_rails.rb