unicorn 0.5.3 → 0.5.4

data/CHANGELOG

@@ -1,3 +1,4 @@
+v0.5.4 - fix data corruption with some small uploads (not curl)
 v0.5.3 - fix 100% CPU usage when idle, small cleanups
 v0.5.2 - force Status: header for compat, small cleanups
 v0.5.1 - exit correctly on INT/TERM, QUIT is still recommended, however

data/lib/unicorn/http_request.rb

@@ -87,15 +87,10 @@ module Unicorn
       remain = content_length - http_body.length
 
       # must read more data to complete body
-      if remain < Const::MAX_BODY
-        # small body, just use that
-        @body = StringIO.new(http_body)
-      else # huge body, put it in a tempfile
-        @body = Tempfile.new(Const::UNICORN_TMP_BASE)
-        @body.binmode
-        @body.sync = true
-        @body.syswrite(http_body)
-      end
+      @body = remain < Const::MAX_BODY ? StringIO.new : Tempfile.new('')
+      @body.binmode
+      @body.sync = true
+      @body.syswrite(http_body)
 
       # Some clients (like FF1.0) report 0 for body and then send a body.
       # This will probably truncate them but at least the request goes through

data/test/unit/test_upload.rb

@@ -50,6 +50,29 @@ class UploadTest < Test::Unit::TestCase
     assert_equal @sha1.hexdigest, resp[:sha1]
   end
 
+  def test_put_trickle_small
+    @count, @bs = 2, 128
+    start_server(@sha1_app)
+    assert_equal 256, length
+    sock = TCPSocket.new(@addr, @port)
+    hdr = "PUT / HTTP/1.0\r\nContent-Length: #{length}\r\n\r\n"
+    @count.times do
+      buf = @random.sysread(@bs)
+      @sha1.update(buf)
+      hdr << buf
+      sock.syswrite(hdr)
+      hdr = ''
+      sleep 0.6
+    end
+    read = sock.read.split(/\r\n/)
+    assert_equal "HTTP/1.1 200 OK", read[0]
+    resp = eval(read.grep(/^X-Resp: /).first.sub!(/X-Resp: /, ''))
+    assert_equal length, resp[:size]
+    assert_equal 0, resp[:pos]
+    assert_equal @sha1.hexdigest, resp[:sha1]
+    assert_equal StringIO, resp[:class]
+  end
+
   def test_tempfile_unlinked
     spew_path = lambda do |env|
       if orig = env['HTTP_X_OLD_PATH']

data/unicorn.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{unicorn}
-  s.version = "0.5.3"
+  s.version = "0.5.4"
 
   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-16}
+  s.date = %q{2009-04-23}
   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_request.rb", "test/unit/test_http_parser.rb", "test/unit/test_server.rb", "test/unit/test_response.rb", "test/unit/test_configurator.rb", "test/unit/test_upload.rb", "test/unit/test_signals.rb", "test/unit/test_socket_helper.rb"]
+  s.test_files = ["test/unit/test_configurator.rb", "test/unit/test_response.rb", "test/unit/test_request.rb", "test/unit/test_signals.rb", "test/unit/test_upload.rb", "test/unit/test_http_parser.rb", "test/unit/test_socket_helper.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.5.3
+  version: 0.5.4
 platform: ruby
 authors: 
 - Eric Wong
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-16 00:00:00 -07:00
+date: 2009-04-23 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -211,11 +211,11 @@ signing_key:
 specification_version: 2
 summary: A small fast HTTP library and server for Rack applications.
 test_files: 
-- test/unit/test_request.rb
-- test/unit/test_http_parser.rb
-- test/unit/test_server.rb
-- test/unit/test_response.rb
 - test/unit/test_configurator.rb
-- test/unit/test_upload.rb
+- test/unit/test_response.rb
+- test/unit/test_request.rb
 - test/unit/test_signals.rb
+- test/unit/test_upload.rb
+- test/unit/test_http_parser.rb
 - test/unit/test_socket_helper.rb
+- test/unit/test_server.rb