unicorn 0.93.1 → 0.93.2

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v0.93.1.GIT
+DEF_VER=v0.93.2.GIT
 
 LF='
 '

data/GNUmakefile

@@ -169,6 +169,7 @@ atom = <link rel="alternate" title="Atom feed" href="$(1)" \
 doc: .document $(ext)/unicorn_http.c NEWS ChangeLog
 	for i in $(man1_bins); do > $$i; done
 	rdoc -Na -t "$(shell sed -ne '1s/^= //p' README)"
+	install -m644 COPYING doc/COPYING
 	install -m644 $(shell grep '^[A-Z]' .document)  doc/
 	$(MAKE) -C Documentation install-html install-man
 	install -m644 $(man1_paths) doc/

data/LICENSE

@@ -1,6 +1,6 @@
-Unicorn is copyrighted free software by Eric Wong
-(mailto:normalperson@yhbt.net) and contributors. You can redistribute it
-and/or modify it under either the terms of the
+Unicorn is copyrighted free software by all contributors, see logs in
+revision control for names and email addresses of all of them.  You can
+redistribute it and/or modify it under either the terms of the
 {GPL2}[http://www.gnu.org/licenses/gpl-2.0.txt] (see link:COPYING) or
 the conditions below:
 

data/README

@@ -59,7 +59,7 @@ both the the request and response in between Unicorn and slow clients.
 
 == License
 
-Unicorn is copyright 2009 Eric Wong and contributors.
+Unicorn is copyright 2009 by all contributors (see logs in git).
 It is based on Mongrel and carries the same license.
 
 Mongrel is copyright 2007 Zed A. Shaw and contributors. It is licensed

data/Rakefile

@@ -73,7 +73,7 @@ task :news_rdoc do
     puts ""
 
     body = tag[:body]
-    puts tag[:body].gsub(/^/sm, "  ").gsub!(/[ \t]+$/sm, "")
+    puts tag[:body].gsub(/^/sm, "  ").gsub(/[ \t]+$/sm, "")
     puts ""
   end
 end

data/TODO

@@ -1,5 +1,3 @@
 * Documentation improvements
 
 * launchers - add --kill switch to allow DRY pid file path definition
-
-* Rainbows! (http://article.gmane.org/gmane.comp.lang.ruby.unicorn.general/22)

data/lib/unicorn.rb

@@ -53,6 +53,27 @@ module Unicorn
 
     # We populate this at startup so we can figure out how to reexecute
     # and upgrade the currently running instance of Unicorn
+    # This Hash is considered a stable interface and changing its contents
+    # will allow you to switch between different installations of Unicorn
+    # or even different installations of the same applications without
+    # downtime.  Keys of this constant Hash are described as follows:
+    #
+    # * 0 - the path to the unicorn/unicorn_rails executable
+    # * :argv - a deep copy of the ARGV array the executable originally saw
+    # * :cwd - the working directory of the application, this is where
+    # you originally started Unicorn.
+    #
+    # The following example may be used in your Unicorn config file to
+    # change your working directory during a config reload (HUP) without
+    # upgrading or restarting:
+    #
+    #   Dir.chdir(Unicorn::HttpServer::START_CTX[:cwd] = path)
+    #
+    # To change your unicorn executable to a different path without downtime,
+    # you can set the following in your Unicorn config file, HUP and then
+    # continue with the traditional USR2 + QUIT upgrade steps:
+    #
+    #   Unicorn::HttpServer::START_CTX[0] = "/home/bofh/1.9.2/bin/unicorn"
     START_CTX = {
       :argv => ARGV.map { |arg| arg.dup },
       # don't rely on Dir.pwd here since it's not symlink-aware, and

data/lib/unicorn/const.rb

@@ -7,7 +7,7 @@ module Unicorn
   # gave about a 3% to 10% performance improvement over using the strings directly.
   # Symbols did not really improve things much compared to constants.
   module Const
-    UNICORN_VERSION="0.93.1"
+    UNICORN_VERSION="0.93.2"
 
     DEFAULT_HOST = "0.0.0.0" # default TCP listen host address
     DEFAULT_PORT = 8080      # default TCP listen port

data/lib/unicorn/tee_input.rb

@@ -41,6 +41,26 @@ module Unicorn
       @size = tmp_size
     end
 
+    # call-seq:
+    #   ios = env['rack.input']
+    #   ios.read([length [, buffer ]]) => string, buffer, or nil
+    #
+    # Reads at most length bytes from the I/O stream, or to the end of
+    # file if length is omitted or is nil. length must be a non-negative
+    # integer or nil. If the optional buffer argument is present, it
+    # must reference a String, which will receive the data.
+    #
+    # At end of file, it returns nil or "" depend on length.
+    # ios.read() and ios.read(nil) returns "".
+    # ios.read(length [, buffer]) returns nil.
+    #
+    # If the Content-Length of the HTTP request is known (as is the common
+    # case for POST requests), then ios.read(length [, buffer]) will block
+    # until the specified length is read (or it is the last chunk).
+    # Otherwise, for uncommon "Transfer-Encoding: chunked" requests,
+    # ios.read(length [, buffer]) will return immediately if there is
+    # any data and only block when nothing is available (providing
+    # IO#readpartial semantics).
     def read(*args)
       socket or return @tmp.read(*args)
 
@@ -55,9 +75,9 @@ module Unicorn
         rv = args.shift || @buf2.dup
         diff = tmp_size - @tmp.pos
         if 0 == diff
-          tee(length, rv)
+          ensure_length(tee(length, rv), length)
         else
-          @tmp.read(diff > length ? length : diff, rv)
+          ensure_length(@tmp.read(diff > length ? length : diff, rv), length)
         end
       end
     end
@@ -130,5 +150,24 @@ module Unicorn
       StringIO === @tmp ? @tmp.size : @tmp.stat.size
     end
 
+    # tee()s into +buf+ until it is of +length+ bytes (or until
+    # we've reached the Content-Length of the request body).
+    # Returns +buf+ (the exact object, not a duplicate)
+    # To continue supporting applications that need near-real-time
+    # streaming input bodies, this is a no-op for
+    # "Transfer-Encoding: chunked" requests.
+    def ensure_length(buf, length)
+      # @size is nil for chunked bodies, so we can't ensure length for those
+      # since they could be streaming bidirectionally and we don't want to
+      # block the caller in that case.
+      return buf if buf.nil? || @size.nil?
+
+      while buf.size < length && @size != @tmp.pos
+        buf << tee(length - buf.size, @buf2)
+      end
+
+      buf
+    end
+
   end
 end

data/test/unit/test_tee_input.rb

@@ -104,6 +104,22 @@ class TestTeeInput < Test::Unit::TestCase
     assert_equal Unicorn::Const::MAX_BODY + 1, ti.size
   end
 
+  def test_read_in_full_if_content_length
+    a, b = 300, 3
+    init_parser('.' * b, 300)
+    assert_equal 300, @parser.content_length
+    ti = Unicorn::TeeInput.new(@rd, @env, @parser, @buf)
+    pid = fork {
+      @wr.write('.' * 197)
+      sleep 1 # still a *potential* race here that would make the test moot...
+      @wr.write('.' * 100)
+    }
+    assert_equal a, ti.read(a).size
+    _, status = Process.waitpid2(pid)
+    assert status.success?
+    @wr.close
+  end
+
   def test_big_body_multi
     init_parser('.', Unicorn::Const::MAX_BODY + 1)
     ti = Unicorn::TeeInput.new(@rd, @env, @parser, @buf)
@@ -167,6 +183,36 @@ class TestTeeInput < Test::Unit::TestCase
     assert status.success?
   end
 
+  def test_chunked_ping_pong
+    @parser = Unicorn::HttpParser.new
+    @buf = "POST / HTTP/1.1\r\n" \
+           "Host: localhost\r\n" \
+           "Transfer-Encoding: chunked\r\n" \
+           "\r\n"
+    assert_equal @env, @parser.headers(@env, @buf)
+    assert_equal "", @buf
+    chunks = %w(aa bbb cccc dddd eeee)
+    rd, wr = IO.pipe
+
+    pid = fork {
+      chunks.each do |chunk|
+        rd.read(1) == "." and
+          @wr.write("#{'%x' % [ chunk.size]}\r\n#{chunk}\r\n")
+      end
+      @wr.write("0\r\n")
+    }
+    ti = Unicorn::TeeInput.new(@rd, @env, @parser, @buf)
+    assert_nil @parser.content_length
+    assert_nil ti.instance_eval { @size }
+    assert ! @parser.body_eof?
+    chunks.each do |chunk|
+      wr.write('.')
+      assert_equal chunk, ti.read(16384)
+    end
+    _, status = Process.waitpid2(pid)
+    assert status.success?
+  end
+
 private
 
   def init_parser(body, size = nil)

data/unicorn.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.name = %q{unicorn}
   s.version = ENV["VERSION"]
 
-  s.authors = ["Eric Wong"]
+  s.authors = ["Unicorn developers"]
   s.date = Time.now.utc.strftime('%Y-%m-%d')
   s.description = File.read("README").split(/\n\n/)[1]
   s.email = %q{mongrel-unicorn@rubyforge.org}

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: unicorn
 version: !ruby/object:Gem::Version 
-  version: 0.93.1
+  version: 0.93.2
 platform: ruby
 authors: 
-- Eric Wong
+- Unicorn developers
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-10-03 00:00:00 -07:00
+date: 2009-10-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency