unicorn 0.92.0 → 0.93.0

data/lib/unicorn/const.rb

@@ -7,10 +7,10 @@ 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.92.0"
+    UNICORN_VERSION="0.93.0"
 
     DEFAULT_HOST = "0.0.0.0" # default TCP listen host address
-    DEFAULT_PORT = "8080"    # default TCP listen port
+    DEFAULT_PORT = 8080      # default TCP listen port
     DEFAULT_LISTEN = "#{DEFAULT_HOST}:#{DEFAULT_PORT}"
 
     # The basic max request size we'll try to read.

data/lib/unicorn/http_request.rb

@@ -19,7 +19,7 @@ module Unicorn
       "SERVER_SOFTWARE" => "Unicorn #{Const::UNICORN_VERSION}"
     }
 
-    NULL_IO = StringIO.new(Z)
+    NULL_IO = StringIO.new("")
     LOCALHOST = '127.0.0.1'
 
     # Being explicitly single-threaded, we have certain advantages in
@@ -56,24 +56,15 @@ module Unicorn
                     TCPSocket === socket ? socket.peeraddr.last : LOCALHOST
 
       # short circuit the common case with small GET requests first
-      PARSER.headers(REQ, socket.readpartial(Const::CHUNK_SIZE, BUF)) and
-          return handle_body(socket)
+      if PARSER.headers(REQ, socket.readpartial(Const::CHUNK_SIZE, BUF)).nil?
+        data = BUF.dup # socket.readpartial will clobber data
 
-      data = BUF.dup # socket.readpartial will clobber data
-
-      # Parser is not done, queue up more data to read and continue parsing
-      # an Exception thrown from the PARSER will throw us out of the loop
-      begin
-        BUF << socket.readpartial(Const::CHUNK_SIZE, data)
-        PARSER.headers(REQ, BUF) and return handle_body(socket)
-      end while true
-    end
-
-    private
-
-    # Handles dealing with the rest of the request
-    # returns a # Rack environment if successful
-    def handle_body(socket)
+        # Parser is not done, queue up more data to read and continue parsing
+        # an Exception thrown from the PARSER will throw us out of the loop
+        begin
+          BUF << socket.readpartial(Const::CHUNK_SIZE, data)
+        end while PARSER.headers(REQ, BUF).nil?
+      end
       REQ[Const::RACK_INPUT] = 0 == PARSER.content_length ?
                    NULL_IO : Unicorn::TeeInput.new(socket, REQ, PARSER, BUF)
       REQ.update(DEFAULTS)

data/lib/unicorn/http_response.rb

@@ -33,39 +33,37 @@ module Unicorn
     # Connection: and Date: headers no matter what (if anything) our
     # Rack application sent us.
     SKIP = { 'connection' => true, 'date' => true, 'status' => true }
-    OUT = [] # :nodoc
 
-    def self.write_header(socket, status, headers)
-      status = CODES[status.to_i] || status
-      OUT.clear
+    # writes the rack_response to socket as an HTTP response
+    def self.write(socket, rack_response, have_header = true)
+      status, headers, body = rack_response
 
-      # Don't bother enforcing duplicate supression, it's a Hash most of
-      # the time anyways so just hope our app knows what it's doing
-      headers.each do |key, value|
-        next if SKIP.include?(key.downcase)
-        if value =~ /\n/
-          value.split(/\n/).each { |v| OUT << "#{key}: #{v}\r\n" }
-        else
-          OUT << "#{key}: #{value}\r\n"
-        end
-      end
+      if have_header
+        status = CODES[status.to_i] || status
+        out = []
 
-      # Rack should enforce Content-Length or chunked transfer encoding,
-      # so don't worry or care about them.
-      # Date is required by HTTP/1.1 as long as our clock can be trusted.
-      # Some broken clients require a "Status" header so we accomodate them
-      socket.write("HTTP/1.1 #{status}\r\n" \
-                   "Date: #{Time.now.httpdate}\r\n" \
-                   "Status: #{status}\r\n" \
-                   "Connection: close\r\n" \
-                   "#{OUT.join(Z)}\r\n")
+        # Don't bother enforcing duplicate supression, it's a Hash most of
+        # the time anyways so just hope our app knows what it's doing
+        headers.each do |key, value|
+          next if SKIP.include?(key.downcase)
+          if value =~ /\n/
+            out.concat(value.split(/\n/).map! { |v| "#{key}: #{v}\r\n" })
+          else
+            out << "#{key}: #{value}\r\n"
+          end
+        end
 
