unicorn 0.9.2 → 0.90.0

data/lib/unicorn/chunked_reader.rb

@@ -1,77 +0,0 @@
-# Copyright (c) 2009 Eric Wong
-# You can redistribute it and/or modify it under the same terms as Ruby.
-
-require 'unicorn'
-require 'unicorn_http'
-
-module Unicorn
-  class ChunkedReader
-
-    def initialize(env, input, buf)
-      @env, @input, @buf = env, input, buf
-      @chunk_left = 0
-      parse_chunk_header
-    end
-
-    def readpartial(max, buf = Z.dup)
-      while @input && @chunk_left <= 0 && ! parse_chunk_header
-        @buf << @input.readpartial(Const::CHUNK_SIZE, buf)
-      end
-
-      if @input
-        begin
-          @buf << @input.read_nonblock(Const::CHUNK_SIZE, buf)
-        rescue Errno::EAGAIN, Errno::EINTR
-        end
-      end
-
-      max = @chunk_left if max > @chunk_left
-      buf.replace(last_block(max) || Z)
-      @chunk_left -= buf.size
-      (0 == buf.size && @input.nil?) and raise EOFError
-      buf
-    end
-
-  private
-
-    def last_block(max = nil)
-      rv = @buf
-      if max && rv && max < rv.size
-        @buf = rv[max - rv.size, rv.size - max]
-        return rv[0, max]
-      end
-      @buf = Z.dup
-      rv
-    end
-
-    def parse_chunk_header
-      buf = @buf
-      # ignoring chunk-extension info for now, I haven't seen any use for it
-      # (or any users, and TE:chunked sent by clients is rare already)
-      # if there was not enough data in buffer to parse length of the chunk
-      # then just return
-      if buf.sub!(/\A(?:\r\n)?([a-fA-F0-9]{1,8})[^\r]*?\r\n/, Z)
-        @chunk_left = $1.to_i(16)
-        if 0 == @chunk_left # EOF
-          buf.sub!(/\A\r\n(?:\r\n)?/, Z) # cleanup for future requests
-          if trailer = @env[Const::HTTP_TRAILER]
-            tp = TrailerParser.new(trailer)
-            while ! tp.execute!(@env, buf)
-              buf << @input.readpartial(Const::CHUNK_SIZE)
-            end
-          end
-          @input = nil
-        end
-        return @chunk_left
-      end
-
-      buf.size > 256 and
-          raise HttpParserError,
-                "malformed chunk, chunk-length not found in buffer: " \
-                "#{buf.inspect}"
-      nil
-    end
-
-  end
-
-end

data/lib/unicorn/trailer_parser.rb

@@ -1,52 +0,0 @@
-# Copyright (c) 2009 Eric Wong
-# You can redistribute it and/or modify it under the same terms as Ruby.
-require 'unicorn'
-require 'unicorn_http'
-
-# Eventually I should integrate this into HttpParser...
-module Unicorn
-  class TrailerParser
-
-    TR_FR = 'a-z-'.freeze
-    TR_TO = 'A-Z_'.freeze
-
-    # initializes HTTP trailer parser with acceptable +trailer+
-    def initialize(http_trailer)
-      @trailers = http_trailer.split(/\s*,\s*/).inject({}) { |hash, key|
-        hash[key.tr(TR_FR, TR_TO)] = true
-        hash
-      }
-    end
-
-    # Executes our TrailerParser on +data+ and modifies +env+  This will
-    # shrink +data+ as it is being consumed.  Returns true if it has
-    # parsed all trailers, false if not.  It raises HttpParserError on
-    # parse failure or unknown headers.  It has slightly smaller limits
-    # than the C-based HTTP parser but should not be an issue in practice
-    # since Content-MD5 is probably the only legitimate use for it.
-    def execute!(env, data)
-      data.size > 0xffff and
-        raise HttpParserError, "trailer buffer too large: #{data.size} bytes"
-
-      begin
-        data.sub!(/\A([^\r]+)\r\n/, Z) or return false # need more data
-
-        key, val = $1.split(/:\s*/, 2)
-
-        key.size > 256 and
-          raise HttpParserError, "trailer key #{key.inspect} is too long"
-        val.size > 8192 and
-          raise HttpParserError, "trailer value #{val.inspect} is too long"
-
-        key.tr!(TR_FR, TR_TO)
-
-        @trailers.delete(key) or
-          raise HttpParserError, "unknown trailer: #{key.inspect}"
-        env["HTTP_#{key}"] = val
-
-        @trailers.empty? and return true
-      end while true
-    end
-
-  end
-end

data/test/benchmark/big_request.rb

