unicorn 3.2.1 → 3.3.0

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v3.2.1.GIT
+DEF_VER=v3.3.0.GIT
 
 LF='
 '

data/GNUmakefile

@@ -45,7 +45,7 @@ T_r_log := $(subst .r,$(log_suffix),$(T_r))
 test_prefix = $(CURDIR)/test/$(RUBY_ENGINE)-$(RUBY_VERSION)
 
 ext := ext/unicorn_http
-c_files := $(ext)/unicorn_http.c $(wildcard $(ext)/*.h)
+c_files := $(ext)/unicorn_http.c $(ext)/httpdate.c $(wildcard $(ext)/*.h)
 rl_files := $(wildcard $(ext)/*.rl)
 base_bins := unicorn unicorn_rails
 bins := $(addprefix bin/, $(base_bins))

data/Rakefile

@@ -51,9 +51,12 @@ task :fm_update do
   uri = URI.parse('http://freshmeat.net/projects/unicorn/releases.json')
   rc = Net::Netrc.locate('unicorn-fm') or abort "~/.netrc not found"
   api_token = rc.password
-  changelog = tags.find { |t| t[:tag] == "v#{version}" }[:body]
+  _, subject, body = `git cat-file tag v#{version}`.split(/\n\n/, 3)
   tmp = Tempfile.new('fm-changelog')
-  tmp.syswrite(changelog)
+  tmp.puts subject
+  tmp.puts
+  tmp.puts body
+  tmp.flush
   system(ENV["VISUAL"], tmp.path) or abort "#{ENV["VISUAL"]} failed: #$?"
   changelog = File.read(tmp.path).strip
 

data/ext/unicorn_http/extconf.rb

@@ -1,10 +1,9 @@
 # -*- encoding: binary -*-
 require 'mkmf'
 
-dir_config("unicorn_http")
-
 have_macro("SIZEOF_OFF_T", "ruby.h") or check_sizeof("off_t", "sys/types.h")
 have_macro("SIZEOF_LONG", "ruby.h") or check_sizeof("long", "sys/types.h")
 have_func("rb_str_set_len", "ruby.h")
+have_func("gmtime_r", "time.h")
 
 create_makefile("unicorn_http")

data/ext/unicorn_http/httpdate.c

@@ -0,0 +1,82 @@
+#include <ruby.h>
+#include <time.h>
+#include <stdio.h>
+
+static const size_t buf_capa = sizeof("Thu, 01 Jan 1970 00:00:00 GMT");
+static VALUE buf;
+static char *buf_ptr;
+static const char *const week[] = {
+	"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
+};
+static const char *const months[] = {
+	"Jan", "Feb", "Mar", "Apr", "May", "Jun",
+	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+};
+
+/* for people on wonky systems only */
+#ifndef HAVE_GMTIME_R
+static struct tm * my_gmtime_r(time_t *now, struct tm *tm)
+{
+	struct tm *global = gmtime(now);
+	if (global)
+		*tm = *global;
+	return tm;
+}
+#  define gmtime_r my_gmtime_r
+#endif
+
+
+/*
+ * Returns a string which represents the time as rfc1123-date of HTTP-date
+ * defined by RFC 2616:
+ *
+ *   day-of-week, DD month-name CCYY hh:mm:ss GMT
+ *
+ * Note that the result is always GMT.
+ *
+ * This method is identical to Time#httpdate in the Ruby standard library,
+ * except it is implemented in C for performance.  We always saw
+ * Time#httpdate at or near the top of the profiler output so we
+ * decided to rewrite this in C.
+ *
+ * Caveats: it relies on a Ruby implementation with the global VM lock,
+ * a thread-safe version will be provided when a Unix-only, GVL-free Ruby
+ * implementation becomes viable.
+ */
+static VALUE httpdate(VALUE self)
+{
+	static time_t last;
+	time_t now = time(NULL); /* not a syscall on modern 64-bit systems */
+	struct tm tm;
+
+	if (last == now)
+		return buf;
+	last = now;
+	gmtime_r(&now, &tm);
+
+	/* we can make this thread-safe later if our Ruby loses the GVL */
+	snprintf(buf_ptr, buf_capa,
+	         "%s, %02d %s %4d %02d:%02d:%02d GMT",
+	         week[tm.tm_wday],
+	         tm.tm_mday,
+	         months[tm.tm_mon],
+	         tm.tm_year + 1900,
+	         tm.tm_hour,
+	         tm.tm_min,
+	         tm.tm_sec);
+
+	return buf;
+}
+
+void init_unicorn_httpdate(void)
+{
+	VALUE mod = rb_const_get(rb_cObject, rb_intern("Unicorn"));
+	mod = rb_define_module_under(mod, "HttpResponse");
+
+	buf = rb_str_new(0, buf_capa - 1);
+	rb_global_variable(&buf);
+	buf_ptr = RSTRING_PTR(buf);
+	httpdate(Qnil);
+
+	rb_define_method(mod, "httpdate", httpdate, 0);
+}

data/ext/unicorn_http/unicorn_http.rl

@@ -12,6 +12,8 @@
 #include "global_variables.h"
 #include "c_util.h"
 
+void init_unicorn_httpdate(void);
+
 #define UH_FL_CHUNKED  0x1
 #define UH_FL_HASBODY  0x2
 #define UH_FL_INBODY   0x4
@@ -570,18 +572,39 @@ static VALUE HttpParser_init(VALUE self)
 
 /**
  * call-seq:
- *    parser.reset => nil
+ *    parser.clear => parser
  *
  * Resets the parser to it's initial state so that you can reuse it
  * rather than making new ones.
  */
-static VALUE HttpParser_reset(VALUE self)
+static VALUE HttpParser_clear(VALUE self)
 {
   struct http_parser *hp = data_get(self);
 
   http_parser_init(hp);
   rb_funcall(hp->env, id_clear, 0);
 
+  return self;
+}
+
+/**
+ * call-seq:
+ *    parser.reset => nil
+ *
+ * Resets the parser to it's initial state so that you can reuse it
+ * rather than making new ones.
+ *
+ * This method is deprecated and to be removed in Unicorn 4.x
+ */
+static VALUE HttpParser_reset(VALUE self)
+{
+  static int warned;
+
+  if (!warned) {
+    rb_warn("Unicorn::HttpParser#reset is deprecated; "
+            "use Unicorn::HttpParser#clear instead");
+  }
+  HttpParser_clear(self);
   return Qnil;
 }
 
@@ -852,8 +875,9 @@ void Init_unicorn_http(void)
 
   init_globals();
   rb_define_alloc_func(cHttpParser, HttpParser_alloc);
-  rb_define_method(cHttpParser, "initialize", HttpParser_init,0);
-  rb_define_method(cHttpParser, "reset", HttpParser_reset,0);
+  rb_define_method(cHttpParser, "initialize", HttpParser_init, 0);
+  rb_define_method(cHttpParser, "clear", HttpParser_clear, 0);
+  rb_define_method(cHttpParser, "reset", HttpParser_reset, 0);
   rb_define_method(cHttpParser, "parse", HttpParser_parse, 0);
   rb_define_method(cHttpParser, "headers", HttpParser_headers, 2);
   rb_define_method(cHttpParser, "trailers", HttpParser_headers, 2);
@@ -897,5 +921,6 @@ void Init_unicorn_http(void)
   SET_GLOBAL(g_content_length, "CONTENT_LENGTH");
   SET_GLOBAL(g_http_connection, "CONNECTION");
   id_clear = rb_intern("clear");
+  init_unicorn_httpdate();
 }
 #undef SET_GLOBAL