-    end
+        # Rack should enforce Content-Length or chunked transfer encoding,
+        # so don't worry or care about them.
+        # Date is required by HTTP/1.1 as long as our clock can be trusted.
+        # Some broken clients require a "Status" header so we accomodate them
+        socket.write("HTTP/1.1 #{status}\r\n" \
+                     "Date: #{Time.now.httpdate}\r\n" \
+                     "Status: #{status}\r\n" \
+                     "Connection: close\r\n" \
+                     "#{out.join('')}\r\n")
+      end
 
-    # writes the rack_response to socket as an HTTP response
-    def self.write(socket, rack_response, have_header = true)
-      status, headers, body = rack_response
-      write_header(socket, status, headers) if have_header
       body.each { |chunk| socket.write(chunk) }
       socket.close # flushes and uncorks the socket immediately
       ensure

data/lib/unicorn/socket_helper.rb

@@ -76,7 +76,7 @@ module Unicorn
     def bind_listen(address = '0.0.0.0:8080', opt = {})
       return address unless String === address
 
-      sock = if address[0..0] == "/"
+      sock = if address[0] == ?/
         if File.exist?(address)
           if File.socket?(address)
             if self.respond_to?(:logger)

data/lib/unicorn/tee_input.rb

@@ -15,7 +15,7 @@ module Unicorn
     def initialize(*args)
       super(*args)
       @size = parser.content_length
-      @tmp = @size && @size < Const::MAX_BODY ? StringIO.new(Z.dup) : Util.tmpio
+      @tmp = @size && @size < Const::MAX_BODY ? StringIO.new("") : Util.tmpio
       @buf2 = buf.dup
       if buf.size > 0
         parser.filter_body(@buf2, buf) and finalize_input
@@ -46,7 +46,7 @@ module Unicorn
 
       length = args.shift
       if nil == length
-        rv = @tmp.read || Z.dup
+        rv = @tmp.read || ""
         while tee(Const::CHUNK_SIZE, @buf2)
           rv << @buf2
         end

data/lib/unicorn/util.rb

@@ -7,8 +7,6 @@ module Unicorn
   class Util
     class << self
 
-      APPEND_FLAGS = File::WRONLY | File::APPEND
-
       # This reopens ALL logfiles in the process that have been rotated
       # using logrotate(8) (without copytruncate) or similar tools.
       # A +File+ object is considered for reopening if it is:
@@ -19,10 +17,12 @@ module Unicorn
       # Returns the number of files reopened
       def reopen_logs
         nr = 0
+        append_flags = File::WRONLY | File::APPEND
+
         ObjectSpace.each_object(File) do |fp|
           next if fp.closed?
           next unless (fp.sync && fp.path[0..0] == "/")
-          next unless (fp.fcntl(Fcntl::F_GETFL) & APPEND_FLAGS) == APPEND_FLAGS
+          next unless (fp.fcntl(Fcntl::F_GETFL) & append_flags) == append_flags
 
           begin
             a, b = fp.stat, File.stat(fp.path)

data/local.mk.sample

@@ -27,12 +27,19 @@ test-18:
 test-19:
 	$(MAKE) test test-rails r19=1 2>&1 | sed -u -e 's!^!1.9 !'
 
+latest: NEWS
+	@awk 'BEGIN{RS="=== ";ORS=""}NR==2{sub(/\n$$/,"");print RS""$$0 }' < $<
+
 # publishes docs to http://unicorn.bogomips.org
 publish_doc:
 	-git set-file-times
+	$(RM) -r doc
 	$(MAKE) doc
-	awk 'BEGIN{RS="=== ";ORS=""}NR==2{ print RS""$$0 }' NEWS > doc/LATEST
+	$(MAKE) -s latest > doc/LATEST
+	find doc/images doc/js -type f | \
+		TZ=UTC xargs touch -d '1970-01-01 00:00:00' doc/rdoc.css
 	$(MAKE) doc_gz
+	chmod 644 $$(find doc -type f)
 	rsync -av --delete doc/ dcvr:/srv/unicorn/
 	git ls-files | xargs touch
 

data/test/exec/test_exec.rb

@@ -728,7 +728,7 @@ end
       }
     }
     sleep 1 # racy
-    daemon_pid = pid_file.read.to_i
+    daemon_pid = File.read(pid_file.path).to_i
     assert daemon_pid > 0
     Process.kill(:HUP, daemon_pid)
     sleep 1 # racy

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

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

data/test/rails/test_rails.rb