@@ -1,44 +0,0 @@
-require 'benchmark'
-require 'tempfile'
-require 'unicorn'
-nr = ENV['nr'] ? ENV['nr'].to_i : 100
-bs = ENV['bs'] ? ENV['bs'].to_i : (1024 * 1024)
-count = ENV['count'] ? ENV['count'].to_i : 4
-length = bs * count
-slice = (' ' * bs).freeze
-
-big = Tempfile.new('')
-
-def big.unicorn_peeraddr # old versions of Unicorn used this
-  '127.0.0.1'
-end
-
-big.syswrite(
-"PUT /hello/world/puturl?abcd=efg&hi#anchor HTTP/1.0\r\n" \
-"Host: localhost\r\n" \
-"Accept: */*\r\n" \
-"Content-Length: #{length}\r\n" \
-"User-Agent: test-user-agent 0.1.0 (Mozilla compatible) 5.0 asdfadfasda\r\n" \
-"\r\n")
-count.times { big.syswrite(slice) }
-big.sysseek(0)
-big.fsync
-
-include Unicorn
-request = HttpRequest.new(Logger.new($stderr))
-unless request.respond_to?(:reset)
-  def request.reset
-    # no-op
-  end
-end
-
-Benchmark.bmbm do |x|
-  x.report("big") do
-    for i in 1..nr
-      request.read(big)
-      request.reset
-      big.sysseek(0)
-    end
-  end
-end
-

data/test/benchmark/request.rb

@@ -1,56 +0,0 @@
-require 'benchmark'
-require 'unicorn'
-nr = ENV['nr'] ? ENV['nr'].to_i : 100000
-
-class TestClient
-  def initialize(response)
-    @response = (response.join("\r\n") << "\r\n\r\n").freeze
-  end
-  def sysread(len, buf)
-    buf.replace(@response)
-  end
-
-  alias readpartial sysread
-
-  # old versions of Unicorn used this
-  def unicorn_peeraddr
-    '127.0.0.1'
-  end
-end
-
-small = TestClient.new([
-  'GET / HTTP/1.0',
-  'Host: localhost',
-  'Accept: */*',
-  'User-Agent: test-user-agent 0.1.0'
-])
-
-medium = TestClient.new([
-  'GET /hello/world/geturl?abcd=efg&hi#anchor HTTP/1.0',
-  'Host: localhost',
-  'Accept: */*',
-  'User-Agent: test-user-agent 0.1.0 (Mozilla compatible) 5.0 asdfadfasda'
-])
-
-include Unicorn
-request = HttpRequest.new(Logger.new($stderr))
-unless request.respond_to?(:reset)
-  def request.reset
-    # no-op
-  end
-end
-
-Benchmark.bmbm do |x|
-  x.report("small") do
-    for i in 1..nr
-      request.read(small)
-      request.reset
-    end
-  end
-  x.report("medium") do
-    for i in 1..nr
-      request.read(medium)
-      request.reset
-    end
-  end
-end

data/test/benchmark/response.rb

@@ -1,30 +0,0 @@
-require 'benchmark'
-require 'unicorn'
-
-class NullWriter
-  def syswrite(buf); buf.size; end
-  alias write syswrite
-  def close; end
-end
-
-include Unicorn
-
-socket = NullWriter.new
-bs = ENV['bs'] ? ENV['bs'].to_i : 4096
-count = ENV['count'] ? ENV['count'].to_i : 1
-slice = (' ' * bs).freeze
-body = (1..count).map { slice }.freeze
-hdr = {
-  'Content-Length' => (bs * count).to_s.freeze,
-  'Content-Type' => 'text/plain'.freeze
-}.freeze
-response = [ 200, hdr, body ].freeze
-
-nr = ENV['nr'] ? ENV['nr'].to_i : 100000
-Benchmark.bmbm do |x|
-  x.report do
-    for i in 1..nr
-      HttpResponse.write(socket.dup, response)
-    end
-  end
-end

data/test/unit/test_chunked_reader.rb