data/lib/unicorn/const.rb

@@ -7,8 +7,8 @@
 # improve things much compared to constants.
 module Unicorn::Const
 
-  # The current version of Unicorn, currently 3.2.1
-  UNICORN_VERSION = "3.2.1"
+  # The current version of Unicorn, currently 3.3.0
+  UNICORN_VERSION = "3.3.0"
 
   # default TCP listen host address (0.0.0.0, all interfaces)
   DEFAULT_HOST = "0.0.0.0"

data/lib/unicorn/http_request.rb

@@ -50,7 +50,7 @@ class Unicorn::HttpParser
   # This does minimal exception trapping and it is up to the caller
   # to handle any socket errors (e.g. user aborted upload).
   def read(socket)
-    reset
+    clear
     e = env
 
     # From http://www.ietf.org/rfc/rfc3875:

data/lib/unicorn/http_response.rb

@@ -1,11 +1,9 @@
 # -*- encoding: binary -*-
-require 'time'
-
 # Writes a Rack response to your client using the HTTP/1.1 specification.
 # You use it by simply doing:
 #
 #   status, headers, body = rack_app.call(env)
-#   http_response_write(socket, [ status, headers, body ])
+#   http_response_write(socket, status, headers, body)
 #
 # Most header correctness (including Content-Length and Content-Type)
 # is the job of Rack, with the exception of the "Date" and "Status" header.
