unicorn 2.0.0pre2.4.gf202 → 2.0.0pre3

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.0.0pre2.GIT
+DEF_VER=v2.0.0pre3.GIT
 
 LF='
 '

data/lib/unicorn/const.rb

@@ -7,8 +7,8 @@
 # improve things much compared to constants.
 module Unicorn::Const
 
-  # The current version of Unicorn, currently 2.0.0pre2
-  UNICORN_VERSION = "2.0.0pre2"
+  # The current version of Unicorn, currently 2.0.0pre3
+  UNICORN_VERSION = "2.0.0pre3"
 
   # default TCP listen host address (0.0.0.0, all interfaces)
   DEFAULT_HOST = "0.0.0.0"

data/lib/unicorn/preread_input.rb

@@ -0,0 +1,30 @@
+# -*- encoding: binary -*-
+
+module Unicorn
+# This middleware is used to ensure input is buffered to memory
+# or disk (depending on size) before the application is dispatched
+# by entirely consuming it (from TeeInput) beforehand.
+#
+# Usage (in config.ru):
+#
+#     require 'unicorn/preread_input'
+#     if defined?(Unicorn)
+#       use Unicorn::PrereadInput
+#     end
+#     run YourApp.new
+class PrereadInput
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    buf = ""
+    input = env["rack.input"]
+    if buf = input.read(16384)
+      true while input.read(16384, buf)
+      input.rewind
+    end
+    @app.call(env)
+  end
+end
+end

data/script/isolate_for_tests

@@ -17,7 +17,7 @@ opts = {
 pid = fork do
   Isolate.now!(opts) do
     gem 'sqlite3-ruby', '1.2.5'
-    gem 'kgio', '1.3.0'
+    gem 'kgio', '1.3.1'
     gem 'rack', '1.1.0'
   end
 end

data/t/preread_input.ru

@@ -0,0 +1,17 @@
+#\-E none
+require 'digest/sha1'
+require 'unicorn/preread_input'
+use Rack::ContentLength
+use Rack::ContentType, "text/plain"
+use Unicorn::PrereadInput
+nr = 0
+run lambda { |env|
+  $stderr.write "app dispatch: #{nr += 1}\n"
+  input = env["rack.input"]
+  dig = Digest::SHA1.new
+  while buf = input.read(16384)
+    dig.update(buf)
+  end
+
+  [ 200, {}, [ "#{dig.hexdigest}\n" ] ]
+}

data/t/t9000-preread-input.sh

@@ -0,0 +1,48 @@
+#!/bin/sh
+. ./test-lib.sh
+t_plan 9 "PrereadInput middleware tests"
+
+t_begin "setup and start" && {
+	random_blob_sha1=$(rsha1 < random_blob)
+	unicorn_setup
+	unicorn  -D -c $unicorn_config preread_input.ru
+	unicorn_wait_start
+}
+
+t_begin "single identity request" && {
+	curl -sSf -T random_blob http://$listen/ > $tmp
+}
+
+t_begin "sha1 matches" && {
+	test x"$(cat $tmp)" = x"$random_blob_sha1"
+}
+
+t_begin "single chunked request" && {
+	curl -sSf -T- < random_blob http://$listen/ > $tmp
+}
+
+t_begin "sha1 matches" && {
+	test x"$(cat $tmp)" = x"$random_blob_sha1"
+}
+
+t_begin "app only dispatched twice" && {
+	test 2 -eq "$(grep 'app dispatch:' < $r_err | wc -l )"
+}
+
+t_begin "aborted chunked request" && {
+	rm -f $tmp
+	curl -sSf -T- < $fifo http://$listen/ > $tmp &
+	curl_pid=$!
+	kill -9 $curl_pid
+	wait
+}
+
+t_begin "app only dispatched twice" && {
+	test 2 -eq "$(grep 'app dispatch:' < $r_err | wc -l )"
+}
+
+t_begin "killing succeeds" && {
+	kill -QUIT $unicorn_pid
+}
+
+t_done

data/unicorn.gemspec

@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
   # commented out.  Nevertheless, upgrading to Rails 2.3.4 or later is
   # *strongly* recommended for security reasons.
   s.add_dependency(%q<rack>)
-  s.add_dependency(%q<kgio>, '~> 1.3.0')
+  s.add_dependency(%q<kgio>, '~> 1.3.1')
 
   s.add_development_dependency('isolate', '~> 2.1.2')
 

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: unicorn
 version: !ruby/object:Gem::Version 
-  hash: 1058687251
+  hash: -766259860
   prerelease: true
   segments: 
   - 2
   - 0
-  - 0pre2
-  - 4
-  - gf202
-  version: 2.0.0pre2.4.gf202
+  - 0pre3
+  version: 2.0.0pre3
 platform: ruby
 authors: 
 - Unicorn hackers
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-08 00:00:00 +00:00
+date: 2010-10-09 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,12 +40,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 25
         segments: 
         - 1
         - 3
-        - 0
-        version: 1.3.0
+        - 1
+        version: 1.3.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -105,6 +103,7 @@ extra_rdoc_files:
 - lib/unicorn/http_server.rb
 - lib/unicorn/launcher.rb
 - lib/unicorn/oob_gc.rb
+- lib/unicorn/preread_input.rb
 - lib/unicorn/socket_helper.rb
 - lib/unicorn/tee_input.rb
 - lib/unicorn/tmpio.rb
@@ -175,6 +174,7 @@ files:
 - lib/unicorn/http_server.rb
 - lib/unicorn/launcher.rb
 - lib/unicorn/oob_gc.rb
+- lib/unicorn/preread_input.rb
 - lib/unicorn/socket_helper.rb
 - lib/unicorn/tee_input.rb
 - lib/unicorn/tmpio.rb
@@ -195,6 +195,7 @@ files:
 - t/env.ru
 - t/my-tap-lib.sh
 - t/pid.ru
+- t/preread_input.ru
 - t/rails3-app/.gitignore
 - t/rails3-app/Gemfile
 - t/rails3-app/Rakefile
@@ -244,6 +245,7 @@ files:
 - t/t0302-rails3-alt-working_directory.sh
 - t/t0303-rails3-alt-working_directory_config.ru.sh
 - t/t0304-rails3-alt-working_directory_no_embed_cli.sh
+- t/t9000-preread-input.sh
 - t/test-lib.sh
 - t/test-rails3.sh
 - test/aggregate.rb