@@ -1,123 +0,0 @@
-require 'test/unit'
-require 'unicorn'
-require 'unicorn_http'
-require 'tempfile'
-require 'io/nonblock'
-require 'digest/sha1'
-
-class TestChunkedReader < Test::Unit::TestCase
-
-  def setup
-    @env = {}
-    @rd, @wr = IO.pipe
-    @rd.binmode
-    @wr.binmode
-    @rd.sync = @wr.sync = true
-    @start_pid = $$
-  end
-
-  def teardown
-    return if $$ != @start_pid
-    @rd.close rescue nil
-    @wr.close rescue nil
-    begin
-      Process.wait
-    rescue Errno::ECHILD
-      break
-    end while true
-  end
-
-  def test_error
-    cr = bin_reader("8\r\nasdfasdf\r\n8\r\nasdfasdfa#{'a' * 1024}")
-    a = nil
-    assert_nothing_raised { a = cr.readpartial(8192) }
-    assert_equal 'asdfasdf', a
-    assert_nothing_raised { a = cr.readpartial(8192) }
-    assert_equal 'asdfasdf', a
-    assert_raises(Unicorn::HttpParserError) { cr.readpartial(8192) }
-  end
-
-  def test_eof1
-    cr = bin_reader("0\r\n")
-    assert_raises(EOFError) { cr.readpartial(8192) }
-  end
-
-  def test_eof2
-    cr = bin_reader("0\r\n\r\n")
-    assert_raises(EOFError) { cr.readpartial(8192) }
-  end
-
-  def test_readpartial1
-    cr = bin_reader("4\r\nasdf\r\n0\r\n")
-    assert_equal 'asdf', cr.readpartial(8192)
-    assert_raises(EOFError) { cr.readpartial(8192) }
-  end
-
-  def test_dd
-    cr = bin_reader("6\r\nhello\n\r\n")
-    tmp = Tempfile.new('test_dd')
-    tmp.sync = true
-
-    pid = fork {
-      crd, cwr = IO.pipe
-      crd.binmode
-      cwr.binmode
-      crd.sync = cwr.sync = true
-
-      pid = fork {
-        STDOUT.reopen(cwr)
-        crd.close
-        cwr.close
-        exec('dd', 'if=/dev/urandom', 'bs=93390', 'count=16')
-      }
-      cwr.close
-      begin
-        buf = crd.readpartial(16384)
-        tmp.write(buf)
-        @wr.write("#{'%x' % buf.size}\r\n#{buf}\r\n")
-      rescue EOFError
-        @wr.write("0\r\n\r\n")
-        Process.waitpid(pid)
-        exit 0
-      end while true
-    }
-    assert_equal "hello\n", cr.readpartial(6)
-    sha1 = Digest::SHA1.new
-    buf = Unicorn::Z.dup
-    begin
-      cr.readpartial(16384, buf)
-      sha1.update(buf)
-    rescue EOFError
-      break
-    end while true
-
-    assert_nothing_raised { Process.waitpid(pid) }
-    sha1_file = Digest::SHA1.new
-    File.open(tmp.path, 'rb') { |fp|
-      while fp.read(16384, buf)
-        sha1_file.update(buf)
-      end
-    }
-    assert_equal sha1_file.hexdigest, sha1.hexdigest
-  end
-
-  def test_trailer
-    @env['HTTP_TRAILER'] = 'Content-MD5'
-    pid = fork { @wr.syswrite("Content-MD5: asdf\r\n") }
-    cr = bin_reader("8\r\nasdfasdf\r\n8\r\nasdfasdf\r\n0\r\n")
-    assert_equal 'asdfasdf', cr.readpartial(4096)
-    assert_equal 'asdfasdf', cr.readpartial(4096)
-    assert_raises(EOFError) { cr.readpartial(4096) }
-    pid, status = Process.waitpid2(pid)
-    assert status.success?
-    assert_equal 'asdf', @env['HTTP_CONTENT_MD5']
-  end
-
-private
-
-  def bin_reader(buf)
-    buf.force_encoding(Encoding::BINARY) if buf.respond_to?(:force_encoding)
-    Unicorn::ChunkedReader.new(@env, @rd, buf)
-  end
-
-end

data/test/unit/test_trailer_parser.rb

@@ -1,52 +0,0 @@
-require 'test/unit'
-require 'unicorn'
-require 'unicorn_http'
-require 'unicorn/trailer_parser'
-
-class TestTrailerParser < Test::Unit::TestCase
-
-  def test_basic
-    tp = Unicorn::TrailerParser.new('Content-MD5')
-    env = {}
-    assert ! tp.execute!(env, "Content-MD5: asdf")
-    assert env.empty?
-    assert tp.execute!(env, "Content-MD5: asdf\r\n")
-    assert_equal 'asdf', env['HTTP_CONTENT_MD5']
-    assert_equal 1, env.size
-  end
-
-  def test_invalid_trailer
-    tp = Unicorn::TrailerParser.new('Content-MD5')
-    env = {}
-    assert_raises(Unicorn::HttpParserError) {
-      tp.execute!(env, "Content-MD: asdf\r\n")
-    }
-    assert env.empty?
-  end
-
-  def test_multiple_trailer
-    tp = Unicorn::TrailerParser.new('Foo,Bar')
-    env = {}
-    buf = "Bar: a\r\nFoo: b\r\n"
-    assert tp.execute!(env, buf)
-    assert_equal 'a', env['HTTP_BAR']
-    assert_equal 'b', env['HTTP_FOO']
-  end
-
-  def test_too_big_key
-    tp = Unicorn::TrailerParser.new('Foo,Bar')
-    env = {}
-    buf = "Bar#{'a' * 1024}: a\r\nFoo: b\r\n"
-    assert_raises(Unicorn::HttpParserError) { tp.execute!(env, buf) }
-    assert env.empty?
-  end
-
-  def test_too_big_value
-    tp = Unicorn::TrailerParser.new('Foo,Bar')
-    env = {}
-    buf = "Bar: #{'a' * (1024 * 1024)}: a\r\nFoo: b\r\n"
-    assert_raises(Unicorn::HttpParserError) { tp.execute!(env, buf) }
-    assert env.empty?
-  end
-
-end