unicorn 3.0.0pre1 → 3.0.0pre1.9.g86d2

data/lib/unicorn/http_server.rb

@@ -500,7 +500,7 @@ class Unicorn::HttpServer
     msg = case e
     when EOFError,Errno::ECONNRESET,Errno::EPIPE,Errno::EINVAL,Errno::EBADF
       Unicorn::Const::ERROR_500_RESPONSE
-    when HttpParserError # try to tell the client they're bad
+    when Unicorn::HttpParserError # try to tell the client they're bad
       Unicorn::Const::ERROR_400_RESPONSE
     else
       logger.error "Read error: #{e.inspect}"

data/lib/unicorn/stream_input.rb

@@ -60,7 +60,7 @@ class Unicorn::StreamInput
           @rbuf.replace('')
         end
       end
-      rv = nil if rv.empty?
+      rv = nil if rv.empty? && length != 0
     end
     rv
   end

data/t/t0002-parser-error.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+. ./test-lib.sh
+t_plan 5 "parser error test"
+
+t_begin "setup and startup" && {
+	unicorn_setup
+	unicorn -D env.ru -c $unicorn_config
+	unicorn_wait_start
+}
+
+t_begin "send a bad request" && {
+	(
+		printf 'GET / HTTP/1/1\r\nHost: example.com\r\n\r\n'
+		cat $fifo > $tmp &
+		wait
+		echo ok > $ok
+	) | socat - TCP:$listen > $fifo
+	test xok = x$(cat $ok)
+}
+
+dbgcat tmp
+
+t_begin "response should be a 400" && {
+	grep -F 'HTTP/1.1 400 Bad Request' $tmp
+}
+
+t_begin "server stderr should be clean" && check_stderr
+
+t_begin "term signal sent" && kill $unicorn_pid
+
+t_done

data/t/t0013.ru

@@ -0,0 +1,12 @@
+#\ -E none
+use Rack::ContentLength
+use Rack::ContentType, 'text/plain'
+app = lambda do |env|
+  case env['rack.input']
+  when Unicorn::StreamInput
+    [ 200, {}, %w(OK) ]
+  else
+    [ 500, {}, %w(NO) ]
+  end
+end
+run app

data/t/t0014.ru

@@ -0,0 +1,12 @@
+#\ -E none
+use Rack::ContentLength
+use Rack::ContentType, 'text/plain'
+app = lambda do |env|
+  case env['rack.input']
+  when Unicorn::TeeInput
+    [ 200, {}, %w(OK) ]
+  else
+    [ 500, {}, %w(NO) ]
+  end
+end
+run app

data/test/unit/test_stream_input.rb

@@ -129,6 +129,23 @@ class TestStreamInput < Test::Unit::TestCase
     assert_equal '', buf
   end
 
+  def test_read_zero
+    r = init_request('hello')
+    si = Unicorn::StreamInput.new(@rd, r)
+    assert_equal '', si.read(0)
+    buf = 'asdf'
+    rv = si.read(0, buf)
+    assert_equal rv.object_id, buf.object_id
+    assert_equal '', buf
+    assert_equal 'hello', si.read
+    assert_nil si.read(5)
+    assert_equal '', si.read(0)
+    buf = 'hello'
+    rv = si.read(0, buf)
+    assert_equal rv.object_id, buf.object_id
+    assert_equal '', rv
+  end
+
   def init_request(body, size = nil)
     @parser = Unicorn::HttpParser.new
     body = body.to_s.freeze

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: unicorn
 version: !ruby/object:Gem::Version 
-  hash: -766259879
+  hash: -5096542530
   prerelease: true
   segments: 
   - 3
   - 0
   - 0pre1
-  version: 3.0.0pre1
+  - 9
+  - g86d2
+  version: 3.0.0pre1.9.g86d2
 platform: ruby
 authors: 
 - Unicorn hackers
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 +00:00
+date: 2010-11-17 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -232,6 +234,7 @@ files:
 - t/t0000-http-basic.sh
 - t/t0001-reload-bad-config.sh
 - t/t0002-config-conflict.sh
+- t/t0002-parser-error.sh
 - t/t0003-working_directory.sh
 - t/t0004-working_directory_broken.sh
 - t/t0005-working_directory_app.rb.sh
@@ -244,7 +247,9 @@ files:
 - t/t0011-active-unix-socket.sh
 - t/t0012-reload-empty-config.sh
 - t/t0013-rewindable-input-false.sh
+- t/t0013.ru
 - t/t0014-rewindable-input-true.sh
+- t/t0014.ru
 - t/t0300-rails3-basic.sh
 - t/t0301-rails3-missing-config-ru.sh
 - t/t0302-rails3-alt-working_directory.sh