unicorn 0.2.2 → 0.2.3

data/CHANGELOG

@@ -1,3 +1,4 @@
+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:)
 v0.2.1 - Fix broken Manifest that cause unicorn_rails to not be bundled
 v0.2.0 - unicorn_rails launcher script.

data/lib/unicorn.rb

@@ -106,7 +106,6 @@ module Unicorn
       @listeners.delete_if do |io|
         if dead_names.include?(sock_name(io))
           @io_purgatory.delete_if { |pio| pio.fileno == io.fileno }
-          destroy_safely(io)
           true
         else
           false

data/lib/unicorn/const.rb

@@ -68,7 +68,7 @@ module Unicorn
     REQUEST_URI='REQUEST_URI'.freeze
     REQUEST_PATH='REQUEST_PATH'.freeze
     
-    UNICORN_VERSION="0.2.2".freeze
+    UNICORN_VERSION="0.2.3".freeze
 
     UNICORN_TMP_BASE="unicorn".freeze
 

data/lib/unicorn/http_request.rb

@@ -25,6 +25,7 @@ module Unicorn
       @parser.reset
       @params.clear
       @body.close rescue nil
+      @body.close! rescue nil
       @body = nil
     end
 

data/lib/unicorn/socket.rb

@@ -62,13 +62,6 @@ module Unicorn
       end
     end
 
-    def destroy_safely(io)
-      if io.respond_to?(:path) && File.stat(io.path).ino == io.stat.ino
-        File.unlink(io.path) rescue nil
-      end
-      io.close rescue nil
-    end
-
     # creates a new server, socket. address may be a HOST:PORT or
     # an absolute path to a UNIX socket.  address can even be a Socket
     # object in which case it is immediately returned

data/test/unit/test_upload.rb

@@ -50,6 +50,32 @@ class UploadTest < Test::Unit::TestCase
     assert_equal @sha1.hexdigest, resp[:sha1]
   end
 
+  def test_tempfile_unlinked
+    spew_path = lambda do |env|
+      if orig = env['HTTP_X_OLD_PATH']
+        assert orig != env['rack.input'].path
+      end
+      assert_equal length, env['rack.input'].size
+      [ 200, @hdr.merge('X-Tempfile-Path' => env['rack.input'].path), [] ]
+    end
+    start_server(spew_path)
+    sock = TCPSocket.new(@addr, @port)
+    sock.syswrite("PUT / HTTP/1.0\r\nContent-Length: #{length}\r\n\r\n")
+    @count.times { sock.syswrite(' ' * @bs) }
+    path = sock.read[/^X-Tempfile-Path: (\S+)/, 1]
+    sock.close
+
+    # send another request to ensure we hit the next request
+    sock = TCPSocket.new(@addr, @port)
+    sock.syswrite("PUT / HTTP/1.0\r\nX-Old-Path: #{path}\r\n" \
+                  "Content-Length: #{length}\r\n\r\n")
+    @count.times { sock.syswrite(' ' * @bs) }
+    path2 = sock.read[/^X-Tempfile-Path: (\S+)/, 1]
+    sock.close
+    assert path != path2
+
+    assert ! File.exist?(path)
+  end
 
   def test_put_keepalive_truncates_small_overwrite
     start_server(@sha1_app)

data/unicorn.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{unicorn}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Wong"]
-  s.date = %q{2009-03-22}
+  s.date = %q{2009-03-25}
   s.description = %q{A small fast HTTP library and server for Rack applications.}
   s.email = %q{normalperson@yhbt.net}
   s.executables = ["unicorn", "unicorn_rails"]
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{unicorn}
   s.rubygems_version = %q{1.3.1}
   s.summary = %q{A small fast HTTP library and server for Rack applications.}
-  s.test_files = ["test/unit/test_configurator.rb", "test/unit/test_server.rb", "test/unit/test_upload.rb", "test/unit/test_response.rb", "test/unit/test_http_parser.rb", "test/unit/test_request.rb"]
+  s.test_files = ["test/unit/test_configurator.rb", "test/unit/test_response.rb", "test/unit/test_request.rb", "test/unit/test_upload.rb", "test/unit/test_http_parser.rb", "test/unit/test_server.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: unicorn
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Eric Wong
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-22 00:00:00 -07:00
+date: 2009-03-25 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -124,8 +124,8 @@ specification_version: 2
 summary: A small fast HTTP library and server for Rack applications.
 test_files: 
 - test/unit/test_configurator.rb
-- test/unit/test_server.rb
-- test/unit/test_upload.rb
 - test/unit/test_response.rb
-- test/unit/test_http_parser.rb
 - test/unit/test_request.rb
+- test/unit/test_upload.rb
+- test/unit/test_http_parser.rb
+- test/unit/test_server.rb