unicorn 3.6.0 → 4.0.0

data/test/unit/test_http_parser_ng.rb

@@ -237,6 +237,17 @@ class HttpParserNgTest < Test::Unit::TestCase
     assert @parser.keepalive?
   end
 
+  def test_chunked_empty
+    str = @parser.buf
+    req = @parser.env
+    str << "PUT / HTTP/1.1\r\ntransfer-Encoding: chunked\r\n\r\n"
+    assert_equal req, @parser.parse, "msg=#{str}"
+    assert_equal 0, str.size
+    tmp = ""
+    assert_equal str, @parser.filter_body(tmp, str << "0\r\n\r\n")
+    assert_equal "", tmp
+  end
+
   def test_two_chunks
     str = @parser.buf
     str << "PUT / HTTP/1.1\r\ntransfer-Encoding: chunked\r\n\r\n"
@@ -651,4 +662,47 @@ class HttpParserNgTest < Test::Unit::TestCase
     assert_equal expect, @parser.parse
     assert ! @parser.next?
   end
+
+  def test_chunk_only
+    tmp = ""
+    assert_equal @parser, @parser.dechunk!
+    assert_nil @parser.filter_body(tmp, "6\r\n")
+    assert_equal "", tmp
+    assert_nil @parser.filter_body(tmp, "abcdef")
+    assert_equal "abcdef", tmp
+    assert_nil @parser.filter_body(tmp, "\r\n")
+    assert_equal "", tmp
+    src = "0\r\n\r\n"
+    assert_equal src.object_id, @parser.filter_body(tmp, src).object_id
+    assert_equal "", tmp
+  end
+
+  def test_chunk_only_bad_align
+    tmp = ""
+    assert_equal @parser, @parser.dechunk!
+    assert_nil @parser.filter_body(tmp, "6\r\na")
+    assert_equal "a", tmp
+    assert_nil @parser.filter_body(tmp, "bcde")
+    assert_equal "bcde", tmp
+    assert_nil @parser.filter_body(tmp, "f\r")
+    assert_equal "f", tmp
+    src = "\n0\r\n\r\n"
+    assert_equal src.object_id, @parser.filter_body(tmp, src).object_id
+    assert_equal "", tmp
+  end
+
+  def test_chunk_only_reset_ok
+    tmp = ""
+    assert_equal @parser, @parser.dechunk!
+    src = "1\r\na\r\n0\r\n\r\n"
+    assert_nil @parser.filter_body(tmp, src)
+    assert_equal "a", tmp
+    assert_equal src.object_id, @parser.filter_body(tmp, src).object_id
+
+    assert_equal @parser, @parser.dechunk!
+    src = "0\r\n\r\n"
+    assert_equal src.object_id, @parser.filter_body(tmp, src).object_id
+    assert_equal "", tmp
+    assert_equal src, @parser.filter_body(tmp, src)
+  end
 end

data/test/unit/test_response.rb

@@ -15,7 +15,7 @@ class ResponseTest < Test::Unit::TestCase
   include Unicorn::HttpResponse
 
   def test_httpdate
-    before = Time.now.to_i
+    before = Time.now.to_i - 1
     str = httpdate
     assert_kind_of(String, str)
     middle = Time.parse(str).to_i

data/test/unit/test_server.rb

@@ -39,7 +39,7 @@ class WebServerTest < Test::Unit::TestCase
     redirect_test_io do
       wait_workers_ready("test_stderr.#$$.log", 1)
       File.truncate("test_stderr.#$$.log", 0)
-      @server.stop(true)
+      @server.stop(false)
     end
     reset_sig_handlers
   end

data/test/unit/test_signals.rb

@@ -124,7 +124,7 @@ class SignalsTest < Test::Unit::TestCase
     assert diff > 1.0, "diff was #{diff.inspect}"
     assert diff < 60.0
     ensure
-      Process.kill(:QUIT, pid) rescue nil
+      Process.kill(:TERM, pid) rescue nil
   end
 
   def test_response_write

data/test/unit/test_socket_helper.rb

@@ -12,6 +12,7 @@ class TestSocketHelper < Test::Unit::TestCase
     @log_tmp = Tempfile.new 'logger'
     @logger = Logger.new(@log_tmp.path)
     @test_addr = ENV['UNICORN_TEST_ADDR'] || '127.0.0.1'
+    @test6_addr = ENV['UNICORN_TEST6_ADDR'] || '::1'
     GC.disable
   end
 
@@ -177,4 +178,11 @@ class TestSocketHelper < Test::Unit::TestCase
     assert cur > 1
   end if defined?(TCP_DEFER_ACCEPT)
 
+  def test_ipv6only
+    port = unused_port "#@test6_addr"
+    sock = bind_listen "[#@test6_addr]:#{port}", :ipv6only => true
+    cur = sock.getsockopt(:IPPROTO_IPV6, :IPV6_V6ONLY).unpack('i')[0]
+    assert_equal 1, cur
+    rescue Errno::EAFNOSUPPORT
+  end if RUBY_VERSION >= "1.9.2"
 end

