unicorn 0.5.1 → 0.5.2

data/CHANGELOG

@@ -1,3 +1,4 @@
+v0.5.2 - force Status: header for compat, small cleanups
 v0.5.1 - exit correctly on INT/TERM, QUIT is still recommended, however
 v0.5.0 - {after,before}_fork API change, small tweaks/fixes
 v0.4.2 - fix Rails ARStore, FD leak prevention, descriptive proctitles

data/GNUmakefile

@@ -32,23 +32,23 @@ inst_deps := $(wildcard bin/*) $(wildcard lib/*.rb) \
 
 ext/unicorn/http11/http11_parser.c: ext/unicorn/http11/http11_parser.rl
 	cd $(@D) && ragel $(<F) -C -G2 -o $(@F)
-ext/unicorn/http11/Makefile: ext/unicorn/http11/extconf.rb
+ext/unicorn/http11/Makefile: ext/unicorn/http11/extconf.rb $(http11_deps)
 	cd $(@D) && $(ruby) $(<F)
-ext/unicorn/http11/http11.$(DLEXT): $(http11_deps) ext/unicorn/http11/Makefile
+ext/unicorn/http11/http11.$(DLEXT): ext/unicorn/http11/Makefile
 	$(MAKE) -C $(@D)
 lib/unicorn/http11.$(DLEXT): ext/unicorn/http11/http11.$(DLEXT)
 	@mkdir -p lib
 	install -m644 $< $@
 http11: lib/unicorn/http11.$(DLEXT)
 
-$(test_prefix)/.stamp: $(inst_deps)
-	$(MAKE) clean-http11
-	$(MAKE) install-test
+$(test_prefix)/.stamp: install-test
 	> $@
 
-install-test:
+install-test: $(inst_deps)
+	test -n "$(test_prefix)"
 	mkdir -p $(test_prefix)/.ccache
 	tar c bin ext lib GNUmakefile | (cd $(test_prefix) && tar x)
+	$(MAKE) -C $(test_prefix) clean
 	$(MAKE) -C $(test_prefix) http11 shebang
 
 # this is only intended to be run within $(test_prefix)
@@ -62,7 +62,7 @@ test: $(T) $(T_n)
 
 test-exec: $(wildcard test/exec/test_*.rb)
 test-unit: $(wildcard test/unit/test_*.rb)
-$(slow_tests):
+$(slow_tests): $(test_prefix)/.stamp
 	@$(MAKE) $(shell $(awk_slow) $@)
 
 TEST_OPTS = -v

data/ext/unicorn/http11/http11.c

@@ -40,6 +40,7 @@ static VALUE global_server_protocol_value;
 static VALUE global_http_host;
 static VALUE global_http_x_forwarded_proto;
 static VALUE global_port_80;
+static VALUE global_port_443;
 static VALUE global_localhost;
 static VALUE global_http;
 
@@ -243,40 +244,36 @@ static void http_version(void *data, const char *at, size_t length)
   rb_hash_aset(req, global_http_version, val);
 }
 
-/** Finalizes the request header to have a bunch of stuff that's
-  needed. */
-
+/** Finalizes the request header to have a bunch of stuff that's needed. */
 static void header_done(void *data, const char *at, size_t length)
 {
   VALUE req = (VALUE)data;
-  VALUE temp = Qnil;
-  char *colon = NULL;
+  VALUE server_name = global_localhost;
+  VALUE server_port = global_port_80;
+  VALUE temp;
 
   /* set rack.url_scheme to "https" or "http", no others are allowed by Rack */
-  temp = rb_hash_aref(req, global_http_x_forwarded_proto);
-  switch (temp == Qnil ? 0 : RSTRING_LEN(temp)) {
-  case 5: if (!memcmp("https", RSTRING_PTR(temp), 5)) break;
-  case 4: if (!memcmp("http", RSTRING_PTR(temp), 4)) break;
-  default: temp = global_http;
-  }
+  if ((temp = rb_hash_aref(req, global_http_x_forwarded_proto)) != Qnil &&
+      RSTRING_LEN(temp) == 5 &&
+      !memcmp("https", RSTRING_PTR(temp), 5))
+    server_port = global_port_443;
+  else
+    temp = global_http;
   rb_hash_aset(req, global_rack_url_scheme, temp);
 
-  /* set the SERVER_NAME and SERVER_PORT variables */
-  if((temp = rb_hash_aref(req, global_http_host)) != Qnil) {
-    colon = memchr(RSTRING_PTR(temp), ':', RSTRING_LEN(temp));
-    if(colon != NULL) {
-      rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING_PTR(temp)));
-      rb_hash_aset(req, global_server_port, 
-          rb_str_substr(temp, colon - RSTRING_PTR(temp)+1, 
-            RSTRING_LEN(temp)));
+  /* parse and set the SERVER_NAME and SERVER_PORT variables */
+  if ((temp = rb_hash_aref(req, global_http_host)) != Qnil) {
+    char *colon = memchr(RSTRING_PTR(temp), ':', RSTRING_LEN(temp));
+    if (colon) {
+      server_name = rb_str_substr(temp, 0, colon - RSTRING_PTR(temp));
+      server_port = rb_str_substr(temp, colon - RSTRING_PTR(temp)+1,
+                                  RSTRING_LEN(temp));
     } else {
-      rb_hash_aset(req, global_server_name, temp);
-      rb_hash_aset(req, global_server_port, global_port_80);
+      server_name = temp;
     }
-  } else {
-    rb_hash_aset(req, global_server_name, global_localhost);
-    rb_hash_aset(req, global_server_port, global_port_80);
   }
+  rb_hash_aset(req, global_server_name, server_name);
+  rb_hash_aset(req, global_server_port, server_port);
 
   /* grab the initial body and stuff it into the hash */
   rb_hash_aset(req, sym_http_body, rb_str_new(at, length));
@@ -402,6 +399,7 @@ void Init_http11()
   DEF_GLOBAL(http_host, "HTTP_HOST");
   DEF_GLOBAL(http_x_forwarded_proto, "HTTP_X_FORWARDED_PROTO");
   DEF_GLOBAL(port_80, "80");
+  DEF_GLOBAL(port_443, "443");
   DEF_GLOBAL(localhost, "localhost");
   DEF_GLOBAL(http, "http");
 

data/lib/unicorn.rb

@@ -52,7 +52,6 @@ module Unicorn
       @start_ctx = DEFAULT_START_CTX.dup
       @start_ctx.merge!(start_ctx) if start_ctx
       @app = app
-      @master_pid = $$
       @workers = Hash.new
       @io_purgatory = [] # prevents IO objects in here from being GC-ed
       @request = @rd_sig = @wr_sig = nil
@@ -193,9 +192,9 @@ module Unicorn
             stop(false)
             break
           when :USR1 # rotate logs
-            logger.info "master rotating logs..."
+            logger.info "master reopening logs..."
             Unicorn::Util.reopen_logs
-            logger.info "master done rotating logs"
+            logger.info "master done reopening logs"
             kill_each_worker(:USR1)
           when :USR2 # exec binary, stay alive in case something went wrong
             reexec
@@ -353,7 +352,7 @@ module Unicorn
           io.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
         end
         logger.info "executing #{cmd.inspect} (in #{Dir.pwd})"
-        @before_exec.call(self) if @before_exec
+        @before_exec.call(self)
         exec(*cmd)
       end
       proc_name 'master (old)'
@@ -438,7 +437,7 @@ module Unicorn
       @start_ctx = @workers = @rd_sig = @wr_sig = nil
       @listeners.each { |sock| sock.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) }
       worker.tempfile.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
-      @after_fork.call(self, worker) if @after_fork # can drop perms
+      @after_fork.call(self, worker) # can drop perms
       @request = HttpRequest.new(logger)
       build_app! unless @preload_app
     end
@@ -447,28 +446,27 @@ module Unicorn
     # for connections and doesn't die until the parent dies (or is
     # given a INT, QUIT, or TERM signal)
     def worker_loop(worker)
+      master_pid = Process.ppid # slightly racy, but less memory usage
       init_worker_process(worker)
-      nr = 0
+      nr = 0 # this becomes negative if we need to reopen logs
       tempfile = worker.tempfile
-      alive = true
       ready = @listeners
       client = nil
-      trap(:QUIT) do
-        alive = false # graceful shutdown
-        @listeners.each { |sock| sock.close rescue nil } # break IO.select
-      end
-      reopen_logs, (rd, wr) = false, IO.pipe
+      rd, wr = IO.pipe
       rd.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
       wr.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
-      trap(:USR1) { reopen_logs = true; rd.close rescue nil } # break IO.select
+
+      # closing anything we IO.select on will raise EBADF
+      trap(:USR1) { nr = -65536; rd.close rescue nil }
+      trap(:QUIT) { @listeners.each { |sock| sock.close rescue nil } }
+      [:TERM, :INT].each { |sig| trap(sig) { exit(0) } } # instant shutdown
       @logger.info "worker=#{worker.nr} ready"
 
-      while alive && @master_pid == Process.ppid
-        if reopen_logs
-          reopen_logs = false
-          @logger.info "worker=#{worker.nr} rotating logs..."
+      while master_pid == Process.ppid
+        if nr < 0
+          @logger.info "worker=#{worker.nr} reopening logs..."
           Unicorn::Util.reopen_logs
-          @logger.info "worker=#{worker.nr} done rotating logs"
+          @logger.info "worker=#{worker.nr} done reopening logs"
           wr.close rescue nil
           rd, wr = IO.pipe
           rd.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
@@ -480,11 +478,11 @@ module Unicorn
         # prefer temporary files to be unlinked for security,
         # performance and reliability reasons, so utime is out.  No-op
         # changes with chmod doesn't update ctime on all filesystems; so
-        # we increment our counter each and every time.
-        tempfile.chmod(nr += 1)
+        # we change our counter each and every time (after process_client
+        # and before IO.select).
+        tempfile.chmod(nr = 0)
 
         begin
-          accepted = false
           ready.each do |sock|
             begin
               client = begin
@@ -492,22 +490,22 @@ module Unicorn
               rescue Errno::EAGAIN
                 next
               end
-              accepted = true
               process_client(client)
             rescue Errno::ECONNABORTED
               # client closed the socket even before accept
               client.close rescue nil
+            ensure
+              tempfile.chmod(nr += 1)
+              break if nr < 0
             end
-            tempfile.chmod(nr += 1)
-            break if reopen_logs
           end
           client = nil
 
           # make the following bet: if we accepted clients this round,
-          # we're probably reasonably busy, so avoid calling select(2)
-          # and try to do a blind non-blocking accept(2) on everything
-          # before we sleep again in select
-          if accepted || reopen_logs
+          # we're probably reasonably busy, so avoid calling select()
+          # and do a speculative accept_nonblock on every listener
+          # before we sleep again in select().
+          if nr != 0 # (nr < 0) => reopen logs
             ready = @listeners
           else
             begin
@@ -518,7 +516,7 @@ module Unicorn
             rescue Errno::EINTR
               ready = @listeners
             rescue Errno::EBADF => e
-              reopen_logs or exit(alive ? 1 : 0)
+              nr < 0 or exit(@listeners[0].closed? ? 0 : 1)
             end
           end
         rescue SignalException, SystemExit => e

data/lib/unicorn/const.rb

@@ -4,43 +4,43 @@ module Unicorn
   # Every standard HTTP code mapped to the appropriate message.  These are
   # used so frequently that they are placed directly in Unicorn for easy
   # access rather than Unicorn::Const itself.
-  HTTP_STATUS_CODES = {  
-    100  => 'Continue', 
-    101  => 'Switching Protocols', 
-    200  => 'OK', 
-    201  => 'Created', 
-    202  => 'Accepted', 
-    203  => 'Non-Authoritative Information', 
-    204  => 'No Content', 
-    205  => 'Reset Content', 
-    206  => 'Partial Content', 
-    300  => 'Multiple Choices', 
-    301  => 'Moved Permanently', 
-    302  => 'Moved Temporarily', 
-    303  => 'See Other', 
-    304  => 'Not Modified', 
-    305  => 'Use Proxy', 
-    400  => 'Bad Request', 
-    401  => 'Unauthorized', 
-    402  => 'Payment Required', 
-    403  => 'Forbidden', 
-    404  => 'Not Found', 
-    405  => 'Method Not Allowed', 
-    406  => 'Not Acceptable', 
-    407  => 'Proxy Authentication Required', 
-    408  => 'Request Time-out', 
-    409  => 'Conflict', 
-    410  => 'Gone', 
-    411  => 'Length Required', 
-    412  => 'Precondition Failed', 
-    413  => 'Request Entity Too Large', 
-    414  => 'Request-URI Too Large', 
-    415  => 'Unsupported Media Type', 
-    500  => 'Internal Server Error', 
-    501  => 'Not Implemented', 
-    502  => 'Bad Gateway', 
-    503  => 'Service Unavailable', 
-    504  => 'Gateway Time-out', 
+  HTTP_STATUS_CODES = {
+    100  => 'Continue',
+    101  => 'Switching Protocols',
+    200  => 'OK',
+    201  => 'Created',
+    202  => 'Accepted',
+    203  => 'Non-Authoritative Information',
+    204  => 'No Content',
+    205  => 'Reset Content',
+    206  => 'Partial Content',
+    300  => 'Multiple Choices',
+    301  => 'Moved Permanently',
+    302  => 'Moved Temporarily',
+    303  => 'See Other',
+    304  => 'Not Modified',
+    305  => 'Use Proxy',
+    400  => 'Bad Request',
+    401  => 'Unauthorized',
+    402  => 'Payment Required',
+    403  => 'Forbidden',
+    404  => 'Not Found',
+    405  => 'Method Not Allowed',
+    406  => 'Not Acceptable',
+    407  => 'Proxy Authentication Required',
+    408  => 'Request Time-out',
+    409  => 'Conflict',
+    410  => 'Gone',
+    411  => 'Length Required',
+    412  => 'Precondition Failed',
+    413  => 'Request Entity Too Large',
+    414  => 'Request-URI Too Large',
+    415  => 'Unsupported Media Type',
+    500  => 'Internal Server Error',
+    501  => 'Not Implemented',
+    502  => 'Bad Gateway',
+    503  => 'Service Unavailable',
+    504  => 'Gateway Time-out',
     505  => 'HTTP Version not supported'
   }
 
@@ -53,12 +53,12 @@ module Unicorn
 
     # This is the part of the path after the SCRIPT_NAME.
     PATH_INFO="PATH_INFO".freeze
-    
+
     # The original URI requested by the client.
     REQUEST_URI='REQUEST_URI'.freeze
     REQUEST_PATH='REQUEST_PATH'.freeze
-    
-    UNICORN_VERSION="0.5.1".freeze
+
+    UNICORN_VERSION="0.5.2".freeze
 
     UNICORN_TMP_BASE="unicorn".freeze
 

data/lib/unicorn/http_response.rb

@@ -24,12 +24,16 @@ module Unicorn
     # Rack does not set/require a Date: header.  We always override the
     # Connection: and Date: headers no matter what (if anything) our
     # Rack application sent us.
-    SKIP = { 'connection' => true, 'date' => true }.freeze
+    SKIP = { 'connection' => true, 'date' => true, 'status' => true }.freeze
 
     # writes the rack_response to socket as an HTTP response
     def self.write(socket, rack_response)
       status, headers, body = rack_response
-      out = [ "Date: #{Time.now.httpdate}" ]
+      status = "#{status} #{HTTP_STATUS_CODES[status]}"
+
+      # 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
+      out = [ "Date: #{Time.now.httpdate}", "Status: #{status}" ]
 
       # 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
@@ -45,7 +49,7 @@ module Unicorn
       # Rack should enforce Content-Length or chunked transfer encoding,
       # so don't worry or care about them.
       socket_write(socket,
-                   "HTTP/1.1 #{status} #{HTTP_STATUS_CODES[status]}\r\n" \
+                   "HTTP/1.1 #{status}\r\n" \
                    "Connection: close\r\n" \
                    "#{out.join("\r\n")}\r\n\r\n")
       body.each { |chunk| socket_write(socket, chunk) }

data/test/exec/test_exec.rb

@@ -370,21 +370,21 @@ end
     tries = DEFAULT_TRIES
     log = File.readlines(rotate.path)
     while (tries -= 1) > 0 &&
-          log.grep(/rotating logs\.\.\./).size < 5
+          log.grep(/reopening logs\.\.\./).size < 5
       sleep DEFAULT_RES
       log = File.readlines(rotate.path)
     end
-    assert_equal 5, log.grep(/rotating logs\.\.\./).size
-    assert_equal 0, log.grep(/done rotating logs/).size
+    assert_equal 5, log.grep(/reopening logs\.\.\./).size
+    assert_equal 0, log.grep(/done reopening logs/).size
 
     tries = DEFAULT_TRIES
     log = File.readlines(COMMON_TMP.path)
-    while (tries -= 1) > 0 && log.grep(/done rotating logs/).size < 5
+    while (tries -= 1) > 0 && log.grep(/done reopening logs/).size < 5
       sleep DEFAULT_RES
       log = File.readlines(COMMON_TMP.path)
     end
-    assert_equal 5, log.grep(/done rotating logs/).size
-    assert_equal 0, log.grep(/rotating logs\.\.\./).size
+    assert_equal 5, log.grep(/done reopening logs/).size
+    assert_equal 0, log.grep(/reopening logs\.\.\./).size
     assert_nothing_raised { Process.kill(:QUIT, pid) }
     status = nil
     assert_nothing_raised { pid, status = Process.waitpid2(pid) }

data/test/unit/test_response.rb

@@ -54,6 +54,27 @@ class ResponseTest < Test::Unit::TestCase
     assert_match(/^X-Whatever: stuff\r\nX-Whatever: bleh\r\n/, out.string)
   end
 
+  # Even though Rack explicitly forbids "Status" in the header hash,
+  # some broken clients still rely on it
+  def test_status_header_added
+    out = StringIO.new
+    HttpResponse.write(out,[200, {"X-Whatever" => "stuff"}, []])
+    assert out.closed?
+    assert_match(/^Status: 200 OK\r\nX-Whatever: stuff\r\n/, out.string)
+  end
+
+  # we always favor the code returned by the application, since "Status"
+  # in the header hash is not allowed by Rack (but not every app is
+  # fully Rack-compliant).
+  def test_status_header_ignores_app_hash
+    out = StringIO.new
+    header_hash = {"X-Whatever" => "stuff", 'StaTus' => "666" }
+    HttpResponse.write(out,[200, header_hash, []])
+    assert out.closed?
+    assert_match(/^Status: 200 OK\r\nX-Whatever: stuff\r\n/, out.string)
+    assert_equal 1, out.string.split(/\r\n/).grep(/^Status:/i).size
+  end
+
   def test_body_closed
     expect_body = %w(1 2 3 4).join("\n")
     body = StringIO.new(expect_body)

data/unicorn.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{unicorn}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Wong"]
-  s.date = %q{2009-04-13}
+  s.date = %q{2009-04-16}
   s.description = %q{A small fast HTTP library and server for Rack applications.}
   s.email = %q{normalperson@yhbt.net}
   s.executables = ["unicorn", "unicorn_rails"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: unicorn
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Eric Wong
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-13 00:00:00 -07:00
+date: 2009-04-16 00:00:00 -07:00
 default_executable: 
 dependencies: []