@@ -19,20 +17,19 @@ module Unicorn::HttpResponse
   CRLF = "\r\n"
 
   # writes the rack_response to socket as an HTTP response
-  def http_response_write(socket, rack_response)
-    status, headers, body = rack_response
+  def http_response_write(socket, status, headers, body)
     status = CODES[status.to_i] || status
 
     if headers
       buf = "HTTP/1.1 #{status}\r\n" \
-            "Date: #{Time.now.httpdate}\r\n" \
+            "Date: #{httpdate}\r\n" \
             "Status: #{status}\r\n" \
             "Connection: close\r\n"
       headers.each do |key, value|
         next if %r{\A(?:Date\z|Status\z|Connection\z)}i =~ key
         if value =~ /\n/
           # avoiding blank, key-only cookies with /\n+/
-          buf << value.split(/\n+/).map! { |v| "#{key}: #{v}\r\n" }.join('')
+          buf << value.split(/\n+/).map! { |v| "#{key}: #{v}\r\n" }.join
         else
           buf << "#{key}: #{value}\r\n"
         end

data/lib/unicorn/http_server.rb

@@ -524,22 +524,20 @@ class Unicorn::HttpServer
     client.kgio_trywrite(msg)
     client.close
     rescue
-      nil
   end
 
   # once a client is accepted, it is processed in its entirety here
   # in 3 easy steps: read request, call app, write app response
   def process_client(client)
-    r = @app.call(env = @request.read(client))
+    status, headers, body = @app.call(env = @request.read(client))
 
-    if 100 == r[0].to_i
+    if 100 == status.to_i
       client.write(Unicorn::Const::EXPECT_100_RESPONSE)
       env.delete(Unicorn::Const::HTTP_EXPECT)
-      r = @app.call(env)
+      status, headers, body = @app.call(env)
     end
-    # r may be frozen or const, so don't modify it
-    @request.headers? or r = [ r[0], nil, r[2] ]
-    http_response_write(client, r)
+    @request.headers? or headers = nil
+    http_response_write(client, status, headers, body)
   rescue => e
     handle_error(client, e)
   end

data/lib/unicorn/socket_helper.rb

@@ -20,6 +20,9 @@ module Unicorn
       # FreeBSD, we need to override this to 'dataready' when we
       # eventually get HTTPS support
       :accept_filter => 'httpready',
+
+      # same default value as Mongrel
+      :backlog => 1024,
     }
     #:startdoc:
 
@@ -41,7 +44,6 @@ module Unicorn
     end
 
     def set_tcp_sockopt(sock, opt)
-
       # highly portable, but off by default because we don't do keepalive
       if defined?(TCP_NODELAY) && ! (val = opt[:tcp_nodelay]).nil?
         sock.setsockopt(IPPROTO_TCP, TCP_NODELAY, val ? 1 : 0)
@@ -61,14 +63,12 @@ module Unicorn
       if defined?(TCP_DEFER_ACCEPT)
         # this differs from nginx, since nginx doesn't allow us to
         # configure the the timeout...