data/test/unit/test_upload.rb

@@ -53,7 +53,7 @@ class UploadTest < Test::Unit::TestCase
   end
 
   def teardown
-    redirect_test_io { @server.stop(true) } if @server
+    redirect_test_io { @server.stop(false) } if @server
     @random.close
     reset_sig_handlers
   end

data/unicorn.gemspec

@@ -34,9 +34,10 @@ 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>, '~> 2.3')
+  s.add_dependency(%q<kgio>, '~> 2.4')
+  s.add_dependency(%q<raindrops>, '~> 0.6')
 
-  s.add_development_dependency('isolate', '~> 3.0.0')
+  s.add_development_dependency('isolate', '~> 3.1')
   s.add_development_dependency('wrongdoc', '~> 1.5')
 
   # s.licenses = %w(GPLv2 Ruby) # licenses= method is not in older RubyGems

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: unicorn
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 63
   prerelease: 
   segments: 
-  - 3
-  - 6
+  - 4
   - 0
-  version: 3.6.0
+  - 0
+  version: 4.0.0
 platform: ruby
 authors: 
 - Unicorn hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-21 00:00:00 Z
+date: 2011-06-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -39,15 +39,15 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 11
         segments: 
         - 2
-        - 3
-        version: "2.3"
+        - 4
+        version: "2.4"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: isolate
+  name: raindrops
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -56,16 +56,30 @@ dependencies:
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
-        - 3
-        - 0
         - 0
-        version: 3.0.0
-  type: :development
+        - 6
+        version: "0.6"
+  type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: wrongdoc
+  name: isolate
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        - 1
+        version: "3.1"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: wrongdoc
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -76,7 +90,7 @@ dependencies:
         - 5
         version: "1.5"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 description: |-
   \Unicorn is an HTTP server for Rack applications designed to only serve
   fast clients on low-latency, high-bandwidth connections and take
@@ -126,6 +140,7 @@ extra_rdoc_files:
 - lib/unicorn/worker.rb
 - ISSUES
 - Sandbox
+- Links
 files: 
 - .CHANGELOG.old
 - .document
@@ -150,6 +165,7 @@ files:
 - KNOWN_ISSUES
 - LATEST
 - LICENSE
+- Links
 - NEWS
 - PHILOSOPHY
 - README
@@ -211,8 +227,12 @@ files:
 - t/bin/sha1sum.rb
 - t/bin/unused_listen
 - t/bin/utee
+- t/broken-app.ru
 - t/env.ru
+- t/heartbeat-timeout.ru
 - t/my-tap-lib.sh
+- t/oob_gc.ru
+- t/oob_gc_path.ru
 - t/pid.ru
 - t/preread_input.ru
 - t/rack-input-tests.ru
@@ -252,12 +272,14 @@ files:
 - t/t0002-config-conflict.sh
 - t/t0002-parser-error.sh
 - t/t0003-working_directory.sh
+- t/t0004-heartbeat-timeout.sh
 - t/t0004-working_directory_broken.sh
 - t/t0005-working_directory_app.rb.sh
 - t/t0006-reopen-logs.sh
 - t/t0006.ru
 - t/t0007-working_directory_no_embed_cli.sh
 - t/t0008-back_out_of_upgrade.sh
+- t/t0009-broken-app.sh
 - t/t0009-winch_ttin.sh
 - t/t0010-reap-logging.sh
 - t/t0011-active-unix-socket.sh
@@ -270,6 +292,8 @@ files:
 - t/t0016-trust-x-forwarded-false.sh
 - t/t0017-trust-x-forwarded-true.sh
 - t/t0018-write-on-close.sh
+- t/t0019-max_header_len.sh
+- t/t0020-at_exit-handler.sh
 - t/t0100-rack-input-tests.sh
 - t/t0116-client_body_buffer_size.sh
 - t/t0116.ru
@@ -279,12 +303,15 @@ files:
 - 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/t9001-oob_gc.sh
+- t/t9002-oob_gc-path.sh
 - t/test-lib.sh
 - t/test-rails3.sh
 - t/write-on-close.ru
 - test/aggregate.rb
 - test/benchmark/README
 - test/benchmark/dd.ru
+- test/benchmark/stack.ru
 - test/exec/README
 - test/exec/test_exec.rb
 - test/rails/app-1.2.3/.gitignore
@@ -350,6 +377,7 @@ files:
 - test/rails/test_rails.rb
 - test/test_helper.rb
 - test/unit/test_configurator.rb
+- test/unit/test_droplet.rb
 - test/unit/test_http_parser.rb
 - test/unit/test_http_parser_ng.rb
 - test/unit/test_http_parser_xftrust.rb
@@ -395,7 +423,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mongrel
-rubygems_version: 1.7.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Rack HTTP server for fast clients and Unix