unicorn 0.99.0 → 0.990.0

data/t/test-lib.sh

@@ -7,7 +7,8 @@ set +u
 set -e
 RUBY="${RUBY-ruby}"
 RUBY_VERSION=${RUBY_VERSION-$($RUBY -e 'puts RUBY_VERSION')}
-t_pfx=$PWD/trash/$T-$RUBY_VERSION
+RUBY_ENGINE=${RUBY_ENGINE-$($RUBY -e 'puts((RUBY_ENGINE rescue "ruby"))')}
+t_pfx=$PWD/trash/$T-$RUBY_ENGINE-$RUBY_VERSION
 set -u
 
 PATH=$PWD/bin:$PATH

data/test/exec/test_exec.rb

@@ -20,6 +20,10 @@ unless try_require('rack')
   do_test = false
 end
 
+if ENV['RBX_SKIP']
+  do_test = false
+end
+
 class ExecTest < Test::Unit::TestCase
   trap(:QUIT, 'IGNORE')
 
@@ -899,25 +903,38 @@ EOF
     wait_workers_ready("test_stderr.#$$.log", 1)
     uri = URI.parse("http://#@addr:#@port/")
     pids = Tempfile.new('worker_pids')
+    r, w = IO.pipe
     hitter = fork {
+      r.close
       bodies = Hash.new(0)
       at_exit { pids.syswrite(bodies.inspect) }
       trap(:TERM) { exit(0) }
+      nr = 0
       loop {
         rv = Net::HTTP.get(uri)
         pid = rv.to_i
         exit!(1) if pid <= 0
         bodies[pid] += 1
+        nr += 1
+        if nr == 1
+          w.syswrite('1')
+        elsif bodies.size > 1
+          w.syswrite('2')
+          sleep
+        end
       }
     }
-    sleep 5 # racy
+    w.close
+    assert_equal '1', r.read(1)
     daemon_pid = File.read(pid_file.path).to_i
     assert daemon_pid > 0
     Process.kill(:HUP, daemon_pid)
-    sleep 5 # racy
+    assert_equal '2', r.read(1)
     assert_nothing_raised { Process.kill(:TERM, hitter) }
     _, hitter_status = Process.waitpid2(hitter)