-        tmp = DEFAULTS.merge(opt)
-        seconds = tmp[:tcp_defer_accept]
+        seconds = opt[:tcp_defer_accept]
         seconds = DEFAULTS[:tcp_defer_accept] if seconds == true
         seconds = 0 unless seconds # nil/false means disable this
         sock.setsockopt(SOL_TCP, TCP_DEFER_ACCEPT, seconds)
       elsif respond_to?(:accf_arg)
-        tmp = DEFAULTS.merge(opt)
-        if name = tmp[:accept_filter]
+        if name = opt[:accept_filter]
           begin
             sock.setsockopt(SOL_SOCKET, SO_ACCEPTFILTER, accf_arg(name))
           rescue => e
@@ -80,7 +80,7 @@ module Unicorn
     end
 
     def set_server_sockopt(sock, opt)
-      opt ||= {}
+      opt = DEFAULTS.merge(opt || {})
 
       TCPSocket === sock and set_tcp_sockopt(sock, opt)
 
@@ -90,7 +90,7 @@ module Unicorn
         sock.setsockopt(SOL_SOCKET, SO_SNDBUF, opt[:sndbuf]) if opt[:sndbuf]
         log_buffer_sizes(sock, " after: ")
       end
-      sock.listen(opt[:backlog] || 1024)
+      sock.listen(opt[:backlog])
       rescue => e
         logger.error "error setting socket options: #{e.inspect}"
         logger.error e.backtrace.join("\n")

data/test/unit/test_http_parser.rb

@@ -28,7 +28,7 @@ class HttpParserTest < Test::Unit::TestCase
     assert_equal '', req['QUERY_STRING']
 
     assert parser.keepalive?
-    parser.reset
+    parser.clear
     req.clear
 
     http = "G"
@@ -326,7 +326,7 @@ class HttpParserTest < Test::Unit::TestCase
     assert_raises(HttpParserError) { parser.headers(req, bad_http) }
 
     # make sure we can recover
-    parser.reset
+    parser.clear
     req.clear
     assert_equal req, parser.headers(req, "GET / HTTP/1.0\r\n\r\n")
     assert ! parser.keepalive?
@@ -569,7 +569,7 @@ class HttpParserTest < Test::Unit::TestCase
       get = "GET /#{rand_data(10,120)} HTTP/1.1\r\nX-#{rand_data(1024, 1024+(c*1024))}: Test\r\n\r\n"
       assert_raises Unicorn::HttpParserError do
         parser.headers({}, get)
-        parser.reset
+        parser.clear
       end
     end
 
@@ -578,7 +578,7 @@ class HttpParserTest < Test::Unit::TestCase
       get = "GET /#{rand_data(10,120)} HTTP/1.1\r\nX-Test: #{rand_data(1024, 1024+(c*1024), false)}\r\n\r\n"
       assert_raises Unicorn::HttpParserError do
         parser.headers({}, get)
-        parser.reset
+        parser.clear
       end
     end
 
@@ -587,7 +587,7 @@ class HttpParserTest < Test::Unit::TestCase
     get << "X-Test: test\r\n" * (80 * 1024)
     assert_raises Unicorn::HttpParserError do
       parser.headers({}, get)
-      parser.reset
+      parser.clear
     end
 
     # finally just that random garbage gets blocked all the time
@@ -595,7 +595,7 @@ class HttpParserTest < Test::Unit::TestCase
       get = "GET #{rand_data(1024, 1024+(c*1024), false)} #{rand_data(1024, 1024+(c*1024), false)}\r\n\r\n"
       assert_raises Unicorn::HttpParserError do
         parser.headers({}, get)
-        parser.reset
+        parser.clear
       end
     end
 

data/test/unit/test_http_parser_ng.rb

@@ -91,7 +91,7 @@ class HttpParserNgTest < Test::Unit::TestCase
       @parser.parse
     end
     assert @parser.keepalive?
-    @parser.reset
+    @parser.clear
     assert ! @parser.keepalive?
     assert ! @parser.next?
   end