@@ -231,6 +231,31 @@ logger Logger.new('#{COMMON_TMP.path}')
     assert_equal '404 Not Found', res['Status']
   end
 
+  def test_alt_url_root_config_env
+    # cbf to actually work on this since I never use this feature (ewong)
+    return unless ROR_V[0] >= 2 && ROR_V[1] >= 3
+    tmp = Tempfile.new(nil)
+    tmp.syswrite("ENV['RAILS_RELATIVE_URL_ROOT'] = '/poo'\n")
+    redirect_test_io do
+      @pid = fork { exec 'unicorn_rails', "-l#@addr:#@port", "-c", tmp.path }
+    end
+    wait_master_ready("test_stderr.#$$.log")
+    res = Net::HTTP.get_response(URI.parse("http://#@addr:#@port/poo/foo"))
+    assert_equal "200", res.code
+    assert_equal '200 OK', res['Status']
+    assert_equal "FOO\n", res.body
+    assert_match %r{^text/html\b}, res['Content-Type']
+    assert_equal "4", res['Content-Length']
+
+    res = Net::HTTP.get_response(URI.parse("http://#@addr:#@port/foo"))
+    assert_equal "404", res.code
+    assert_equal '404 Not Found', res['Status']
+
+    res = Net::HTTP.get_response(URI.parse("http://#@addr:#@port/poo/x.txt"))
+    assert_equal "200", res.code
+    assert_equal "HELLO\n", res.body
+  end
+
   def teardown
     return if @start_pid != $$
 

data/test/test_helper.rb

@@ -104,10 +104,8 @@ def unused_port(addr = '127.0.0.1')
   begin
     begin
       port = base + rand(32768 - base)
-      if addr == Unicorn::Const::DEFAULT_HOST
-        while port == Unicorn::Const::DEFAULT_PORT
-          port = base + rand(32768 - base)
-        end
+      while port == Unicorn::Const::DEFAULT_PORT
+        port = base + rand(32768 - base)
       end
 
       sock = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)

data/test/unit/test_configurator.rb

@@ -99,6 +99,36 @@ class TestConfigurator < Test::Unit::TestCase
     end
   end
 
+  def test_listen_option_bad_delay
+    tmp = Tempfile.new('unicorn_config')
+    expect = { :delay => "five" }
+    listener = "127.0.0.1:12345"
+    tmp.syswrite("listen '#{listener}', #{expect.inspect}\n")
+    assert_raises(ArgumentError) do
+      Unicorn::Configurator.new(:config_file => tmp.path)
+    end
+  end
+
+  def test_listen_option_float_delay
+    tmp = Tempfile.new('unicorn_config')
+    expect = { :delay => 0.5 }
+    listener = "127.0.0.1:12345"
+    tmp.syswrite("listen '#{listener}', #{expect.inspect}\n")
+    assert_nothing_raised do
+      Unicorn::Configurator.new(:config_file => tmp.path)
+    end
+  end
+
+  def test_listen_option_int_delay
+    tmp = Tempfile.new('unicorn_config')
+    expect = { :delay => 5 }
+    listener = "127.0.0.1:12345"
+    tmp.syswrite("listen '#{listener}', #{expect.inspect}\n")
+    assert_nothing_raised do
+      Unicorn::Configurator.new(:config_file => tmp.path)
+    end
+  end
+
   def test_after_fork_proc
     test_struct = TestStruct.new
     [ proc { |a,b| }, Proc.new { |a,b| }, lambda { |a,b| } ].each do |my_proc|

data/test/unit/test_signals.rb

@@ -141,6 +141,7 @@ class SignalsTest < Test::Unit::TestCase
       pid = buf[/\r\nX-Pid: (\d+)\r\n/, 1].to_i
       header_len = buf[/\A(.+?\r\n\r\n)/m, 1].size
     end
