avoid memory leak in passenger

git-svn-id: svn+ssh://rubyforge.org/var/svn/spawn/spawn@52 2aabfe31-cc40-457c-aec7-21ad9ce7fb7d

README

@@ -114,8 +114,7 @@ Also thanks to all who have helped debug problems and suggest improvements inclu
   Ahmed Adam, Tristan Schneiter, Scott Haug, Andrew Garfield, Eugene Otto, Dan Sharp,
   Olivier Ruffin
   Garry Tan, Matt Jankowski (2.2.x fixes)
-  Tim Kadom, Mauricio Marcon Zaffari, Danial Pearce (passenger fixes)
+  Tim Kadom, Mauricio Marcon Zaffari, Hongli Lai (passenger fixes)
   <your name here>
 
-Copyright (c) 2007-08 Tom Anderson (tom@squeat.com), see LICENSE
->
+Copyright (c) 2007-present Tom Anderson (tom@squeat.com), see LICENSE

lib/patches.rb

@@ -67,6 +67,7 @@ class Passenger::Railz::RequestHandler
     alias_method :orig_process_request, :process_request
     def process_request(headers, input, output)
       Spawn.resources_to_close(input, output)
+<<<<<<< HEAD:lib/patches.rb
       orig_process_request(headers, input, output)
     end
   end

lib/spawn.rb

@@ -5,7 +5,7 @@ module Spawn
   # default to forking (unless windows or jruby)
   @@method = (RUBY_PLATFORM =~ /(win32|java)/) ? :thread : :fork
   # things to close in child process
-  @@resources = SortedSet.new
+  @@resources = []
   # in some environments, logger isn't defined
   @@logger = defined?(RAILS_DEFAULT_LOGGER) ? RAILS_DEFAULT_LOGGER : Logger.new(STDERR)