@@ -491,7 +491,7 @@ class HttpParserNgTest < Test::Unit::TestCase
     }.each do |uri,expect|
       assert_equal req, @parser.headers(req.clear, str % [ uri ])
       req = req.dup
-      @parser.reset
+      @parser.clear
       assert_equal uri, req["REQUEST_URI"], "REQUEST_URI mismatch"
       assert_equal expect[qs], req[qs], "#{qs} mismatch"
       assert_equal expect[pi], req[pi], "#{pi} mismatch"
@@ -516,7 +516,7 @@ class HttpParserNgTest < Test::Unit::TestCase
     }.each do |uri,expect|
       assert_equal req, @parser.headers(req.clear, str % [ uri ])
       req = req.dup
-      @parser.reset
+      @parser.clear
       assert_equal uri, req["REQUEST_URI"], "REQUEST_URI mismatch"
       assert_equal "example.com", req["HTTP_HOST"], "Host: mismatch"
       assert_equal expect[qs], req[qs], "#{qs} mismatch"
@@ -608,4 +608,26 @@ class HttpParserNgTest < Test::Unit::TestCase
     assert_equal expect, env2
     assert_equal "", @parser.buf
   end
+
+  def test_keepalive_requests_disabled
+    req = "GET / HTTP/1.1\r\nHost: example.com\r\n\r\n".freeze
+    expect = {
+      "SERVER_NAME" => "example.com",
+      "HTTP_HOST" => "example.com",
+      "rack.url_scheme" => "http",
+      "REQUEST_PATH" => "/",
+      "SERVER_PROTOCOL" => "HTTP/1.1",
+      "PATH_INFO" => "/",
+      "HTTP_VERSION" => "HTTP/1.1",
+      "REQUEST_URI" => "/",
+      "SERVER_PORT" => "80",
+      "REQUEST_METHOD" => "GET",
+      "QUERY_STRING" => ""
+    }.freeze
+    HttpParser.keepalive_requests = 0
+    @parser = HttpParser.new
+    @parser.buf << req
+    assert_equal expect, @parser.parse
+    assert ! @parser.next?
+  end
 end

data/test/unit/test_response.rb

@@ -7,15 +7,26 @@
 # for more information.
 
 require 'test/test_helper'
+require 'time'
 
 include Unicorn
 
 class ResponseTest < Test::Unit::TestCase
   include Unicorn::HttpResponse
 
+  def test_httpdate
+    before = Time.now.to_i
+    str = httpdate
+    assert_kind_of(String, str)
+    middle = Time.parse(str).to_i
+    after = Time.now.to_i
+    assert before <= middle
+    assert middle <= after
+  end
+
   def test_response_headers
     out = StringIO.new
-    http_response_write(out,[200, {"X-Whatever" => "stuff"}, ["cool"]])
+    http_response_write(out, 200, {"X-Whatever" => "stuff"}, ["cool"])
     assert out.closed?
 
     assert out.length > 0, "output didn't have data"
@@ -23,27 +34,15 @@ class ResponseTest < Test::Unit::TestCase
 
   def test_response_string_status
     out = StringIO.new
-    http_response_write(out,['200', {}, []])
+    http_response_write(out,'200', {}, [])
     assert out.closed?
     assert out.length > 0, "output didn't have data"
     assert_equal 1, out.string.split(/\r\n/).grep(/^Status: 200 OK/).size
   end
 
-  def test_response_OFS_set
-    old_ofs = $,
-    $, = "\f\v"
-    out = StringIO.new
-    http_response_write(out,[200, {"X-k" => "cd","X-y" => "z"}, ["cool"]])
-    assert out.closed?
-    resp = out.string
-    assert ! resp.include?("\f\v"), "output didn't use $, ($OFS)"
-    ensure
-      $, = old_ofs
-  end
-
   def test_response_200
     io = StringIO.new
-    http_response_write(io, [200, {}, []])
+    http_response_write(io, 200, {}, [])
     assert io.closed?
     assert io.length > 0, "output didn't have data"
   end