+    assert pid > 0, "pid not positive: #{pid.inspect}"
     read = buf.size
     mode_before = @tmp.stat.mode
     assert_raises(EOFError,Errno::ECONNRESET,Errno::EPIPE,Errno::EINVAL,
@@ -177,6 +178,7 @@ class SignalsTest < Test::Unit::TestCase
       sock.close
     end
 
+    assert pid > 0, "pid not positive: #{pid.inspect}"
     sock = TCPSocket.new('127.0.0.1', @port)
     sock.syswrite("PUT / HTTP/1.0\r\n")
     sock.syswrite("Content-Length: #{@bs * @count}\r\n\r\n")

data/unicorn.gemspec

@@ -3,19 +3,20 @@
 ENV["VERSION"] or abort "VERSION= must be specified"
 manifest = File.readlines('.manifest').map! { |x| x.chomp! }
 
+# don't bother with tests that fork, not worth our time to get working
+# with `gem check -t` ... (of course we care for them when testing with
+# GNU make when they can run in parallel)
+test_files = manifest.grep(%r{\Atest/unit/test_.*\.rb\z}).map do |f|
+  File.readlines(f).grep(/\bfork\b/).empty? ? f : nil
+end.compact
+
 Gem::Specification.new do |s|
   s.name = %q{unicorn}
   s.version = ENV["VERSION"]
 
   s.authors = ["Eric Wong"]
   s.date = Time.now.utc.strftime('%Y-%m-%d')
-
-  s.description = %q{
-HTTP server for Rack applications designed to take advantage of features
-in Unix/Unix-like operating systems and serve low-latency, high-bandwidth
-clients (such as a buffering reverse proxy server).
-}.strip
-
+  s.description = File.read("README").split(/\n\n/)[1]
   s.email = %q{mongrel-unicorn@rubyforge.org}
   s.executables = %w(unicorn unicorn_rails)
   s.extensions = %w(ext/unicorn_http/extconf.rb)
@@ -39,8 +40,10 @@ clients (such as a buffering reverse proxy server).
   s.require_paths = %w(lib ext)
   s.rubyforge_project = %q{mongrel}
   s.summary = %q{Rack HTTP server for Unix and fast clients}
-  s.test_files = manifest.grep(%r{\Atest/unit/test_*\.rb\z})
+
+  s.test_files = test_files
 
   s.add_dependency(%q<rack>)
-  s.licenses = %w(GPLv2 Ruby)
+
+  # 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.92.0
+  version: 0.93.0
 platform: ruby
 authors: 
 - Eric Wong
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-18 00:00:00 -07:00
+date: 2009-10-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,9 +23,11 @@ dependencies:
         version: "0"
     version: 
 description: |-
-  HTTP server for Rack applications designed to take advantage of features
-  in Unix/Unix-like operating systems and serve low-latency, high-bandwidth
-  clients (such as a buffering reverse proxy server).
+  Unicorn is a HTTP server for Rack applications designed to take
+  advantage of features in Unix/Unix-like kernels and only serve fast
+  clients on low-latency, high-bandwidth connections.  Slow clients should
+  only be served by placing a reverse proxy capable of fully-buffering
+  both the the request and response in between Unicorn and slow clients.
 email: mongrel-unicorn@rubyforge.org
 executables: 
 - unicorn
@@ -36,10 +38,12 @@ extra_rdoc_files:
 - README
 - TUNING
 - PHILOSOPHY
+- HACKING
 - DESIGN
 - CONTRIBUTORS
 - LICENSE
 - SIGNALS
+- KNOWN_ISSUES
 - TODO
 - NEWS
 - ChangeLog
@@ -75,6 +79,8 @@ files:
 - GIT-VERSION-FILE
 - GIT-VERSION-GEN
 - GNUmakefile
+- HACKING
+- KNOWN_ISSUES
 - LICENSE
 - NEWS
 - PHILOSOPHY
@@ -111,6 +117,8 @@ files:
 - lib/unicorn/tee_input.rb
 - lib/unicorn/util.rb
 - local.mk.sample
+- man/man1/unicorn.1
+- man/man1/unicorn_rails.1
 - setup.rb
 - test/aggregate.rb
 - test/benchmark/README
@@ -192,6 +200,7 @@ files:
 - test/rails/app-2.3.3.1/log/.gitignore
 - test/rails/app-2.3.3.1/public/404.html
 - test/rails/app-2.3.3.1/public/500.html
+- test/rails/app-2.3.3.1/public/x.txt
 - test/rails/test_rails.rb
 - test/test_helper.rb
 - test/unit/test_configurator.rb
@@ -208,9 +217,8 @@ files:
 - unicorn.gemspec
 has_rdoc: true
 homepage: http://unicorn.bogomips.org/
-licenses: 
-- GPLv2
-- Ruby
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - -Na
@@ -238,5 +246,11 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Rack HTTP server for Unix and fast clients
-test_files: []
-
+test_files: 
+- test/unit/test_configurator.rb
+- test/unit/test_http_parser.rb
+- test/unit/test_http_parser_ng.rb
+- test/unit/test_request.rb
+- test/unit/test_response.rb
+- test/unit/test_server.rb
+- test/unit/test_util.rb