-    assert hitter_status.success?
+    assert(hitter_status.success?,
+           "invalid: #{hitter_status.inspect} #{File.read(pids.path)}" \
+           "#{File.read("test_stderr.#$$.log")}")
     pids.sysseek(0)
     pids = eval(pids.read)
     assert_kind_of(Hash, pids)

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

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

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

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

data/test/rails/app-2.3.8/public/x.txt

@@ -0,0 +1 @@
+HELLO

data/test/rails/test_rails.rb

@@ -46,6 +46,10 @@ end
 ROR_V = UNICORN_RAILS_TEST_VERSION.split(/\./).map { |x| x.to_i }
 RB_V = RUBY_VERSION.split(/\./).map { |x| x.to_i }
 if RB_V[0] >= 1 && RB_V[1] >= 9
+  if RB_V[2] >= 2
+    warn "Ruby 1.9.2+ is not compatible with Rails 2.x"
+    do_test = false
+  end
   unless ROR_V[0] >= 2 && ROR_V[1] >= 3
     warn "skipping Ruby >=1.9 test with Rails <2.3"
     do_test = false

data/test/unit/test_http_parser.rb

@@ -51,6 +51,14 @@ class HttpParserTest < Test::Unit::TestCase
     assert parser.keepalive?
   end
 
+  def test_tab_lws
+    parser = HttpParser.new
+    req = {}
+    tmp = "GET / HTTP/1.1\r\nHost:\tfoo.bar\r\n\r\n"
+    assert_equal req.object_id, parser.headers(req, tmp).object_id
+    assert_equal "foo.bar", req['HTTP_HOST']
+  end
+
   def test_connection_close_no_ka
     parser = HttpParser.new
     req = {}
@@ -542,6 +550,8 @@ class HttpParserTest < Test::Unit::TestCase
       diff = after - before
       assert(diff < 10000, "memory grew more than 10M: #{diff}")
     end
-  end if RUBY_PLATFORM =~ /linux/ && test(?r, LINUX_PROC_PID_STATUS)
+  end if RUBY_PLATFORM =~ /linux/ &&
+         File.readable?(LINUX_PROC_PID_STATUS) &&
+         !defined?(RUBY_ENGINE)
 
 end

data/test/unit/test_http_parser_ng.rb

@@ -26,7 +26,7 @@ class HttpParserNgTest < Test::Unit::TestCase
     assert_equal 0, hdr.size
     assert ! @parser.keepalive?
     assert @parser.headers?
-    assert 123, @parser.content_length
+    assert_equal 123, @parser.content_length
   end
 
   def test_identity_step_headers
@@ -440,4 +440,24 @@ class HttpParserNgTest < Test::Unit::TestCase
     end
   end
 
+  def test_ignore_version_header
+    http = "GET / HTTP/1.1\r\nVersion: hello\r\n\r\n"
+    req = {}
+    assert_equal req, @parser.headers(req, http)
+    assert_equal '', http
+    expect = {
+      "SERVER_NAME" => "localhost",
+      "rack.url_scheme" => "http",
+      "REQUEST_PATH" => "/",
+      "SERVER_PROTOCOL" => "HTTP/1.1",
+      "PATH_INFO" => "/",
+      "HTTP_VERSION" => "HTTP/1.1",
+      "REQUEST_URI" => "/",
+      "SERVER_PORT" => "80",
+      "REQUEST_METHOD" => "GET",
+      "QUERY_STRING" => ""
+    }
+    assert_equal expect, req
+  end
+
 end

data/test/unit/test_signals.rb

@@ -166,7 +166,7 @@ class SignalsTest < Test::Unit::TestCase
     expect = @bs * @count
     assert_equal(expect, got, "expect=#{expect} got=#{got}")
     assert_nothing_raised { sock.close }
-  end
+  end unless ENV['RBX_SKIP']
 
   def test_request_read
     app = lambda { |env|
@@ -201,6 +201,6 @@ class SignalsTest < Test::Unit::TestCase
     assert size_before < @tmp.stat.size
     assert_equal pid, sock.sysread(4096)[/\r\nX-Pid: (\d+)\r\n/, 1].to_i
     sock.close
-  end
+  end unless ENV['RBX_SKIP']
 
 end

data/test/unit/test_socket_helper.rb

@@ -97,7 +97,7 @@ class TestSocketHelper < Test::Unit::TestCase
     a = bind_listen(tcp_server)
     assert_equal a.fileno, tcp_server.fileno
     assert_equal a.fileno, @tcp_listener.fileno
-  end
+  end unless ENV["RBX_SKIP"]
 
   def test_bind_listen_unix_rebind
     test_bind_listen_unix
@@ -128,6 +128,8 @@ class TestSocketHelper < Test::Unit::TestCase
     @unix_server = server_cast(unix_listener_socket)
     assert_equal @unix_listener.fileno, @unix_server.fileno
     assert UNIXServer === @unix_server
+    assert_equal(@unix_server.path, @unix_listener.path,
+                 "##{@unix_server.path} != #{@unix_listener.path}")
     assert File.socket?(@unix_server.path)
     assert_equal @unix_listener_path, sock_name(@unix_server)
 
@@ -137,11 +139,11 @@ class TestSocketHelper < Test::Unit::TestCase
     assert_equal @tcp_listener.fileno, @tcp_server.fileno
     assert TCPServer === @tcp_server
     assert_equal @tcp_listener_name, sock_name(@tcp_server)
-  end
+  end unless ENV["RBX_SKIP"]
 
   def test_sock_name
     test_server_cast
     sock_name(@unix_server)
-  end
+  end unless ENV["RBX_SKIP"]
 
 end

data/test/unit/test_util.rb

@@ -8,26 +8,29 @@ class TestUtil < Test::Unit::TestCase
   EXPECT_FLAGS = File::WRONLY | File::APPEND
   def test_reopen_logs_noop
     tmp = Tempfile.new('')
-    tmp.reopen(tmp.path, 'a')
-    tmp.sync = true
-    ext = tmp.external_encoding rescue nil
-    int = tmp.internal_encoding rescue nil
-    before = tmp.stat.inspect
+    fp = File.open(tmp.path, 'ab')
+    fp.sync = true
+    ext = fp.external_encoding rescue nil
+    int = fp.internal_encoding rescue nil
+    before = fp.stat.inspect
     Unicorn::Util.reopen_logs
-    assert_equal before, File.stat(tmp.path).inspect
-    assert_equal ext, (tmp.external_encoding rescue nil)
-    assert_equal int, (tmp.internal_encoding rescue nil)
+    assert_equal before, File.stat(fp.path).inspect
+    assert_equal ext, (fp.external_encoding rescue nil)
+    assert_equal int, (fp.internal_encoding rescue nil)
+    assert_equal(EXPECT_FLAGS, EXPECT_FLAGS & fp.fcntl(Fcntl::F_GETFL))
     assert_nothing_raised { tmp.close! }
+    assert_nothing_raised { fp.close }
   end
 
   def test_reopen_logs_renamed
     tmp = Tempfile.new('')
     tmp_path = tmp.path.freeze
-    tmp.reopen(tmp_path, 'a')
-    tmp.sync = true
-    ext = tmp.external_encoding rescue nil
-    int = tmp.internal_encoding rescue nil
-    before = tmp.stat.inspect
+    fp = File.open(tmp_path, 'ab')
+    fp.sync = true
+
+    ext = fp.external_encoding rescue nil
+    int = fp.internal_encoding rescue nil
+    before = fp.stat.inspect
     to = Tempfile.new('')
     File.rename(tmp_path, to.path)
     assert ! File.exist?(tmp_path)
@@ -35,13 +38,14 @@ class TestUtil < Test::Unit::TestCase
     assert_equal tmp_path, tmp.path
     assert File.exist?(tmp_path)
     assert before != File.stat(tmp_path).inspect
-    assert_equal tmp.stat.inspect, File.stat(tmp_path).inspect
-    assert_equal ext, (tmp.external_encoding rescue nil)
-    assert_equal int, (tmp.internal_encoding rescue nil)
-    assert_equal(EXPECT_FLAGS, EXPECT_FLAGS & tmp.fcntl(Fcntl::F_GETFL))
-    assert tmp.sync
+    assert_equal fp.stat.inspect, File.stat(tmp_path).inspect
+    assert_equal ext, (fp.external_encoding rescue nil)
+    assert_equal int, (fp.internal_encoding rescue nil)
+    assert_equal(EXPECT_FLAGS, EXPECT_FLAGS & fp.fcntl(Fcntl::F_GETFL))
+    assert fp.sync
     assert_nothing_raised { tmp.close! }
     assert_nothing_raised { to.close! }
+    assert_nothing_raised { fp.close }
   end
 
   def test_reopen_logs_renamed_with_encoding

data/unicorn.gemspec

@@ -49,5 +49,7 @@ Gem::Specification.new do |s|
   # *strongly* recommended for security reasons.
   s.add_dependency(%q<rack>)
 
+  s.add_development_dependency('isolate', '~> 2.0.2')
+
   # s.licenses = %w(GPLv2 Ruby) # licenses= method is not in older RubyGems
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: unicorn
 version: !ruby/object:Gem::Version 
-  version: 0.99.0
+  version: 0.990.0
 platform: ruby
 authors: 
 - Unicorn hackers
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-06 00:00:00 +00:00
+date: 2010-06-08 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: isolate
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.0.2
+    version: 
 description: |-
   \Unicorn is an HTTP server for Rack applications designed to only serve
   fast clients on low-latency, high-bandwidth connections and take
@@ -59,11 +69,13 @@ extra_rdoc_files:
 - lib/unicorn/http_request.rb
 - lib/unicorn/http_response.rb
 - lib/unicorn/launcher.rb
+- lib/unicorn/oob_gc.rb
 - lib/unicorn/socket_helper.rb
 - lib/unicorn/tee_input.rb
 - lib/unicorn/util.rb
 - ext/unicorn_http/unicorn_http.c
 - ISSUES
+- Sandbox
 files: 
 - .CHANGELOG.old
 - .document
@@ -91,15 +103,18 @@ files:
 - README
 - Rakefile
 - SIGNALS
+- Sandbox
 - TODO
 - TUNING
 - bin/unicorn
 - bin/unicorn_rails
+- examples/big_app_gc.rb
 - examples/echo.ru
 - examples/git.ru
 - examples/init.sh
 - examples/logger_mp_safe.rb
 - examples/nginx.conf
+- examples/unicorn.conf.minimal.rb
 - examples/unicorn.conf.rb
 - ext/unicorn_http/CFLAGS
 - ext/unicorn_http/c_util.h
@@ -121,6 +136,7 @@ files:
 - lib/unicorn/http_request.rb
 - lib/unicorn/http_response.rb
 - lib/unicorn/launcher.rb
+- lib/unicorn/oob_gc.rb
 - lib/unicorn/socket_helper.rb
 - lib/unicorn/tee_input.rb
 - lib/unicorn/util.rb
@@ -137,9 +153,41 @@ files:
 - t/bin/utee
 - t/env.ru
 - t/my-tap-lib.sh
+- t/rails3-app/.gitignore
+- t/rails3-app/Gemfile
+- t/rails3-app/Rakefile
+- t/rails3-app/app/controllers/application_controller.rb
+- t/rails3-app/app/helpers/application_helper.rb
+- t/rails3-app/app/views/layouts/application.html.erb
+- t/rails3-app/config.ru
+- t/rails3-app/config/application.rb
+- t/rails3-app/config/boot.rb
+- t/rails3-app/config/database.yml
+- t/rails3-app/config/environment.rb
+- t/rails3-app/config/environments/development.rb
+- t/rails3-app/config/environments/production.rb
+- t/rails3-app/config/environments/test.rb
+- t/rails3-app/config/initializers/backtrace_silencers.rb
+- t/rails3-app/config/initializers/inflections.rb
+- t/rails3-app/config/initializers/mime_types.rb
+- t/rails3-app/config/initializers/secret_token.rb
+- t/rails3-app/config/initializers/session_store.rb
+- t/rails3-app/config/locales/en.yml
+- t/rails3-app/config/routes.rb
+- t/rails3-app/db/seeds.rb
+- t/rails3-app/doc/README_FOR_APP
+- t/rails3-app/lib/tasks/.gitkeep
+- t/rails3-app/public/404.html
+- t/rails3-app/public/500.html
+- t/rails3-app/public/x.txt
+- t/rails3-app/script/rails
+- t/rails3-app/test/performance/browsing_test.rb
+- t/rails3-app/test/test_helper.rb
+- t/rails3-app/vendor/plugins/.gitkeep
 - t/t0000-http-basic.sh
 - t/t0001-reload-bad-config.sh
 - t/t0002-config-conflict.sh
+- t/t0300-rails3-basic.sh
 - t/test-lib.sh
 - test/aggregate.rb
 - test/benchmark/README
@@ -206,22 +254,22 @@ files:
 - 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.5/.gitignore
-- test/rails/app-2.3.5/Rakefile
-- test/rails/app-2.3.5/app/controllers/application_controller.rb
-- test/rails/app-2.3.5/app/controllers/foo_controller.rb
-- test/rails/app-2.3.5/app/helpers/application_helper.rb
-- test/rails/app-2.3.5/config/boot.rb
-- test/rails/app-2.3.5/config/database.yml
-- test/rails/app-2.3.5/config/environment.rb
-- test/rails/app-2.3.5/config/environments/development.rb
-- test/rails/app-2.3.5/config/environments/production.rb
-- test/rails/app-2.3.5/config/routes.rb
-- test/rails/app-2.3.5/db/.gitignore
-- test/rails/app-2.3.5/log/.gitignore
-- test/rails/app-2.3.5/public/404.html
-- test/rails/app-2.3.5/public/500.html
-- test/rails/app-2.3.5/public/x.txt
+- test/rails/app-2.3.8/.gitignore
+- test/rails/app-2.3.8/Rakefile
+- test/rails/app-2.3.8/app/controllers/application_controller.rb
+- test/rails/app-2.3.8/app/controllers/foo_controller.rb
+- test/rails/app-2.3.8/app/helpers/application_helper.rb
+- test/rails/app-2.3.8/config/boot.rb
+- test/rails/app-2.3.8/config/database.yml
+- test/rails/app-2.3.8/config/environment.rb
+- test/rails/app-2.3.8/config/environments/development.rb
+- test/rails/app-2.3.8/config/environments/production.rb
+- test/rails/app-2.3.8/config/routes.rb
+- test/rails/app-2.3.8/db/.gitignore
+- test/rails/app-2.3.8/log/.gitignore
+- test/rails/app-2.3.8/public/404.html
+- test/rails/app-2.3.8/public/500.html
+- test/rails/app-2.3.8/public/x.txt
 - test/rails/test_rails.rb
 - test/test_helper.rb
 - test/unit/test_configurator.rb