@@ -51,7 +50,7 @@ class ResponseTest < Test::Unit::TestCase
   def test_response_with_default_reason
     code = 400
     io = StringIO.new
-    http_response_write(io, [code, {}, []])
+    http_response_write(io, code, {}, [])
     assert io.closed?
     lines = io.string.split(/\r\n/)
     assert_match(/.* Bad Request$/, lines.first,
@@ -60,7 +59,7 @@ class ResponseTest < Test::Unit::TestCase
 
   def test_rack_multivalue_headers
     out = StringIO.new
-    http_response_write(out,[200, {"X-Whatever" => "stuff\nbleh"}, []])
+    http_response_write(out,200, {"X-Whatever" => "stuff\nbleh"}, [])
     assert out.closed?
     assert_match(/^X-Whatever: stuff\r\nX-Whatever: bleh\r\n/, out.string)
   end
@@ -69,7 +68,7 @@ class ResponseTest < Test::Unit::TestCase
   # some broken clients still rely on it
   def test_status_header_added
     out = StringIO.new
-    http_response_write(out,[200, {"X-Whatever" => "stuff"}, []])
+    http_response_write(out,200, {"X-Whatever" => "stuff"}, [])
     assert out.closed?
     assert_equal 1, out.string.split(/\r\n/).grep(/^Status: 200 OK/i).size
   end
@@ -80,7 +79,7 @@ class ResponseTest < Test::Unit::TestCase
   def test_status_header_ignores_app_hash
     out = StringIO.new
     header_hash = {"X-Whatever" => "stuff", 'StaTus' => "666" }
-    http_response_write(out,[200, header_hash, []])
+    http_response_write(out,200, header_hash, [])
     assert out.closed?
     assert_equal 1, out.string.split(/\r\n/).grep(/^Status: 200 OK/i).size
     assert_equal 1, out.string.split(/\r\n/).grep(/^Status:/i).size
@@ -91,7 +90,7 @@ class ResponseTest < Test::Unit::TestCase
     body = StringIO.new(expect_body)
     body.rewind
     out = StringIO.new
-    http_response_write(out,[200, {}, body])
+    http_response_write(out,200, {}, body)
     assert out.closed?
     assert body.closed?
     assert_match(expect_body, out.string.split(/\r\n/).last)
@@ -99,7 +98,7 @@ class ResponseTest < Test::Unit::TestCase
 
   def test_unknown_status_pass_through
     out = StringIO.new
-    http_response_write(out,["666 I AM THE BEAST", {}, [] ])
+    http_response_write(out,"666 I AM THE BEAST", {}, [] )
     assert out.closed?
     headers = out.string.split(/\r\n\r\n/).first.split(/\r\n/)
     assert %r{\AHTTP/\d\.\d 666 I AM THE BEAST\z}.match(headers[0])

data/unicorn.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.add_dependency(%q<kgio>, '~> 2.1')
 
   s.add_development_dependency('isolate', '~> 3.0.0')
-  s.add_development_dependency('wrongdoc', '~> 1.0.1')
+  s.add_development_dependency('wrongdoc', '~> 1.3')
 
   # s.licenses = %w(GPLv2 Ruby) # licenses= method is not in older RubyGems
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: unicorn
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 3
-  - 2
-  - 1
-  version: 3.2.1
+  - 3
+  - 0
+  version: 3.3.0
 platform: ruby
 authors: 
 - Unicorn hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-26 00:00:00 +00:00
+date: 2011-01-05 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,12 +71,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 9
         segments: 
         - 1
-        - 0
-        - 1
-        version: 1.0.1
+        - 3
+        version: "1.3"
   type: :development
   version_requirements: *id004
 description: |-
@@ -177,6 +176,7 @@ files:
 - ext/unicorn_http/ext_help.h
 - ext/unicorn_http/extconf.rb
 - ext/unicorn_http/global_variables.h
+- ext/unicorn_http/httpdate.c
 - ext/unicorn_http/unicorn_http.c
 - ext/unicorn_http/unicorn_http.rl
 - ext/unicorn_http/unicorn_http_common.rl